Bump aws-sdk-go and fix issue with global region for alternative part…

…itions (#350)

* Bump aws-sdk-go and fix issue with global region for alternative partitions

* Fix build failure

* Pass through -p 1 flag to tests

.circleci/config.yml

@@ -1,6 +1,6 @@
 defaults: &defaults
   docker:
-    - image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.16-tf1.0-tg31.1-pck1.7
+    - image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.17-tf1.2-tg37.4-pck1.8-ci50.1
 version: 2.1
 jobs:
   test:
@@ -10,7 +10,10 @@ jobs:
       - run:
           command: |
             mkdir -p /tmp/logs
-            run-go-tests --timeout 45m | tee /tmp/logs/all.log
+            # Run the tests. Note that we set the "-p 1" flag to tell Go to run tests in each package sequentially. Without
+            # this, Go buffers all log output until all packages are done, which with slower running tests can cause CircleCI
+            # to kill the build after more than 45 minutes without log output.
+            run-go-tests --extra-flags '-p 1' --timeout 45m | tee /tmp/logs/all.log
           no_output_timeout: 45m
       - run:
           name: parse test output

aws/aws.go

@@ -50,8 +50,6 @@ var GovCloudRegions = []string{
 
 const (
 	GlobalRegion string = "global"
-	// us-east-1 is the region that is available in every account
-	defaultRegion string = "us-east-1"
 )
 
 func newSession(region string) *session.Session {
@@ -211,6 +209,7 @@ func GetAllResources(targetRegions []string, excludeAfter time.Time, resourceTyp
 	totalRegions := len(targetRegions)
 	resourcesCache := map[string]map[string][]*string{}
 
+	defaultRegion := targetRegions[0]
 	for _, region := range targetRegions {
 		// The "global" region case is handled outside this loop
 		if region == GlobalRegion {
@@ -775,12 +774,9 @@ func GetAllResources(targetRegions []string, excludeAfter time.Time, resourceTyp
 
 		// As there is no actual region named global we have to pick a valid one just to create the session
 		sessionRegion := defaultRegion
-		session, err := session.NewSession(&awsgo.Config{
-			Region: awsgo.String(sessionRegion),
-		},
-		)
+		session, err := newAWSSession(sessionRegion)
 		if err != nil {
-			return nil, errors.WithStackTrace(err)
+			return nil, err
 		}
 
 		globalResources := AwsRegionResource{}
@@ -931,6 +927,7 @@ func nukeAllResourcesInRegion(account *AwsAccountResources, region string, sessi
 
 // NukeAllResources - Nukes all aws resources
 func NukeAllResources(account *AwsAccountResources, regions []string) error {
+	defaultRegion := regions[0]
 	for _, region := range regions {
 		// region that will be used to create a session
 		sessionRegion := region
@@ -940,12 +937,9 @@ func NukeAllResources(account *AwsAccountResources, regions []string) error {
 			sessionRegion = defaultRegion
 		}
 
-		session, err := session.NewSession(&awsgo.Config{
-			Region: awsgo.String(sessionRegion),
-		},
-		)
+		session, err := newAWSSession(sessionRegion)
 		if err != nil {
-			return errors.WithStackTrace(err)
+			return err
 		}
 
 		err = nukeAllResourcesInRegion(account, region, session)
@@ -958,3 +952,15 @@ func NukeAllResources(account *AwsAccountResources, regions []string) error {
 
 	return nil
 }
+
+func newAWSSession(awsRegion string) (*session.Session, error) {
+	sessionOptions := session.Options{
+		SharedConfigState: session.SharedConfigEnable,
+	}
+	sess, err := session.NewSessionWithOptions(sessionOptions)
+	if err != nil {
+		return nil, errors.WithStackTrace(err)
+	}
+	sess.Config.Region = aws.String(awsRegion)
+	return sess, nil
+}