Updated awsConfig if static crendentials aren't set. BTW regression t…

…ests run successfully
JulianoCristian · Feb 24, 2018 · edf0efc · edf0efc
1 parent a0bbbd6
commit edf0efc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/aws_helper/config.go b/aws_helper/config.go
@@ -15,12 +15,22 @@ import (
 // Returns an AWS session object for the given region (required), profile name (optional), and IAM role to assume
 // (optional), ensuring that the credentials are available
 func CreateAwsSession(awsRegion, awsEndpoint string, awsAccessKey string, awsSecretKey string, awsProfile string, iamRoleArn string, terragruntOptions *options.TerragruntOptions) (*session.Session, error) {
-	sess, err := session.NewSessionWithOptions(session.Options{
-		Config: aws.Config{
+	var awsConfig aws.Config
+	if awsAccessKey != "" && awsSecretKey != "" {
+		awsConfig = aws.Config{
 			Region:      aws.String(awsRegion),
 			Endpoint:    aws.String(awsEndpoint),
 			Credentials: credentials.NewStaticCredentials(awsAccessKey, awsSecretKey, ""),
-		},
+		}
+	} else {
+		awsConfig = aws.Config{
+			Region:   aws.String(awsRegion),
+			Endpoint: aws.String(awsEndpoint),
+		}
+	}
+
+	sess, err := session.NewSessionWithOptions(session.Options{
+		Config:            awsConfig,
 		Profile:           awsProfile,
 		SharedConfigState: session.SharedConfigEnable,
 	})

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -623,7 +623,7 @@ func validateS3BucketExists(t *testing.T, awsRegion string, bucketName string) {
 		t.Fatalf("Error creating mockOptions: %v", err)
 	}
 
-	s3Client, err := remote.CreateS3Client(awsRegion, "", "", mockOptions)
+	s3Client, err := remote.CreateS3Client(awsRegion, "", "", "", "", "", mockOptions)
 	if err != nil {
 		t.Fatalf("Error creating S3 client: %v", err)
 	}
@@ -639,7 +639,7 @@ func deleteS3Bucket(t *testing.T, awsRegion string, bucketName string) {
 		t.Fatalf("Error creating mockOptions: %v", err)
 	}
 
-	s3Client, err := remote.CreateS3Client(awsRegion, "", "", mockOptions)
+	s3Client, err := remote.CreateS3Client(awsRegion, "", "", "", "", "", mockOptions)
 	if err != nil {
 		t.Fatalf("Error creating S3 client: %v", err)
 	}
@@ -681,7 +681,7 @@ func createDynamoDbClient(awsRegion, awsProfile string, iamRoleArn string) (*dyn
 		return nil, err
 	}
 
-	session, err := aws_helper.CreateAwsSession(awsRegion, awsProfile, iamRoleArn, mockOptions)
+	session, err := aws_helper.CreateAwsSession(awsRegion, "", "", "", awsProfile, iamRoleArn, mockOptions)
 	if err != nil {
 		return nil, err
 	}