Use goimports

- Update acronyms to have consistent case in `terraform_http_example_test.go`
- https://github.com/golang/go/wiki/CodeReviewComments#initialisms

.circleci/config.yml

@@ -15,6 +15,10 @@ jobs:
           keys:
             - v1-external-dep
             - v1-dep-{{ checksum "Gopkg.lock" }}
+
+      - run: test -z "$(goimports -l -w . | tee /dev/stderr)"
+          name: Ensure goimports has been run
+
       # Use the Gruntwork Installer to install the gruntwork-module-circleci-helpers
       - run: curl -Ls https://raw.githubusercontent.com/gruntwork-io/gruntwork-installer/master/bootstrap-gruntwork-installer.sh | bash /dev/stdin --version v0.0.21
       - run: gruntwork-install --module-name "gruntwork-module-circleci-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.7.1"

modules/aws/account.go

@@ -1,10 +1,11 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/iam"
-	"strings"
 	"errors"
+	"strings"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/service/iam"
 )
 
 // Get the Account ID for the currently logged in IAM User.

modules/aws/account_test.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"testing"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -34,4 +35,3 @@ func TestExtractAccountIdFromInvalidArn(t *testing.T) {
 		t.Fatalf("Expected an error when extracting an account id from an invalid ARN, but got nil")
 	}
 }
-

modules/aws/acm.go

@@ -1,8 +1,9 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/acm"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/service/acm"
 )
 
 // Get the ACM certificate for the given domain name in the given region

modules/aws/ami.go

@@ -1,12 +1,13 @@
 package aws
 
 import (
-	"testing"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/aws"
+	"fmt"
 	"sort"
+	"testing"
 	"time"
-	"fmt"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
 const CanonicalAccountId = "099720109477"

modules/aws/ami_test.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"testing"
+
 	"github.com/stretchr/testify/assert"
 )
 

modules/aws/asg.go

@@ -1,9 +1,10 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/autoscaling"
 )
 
 // Get the IDs of EC2 Instances in the given ASG
@@ -56,4 +57,3 @@ func NewAsgClientE(t *testing.T, region string) (*autoscaling.AutoScaling, error
 
 	return autoscaling.New(sess), nil
 }
-

modules/aws/cloudwatch.go

@@ -1,9 +1,10 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
-	"github.com/aws/aws-sdk-go/aws"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 )
 
 // Return the CloudWatch log messages in the given region for the given log stream and log group

modules/aws/ec2-syslog.go

@@ -1,12 +1,13 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"fmt"
-	"time"
 	"encoding/base64"
+	"fmt"
 	"testing"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/gruntwork-io/terratest/modules/retry"
 )
@@ -35,7 +36,7 @@ func GetSyslogForInstanceE(t *testing.T, instanceId string, region string) (stri
 		return "", err
 	}
 
-	input := ec2.GetConsoleOutputInput {
+	input := ec2.GetConsoleOutputInput{
 		InstanceId: aws.String(instanceId),
 	}
 
@@ -97,4 +98,4 @@ func GetSyslogForInstancesInAsgE(t *testing.T, asgName string, awsRegion string)
 	}
 
 	return logs, nil
-}
+}

modules/aws/ec2.go

@@ -1,10 +1,11 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/aws"
 	"fmt"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/gruntwork-io/terratest/modules/logger"
 )
 

modules/aws/iam.go

@@ -1,10 +1,11 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/iam"
 	"testing"
-	"github.com/aws/aws-sdk-go/aws"
 	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/gruntwork-io/terratest/modules/logger"
 )
 

modules/aws/iam_test.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"testing"
+
 	"github.com/stretchr/testify/assert"
 )
 

modules/aws/keypair.go

@@ -1,11 +1,12 @@
 package aws
 
 import (
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"testing"
-	"github.com/gruntwork-io/terratest/modules/ssh"
 	"github.com/gruntwork-io/terratest/modules/logger"
+	"github.com/gruntwork-io/terratest/modules/ssh"
 )
 
 type Ec2Keypair struct {

modules/aws/keypair_test.go

@@ -1,13 +1,14 @@
 package aws
 
 import (
+	"fmt"
+	"strings"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/gruntwork-io/terratest/modules/random"
-	"fmt"
 	"github.com/stretchr/testify/assert"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/aws"
-	"strings"
 )
 
 func TestCreateImportAndDeleteEC2KeyPair(t *testing.T) {
@@ -48,4 +49,4 @@ func keyPairExists(t *testing.T, keyPair *Ec2Keypair) bool {
 func deleteKeyPair(t *testing.T, keyPair *Ec2Keypair) {
 	DeleteEC2KeyPair(t, keyPair)
 	assert.False(t, keyPairExists(t, keyPair))
-}
+}

modules/aws/kms.go

@@ -1,9 +1,10 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/kms"
-	"github.com/aws/aws-sdk-go/aws"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/kms"
 )
 
 // Get the ARN of a KMS Customer Master Key (CMK) in the given region with the given ID. The ID can be an alias, such

modules/aws/region.go

@@ -1,13 +1,14 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/ec2"
 	"os"
-	"github.com/aws/aws-sdk-go/aws"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/gruntwork-io/terratest/modules/collections"
-	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/gruntwork-io/terratest/modules/logger"
+	"github.com/gruntwork-io/terratest/modules/random"
 )
 
 // You can set this environment variable to force Terratest to use a specific region rather than a random one. This is
@@ -120,5 +121,3 @@ func GetAvailabilityZonesE(t *testing.T, region string) ([]string, error) {
 
 	return out, nil
 }
-
-

modules/aws/region_test.go

@@ -1,9 +1,10 @@
 package aws
 
 import (
+	"fmt"
 	"testing"
+
 	"github.com/stretchr/testify/assert"
-	"fmt"
 )
 
 func TestGetRandomRegion(t *testing.T) {
@@ -53,4 +54,3 @@ func TestGetAvailabilityZones(t *testing.T) {
 		assert.Regexp(t, fmt.Sprintf("^%s[a-z]$", randomRegion), az)
 	}
 }
-

modules/aws/s3.go

@@ -3,10 +3,11 @@ package aws
 import (
 	"strings"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/s3"
 	"bytes"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/gruntwork-io/terratest/modules/logger"
 )
 
@@ -71,7 +72,7 @@ func GetS3ObjectContentsE(t *testing.T, awsRegion string, bucket string, key str
 
 	res, err := s3Client.GetObject(&s3.GetObjectInput{
 		Bucket: &bucket,
-		Key: &key,
+		Key:    &key,
 	})
 
 	if err != nil {

modules/aws/s3_test.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/gruntwork-io/terratest/modules/logger"
+	"github.com/gruntwork-io/terratest/modules/random"
 )
 
 func TestCreateAndDestroyS3Bucket(t *testing.T) {
@@ -49,4 +49,4 @@ func TestAssertS3BucketExistsNoFalsePositive(t *testing.T) {
 	if err == nil {
 		t.Fatalf("Function claimed that S3 Bucket '%s' exists, but in fact it does not.", s3BucketName)
 	}
-}
+}

modules/aws/sns.go

@@ -1,9 +1,10 @@
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/service/sns"
-	"github.com/aws/aws-sdk-go/aws"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/sns"
 	"github.com/gruntwork-io/terratest/modules/logger"
 )
 
@@ -79,4 +80,4 @@ func NewSnsClientE(t *testing.T, region string) (*sns.SNS, error) {
 	}
 
 	return sns.New(sess), nil
-}
+}

modules/aws/sns_test.go

@@ -1,13 +1,14 @@
 package aws
 
 import (
-	"testing"
-	"github.com/gruntwork-io/terratest/modules/random"
 	"fmt"
-	"github.com/aws/aws-sdk-go/service/sns"
+	"strings"
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/sns"
+	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/stretchr/testify/assert"
-	"strings"
 )
 
 func TestCreateAndDeleteSnsTopic(t *testing.T) {
@@ -41,4 +42,4 @@ func snsTopicExists(t *testing.T, region string, arn string) bool {
 func deleteTopic(t *testing.T, region string, arn string) {
 	DeleteSNSTopic(t, region, arn)
 	assert.False(t, snsTopicExists(t, region, arn))
-}
+}

modules/aws/sqs.go

@@ -1,13 +1,14 @@
 package aws
 
 import (
-	"github.com/google/uuid"
-	"github.com/aws/aws-sdk-go/service/sqs"
-	"github.com/aws/aws-sdk-go/aws"
 	"fmt"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/sqs"
+	"github.com/google/uuid"
 	"github.com/gruntwork-io/terratest/modules/logger"
 )
 
@@ -145,8 +146,8 @@ func WaitForQueueMessage(t *testing.T, awsRegion string, queueUrl string, timeou
 		return QueueMessageResponse{Error: err}
 	}
 
-	cycles := timeout;
-	cycleLength := 1;
+	cycles := timeout
+	cycleLength := 1
 	if timeout >= 20 {
 		cycleLength = 20
 		cycles = timeout / cycleLength