Merge pull request #56 from Cox-Automotive/develop

Merge Develop to Master

Gopkg.toml

@@ -30,6 +30,7 @@
   unused-packages = true
 
 [[constraint]]
+  branch = "master"
   name = "github.com/aws/aws-sdk-go"
 
 [[constraint]]

Makefile

@@ -20,34 +20,34 @@ install:
 release:
 	mkdir -p release
 
-	GOOS=darwin GOARCH=amd64 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
+	GOOS=darwin GOARCH=amd64 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
 	chmod +x release/terraform-provider-alks_v$(TRAVIS_TAG)
 	tar -cvzf release/terraform-provider-alks-darwin-amd64.tar.gz -C release/ terraform-provider-alks_v$(TRAVIS_TAG)
 
-	GOOS=freebsd GOARCH=386 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
+	GOOS=freebsd GOARCH=386 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
 	chmod +x release/terraform-provider-alks_v$(TRAVIS_TAG)
 	tar -cvzf release/terraform-provider-alks-freebsd-386.tar.gz -C release/ terraform-provider-alks_v$(TRAVIS_TAG)
 
-	GOOS=freebsd GOARCH=amd64 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
+	GOOS=freebsd GOARCH=amd64 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
 	chmod +x release/terraform-provider-alks_v$(TRAVIS_TAG)
 	tar -cvzf release/terraform-provider-alks-freebsd-amd64.tar.gz -C release/ terraform-provider-alks_v$(TRAVIS_TAG)
 
-	GOOS=linux GOARCH=386 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
+	GOOS=linux GOARCH=386 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
 	chmod +x release/terraform-provider-alks_v$(TRAVIS_TAG)
 	tar -cvzf release/terraform-provider-alks-linux-386.tar.gz -C release/ terraform-provider-alks_v$(TRAVIS_TAG)
 
-	GOOS=linux GOARCH=amd64 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
+	GOOS=linux GOARCH=amd64 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
 	chmod +x release/terraform-provider-alks_v$(TRAVIS_TAG)
 	tar -cvzf release/terraform-provider-alks-linux-amd64.tar.gz -C release/ terraform-provider-alks_v$(TRAVIS_TAG)
 
-	GOOS=solaris GOARCH=amd64 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
+	GOOS=solaris GOARCH=amd64 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG) $(package)
 	chmod +x release/terraform-provider-alks_v$(TRAVIS_TAG)
 	tar -cvzf release/terraform-provider-alks-solaris-amd64.tar.gz -C release/ terraform-provider-alks_v$(TRAVIS_TAG)
 
-	GOOS=windows GOARCH=386 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG).exe $(package)
+	GOOS=windows GOARCH=386 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG).exe $(package)
 	zip release/terraform-provider-alks-windows-386.zip release/terraform-provider-alks_v$(TRAVIS_TAG).exe
 
-	GOOS=windows GOARCH=amd64 go build -o release/terraform-provider-alks_v$(TRAVIS_TAG).exe $(package)
+	GOOS=windows GOARCH=amd64 go build -ldflags "-X main.versionNumber=$(TRAVIS_TAG)" -o release/terraform-provider-alks_v$(TRAVIS_TAG).exe $(package)
 	zip release/terraform-provider-alks-windows-amd64.zip release/terraform-provider-alks_v$(TRAVIS_TAG).exe
 
 	rm release/terraform-provider-alks_v$(TRAVIS_TAG).exe

config.go

@@ -4,8 +4,13 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"os"
+	"time"
+
+	"github.com/hashicorp/go-cleanhttp"
 
 	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
+	"github.com/aws/aws-sdk-go/aws/defaults"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 
 	alks "github.com/Cox-Automotive/alks-go"
@@ -16,6 +21,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/sts"
 )
 
+// Version number, to be injected at link time
+// to set, add `-ldflags "-X main.versionNumber=1.2.3"` to the go build command
+var versionNumber string
+
 // Config stores ALKS configuration and credentials
 type Config struct {
 	URL           string
@@ -57,6 +66,18 @@ func getCredentials(c *Config) *credentials.Credentials {
 		},
 	}
 
+	// Check for ECS container, for more details see:
+	// https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html
+	if uri := os.Getenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"); len(uri) > 0 {
+		client := cleanhttp.DefaultClient()
+		client.Timeout = 100 * time.Millisecond
+		cfg := &aws.Config{
+			HTTPClient: client,
+		}
+
+		providers = append(providers, defaults.RemoteCredProvider(*cfg, defaults.Handlers()))
+	}
+
 	return credentials.NewChainCredentials(providers)
 }
 
@@ -131,7 +152,17 @@ providing credentials for the ALKS Provider`)
 		return nil, err
 	}
 
+	client.SetUserAgent(fmt.Sprintf("alks-terraform-provider-%s", getPluginVersion()))
+
 	log.Println("[INFO] ALKS Client configured")
 
 	return client, nil
 }
+
+func getPluginVersion() string {
+	if versionNumber != "" {
+		return versionNumber
+	}
+
+	return "unknown"
+}

resource_alks_iamrole.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"log"
+	"strings"
 	"time"
 
 	alks "github.com/Cox-Automotive/alks-go"
@@ -147,6 +148,10 @@ func resourceAlksIamTrustRoleCreate(d *schema.ResourceData, meta interface{}) er
 		var err error
 		resp, err = client.CreateIamTrustRole(roleName, roleType, trustArn, enableAlksAccess)
 		if err != nil {
+			if strings.Contains(err.Error(), "Role already exists") || strings.Contains(err.Error(), "Instance profile exists") {
+				return resource.NonRetryableError(err)
+			}
+
 			return resource.RetryableError(err)
 		}
 		return resource.NonRetryableError(err)
@@ -189,6 +194,11 @@ func resourceAlksIamRoleExists(d *schema.ResourceData, meta interface{}) (b bool
 	foundrole, err := client.GetIamRole(d.Id())
 
 	if err != nil {
+		// TODO: Clean-up this logic, likely by improving the error responses from `alks-go`
+		if strings.Contains(err.Error(), "Role not found") {
+			return false, nil
+		}
+
 		return false, err
 	}