Updates SDK for Go 1.17 (#4061)

* Updates SDK's `build` tags to use go 1.17's formatting style of `// go:build ...`. * Updates Makefile's sandbox test statements to use common pattern instead of individually defined. * Updates CI for Go 1.17.
aws · Aug 16, 2021 · abb93ec · abb93ec
1 parent 8b73af7
commit abb93ec
Show file tree

Hide file tree

Showing 358 changed files with 503 additions and 214 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -10,14 +10,14 @@ jobs:
 
   full-test:
     name: Full SDK and tools test
-    # Tests for activily maintained Go versions.
+    # Tests for actively maintained Go versions.
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         go-version:
-          - 1.15.x
           - 1.16.x
+          - 1.17.x
     steps:
     - name: Setup Go
       uses: actions/setup-go@v2
@@ -50,6 +50,7 @@ jobs:
           - 1.12.x
           - 1.13.x
           - 1.14.x
+          - 1.15.x
     steps:
     - name: Setup Go
       uses: actions/setup-go@v2

diff --git a/Makefile b/Makefile
@@ -108,99 +108,22 @@ cleanup-integ-buckets:
 ###################
 # Sandbox Testing #
 ###################
-sandbox-tests: sandbox-test-go1.5 sandbox-test-go1.6 sandbox-test-go1.7 sandbox-test-go1.8 sandbox-test-go1.9 sandbox-test-go1.10 sandbox-test-go1.11 sandbox-test-go1.12 sandbox-test-go1.13 sandbox-test-go1.14 sandbox-test-go1.15 sandbox-test-gotip
-
-sandbox-build-go1.5:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5 -t "aws-sdk-go-1.5" .
-sandbox-go1.5: sandbox-build-go1.5
-	docker run -i -t aws-sdk-go-1.5 bash
-sandbox-test-go1.5: sandbox-build-go1.5
-	docker run -t aws-sdk-go-1.5
-
-sandbox-build-go1.6:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
-sandbox-go1.6: sandbox-build-go1.6
-	docker run -i -t aws-sdk-go-1.6 bash
-sandbox-test-go1.6: sandbox-build-go1.6
-	docker run -t aws-sdk-go-1.6
-
-sandbox-build-go1.7:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.7 -t "aws-sdk-go-1.7" .
-sandbox-go1.7: sandbox-build-go1.7
-	docker run -i -t aws-sdk-go-1.7 bash
-sandbox-test-go1.7: sandbox-build-go1.7
-	docker run -t aws-sdk-go-1.7
-
-sandbox-build-go1.8:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.8 -t "aws-sdk-go-1.8" .
-sandbox-go1.8: sandbox-build-go1.8
-	docker run -i -t aws-sdk-go-1.8 bash
-sandbox-test-go1.8: sandbox-build-go1.8
-	docker run -t aws-sdk-go-1.8
-
-sandbox-build-go1.9:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.9 -t "aws-sdk-go-1.9" .
-sandbox-go1.9: sandbox-build-go1.9
-	docker run -i -t aws-sdk-go-1.9 bash
-sandbox-test-go1.9: sandbox-build-go1.9
-	docker run -t aws-sdk-go-1.9
-
-sandbox-build-go1.10:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.10 -t "aws-sdk-go-1.10" .
-sandbox-go1.10: sandbox-build-go1.10
-	docker run -i -t aws-sdk-go-1.10 bash
-sandbox-test-go1.10: sandbox-build-go1.10
-	docker run -t aws-sdk-go-1.10
-
-sandbox-build-go1.11:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.11 -t "aws-sdk-go-1.11" .
-sandbox-go1.11: sandbox-build-go1.11
-	docker run -i -t aws-sdk-go-1.11 bash
-sandbox-test-go1.11: sandbox-build-go1.11
-	docker run -t aws-sdk-go-1.11
-
-sandbox-build-go1.12:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.12 -t "aws-sdk-go-1.12" .
-sandbox-go1.12: sandbox-build-go1.12
-	docker run -i -t aws-sdk-go-1.12 bash
-sandbox-test-go1.12: sandbox-build-go1.12
-	docker run -t aws-sdk-go-1.12
-
-sandbox-build-go1.13:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.13 -t "aws-sdk-go-1.13" .
-sandbox-go1.13: sandbox-build-go1.13
-	docker run -i -t aws-sdk-go-1.13 bash
-sandbox-test-go1.13: sandbox-build-go1.13
-	docker run -t aws-sdk-go-1.13
-
-sandbox-build-go1.14:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.14 -t "aws-sdk-go-1.14" .
-sandbox-go1.14: sandbox-build-go1.14
-	docker run -i -t aws-sdk-go-1.14 bash
-sandbox-test-go1.14: sandbox-build-go1.14
-	docker run -t aws-sdk-go-1.14
-
-sandbox-build-go1.15:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.15 -t "aws-sdk-go-1.15" .
-sandbox-go1.15: sandbox-build-go1.15
-	docker run -i -t aws-sdk-go-1.15 bash
-sandbox-test-go1.15: sandbox-build-go1.15
-	docker run -t aws-sdk-go-1.15
-
-sandbox-build-go1.16:
-	docker build -f ./awstesting/sandbox/Dockerfile.test.go1.16 -t "aws-sdk-go-1.16" .
-sandbox-go1.16: sandbox-build-go1.16
-	docker run -i -t aws-sdk-go-1.16 bash
-sandbox-test-go1.16: sandbox-build-go1.16
-	docker run -t aws-sdk-go-1.16
-
-sandbox-build-gotip:
-	@echo "Run make update-aws-golang-tip, if this test fails because missing aws-golang:tip container"
-	docker build -f ./awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
-sandbox-gotip: sandbox-build-gotip
-	docker run -i -t aws-sdk-go-tip bash
-sandbox-test-gotip: sandbox-build-gotip
-	docker run -t aws-sdk-go-tip
+sandbox-tests: sandbox-test-go1.5 sandbox-test-go1.6 sandbox-test-go1.7 sandbox-test-go1.8 sandbox-test-go1.9 sandbox-test-go1.10 sandbox-test-go1.11 sandbox-test-go1.12 sandbox-test-go1.13 sandbox-test-go1.14 sandbox-test-go1.15 sandbox-test-go1.16 sandbox-test-go1.17 sandbox-test-gotip
+
+sandbox-build-%:
+	@# sandbox-build-go1.17
+	@# sandbox-build-gotip
+	docker build \
+		-f ./awstesting/sandbox/Dockerfile.test.$(subst sandbox-build-,,$@) \
+		-t "aws-sdk-go-$(subst sandbox-build-,,$@)" .
+sandbox-run-%: sandbox-build-%
+	@# sandbox-run-go1.17
+	@# sandbox-run-gotip
+	docker run -i -t "aws-sdk-go-$(subst sandbox-run-,,$@)" bash
+sandbox-test-%: sandbox-build-%
+	@# sandbox-test-go1.17
+	@# sandbox-test-gotip
+	docker run -t "aws-sdk-go-$(subst sandbox-test-,,$@)"
 
 update-aws-golang-tip:
 	docker build --no-cache=true -f ./awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .

diff --git a/aws/arn/arn_test.go b/aws/arn/arn_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package arn

diff --git a/aws/awsutil/string_value_test.go b/aws/awsutil/string_value_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package awsutil

diff --git a/aws/context_1_5.go b/aws/context_1_5.go
@@ -1,3 +1,4 @@
+//go:build !go1.9
 // +build !go1.9
 
 package aws

diff --git a/aws/context_1_9.go b/aws/context_1_9.go
@@ -1,3 +1,4 @@
+//go:build go1.9
 // +build go1.9
 
 package aws

diff --git a/aws/context_background_1_5.go b/aws/context_background_1_5.go
@@ -1,3 +1,4 @@
+//go:build !go1.7
 // +build !go1.7
 
 package aws

diff --git a/aws/context_background_1_7.go b/aws/context_background_1_7.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package aws

diff --git a/aws/corehandlers/handlers_1_10_test.go b/aws/corehandlers/handlers_1_10_test.go
@@ -1,3 +1,4 @@
+//go:build go1.10
 // +build go1.10
 
 package corehandlers_test

diff --git a/aws/credentials/context_background_go1.5.go b/aws/credentials/context_background_go1.5.go
@@ -1,3 +1,4 @@
+//go:build !go1.7
 // +build !go1.7
 
 package credentials

diff --git a/aws/credentials/context_background_go1.7.go b/aws/credentials/context_background_go1.7.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package credentials

diff --git a/aws/credentials/context_go1.5.go b/aws/credentials/context_go1.5.go
@@ -1,3 +1,4 @@
+//go:build !go1.9
 // +build !go1.9
 
 package credentials

diff --git a/aws/credentials/context_go1.9.go b/aws/credentials/context_go1.9.go
@@ -1,3 +1,4 @@
+//go:build go1.9
 // +build go1.9
 
 package credentials

diff --git a/aws/credentials/credentials_bench_test.go b/aws/credentials/credentials_bench_test.go
@@ -1,3 +1,4 @@
+//go:build go1.9
 // +build go1.9
 
 package credentials

diff --git a/aws/credentials/credentials_go1.7_test.go b/aws/credentials/credentials_go1.7_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package credentials

diff --git a/aws/credentials/plugincreds/doc_1_7.go b/aws/credentials/plugincreds/doc_1_7.go
@@ -1,3 +1,4 @@
+//go:build !go1.8
 // +build !go1.8
 
 // Package plugincreds provides usage of Go plugins for providing credentials

diff --git a/aws/credentials/plugincreds/provider.go b/aws/credentials/plugincreds/provider.go
@@ -1,3 +1,4 @@
+//go:build go1.8
 // +build go1.8
 
 // Package plugincreds implements a credentials provider sourced from a Go

diff --git a/aws/credentials/plugincreds/provider_test.go b/aws/credentials/plugincreds/provider_test.go
@@ -1,3 +1,4 @@
+//go:build go1.8 && awsinclude
 // +build go1.8,awsinclude
 
 package plugincreds

diff --git a/aws/credentials/ssocreds/os.go b/aws/credentials/ssocreds/os.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package ssocreds

diff --git a/aws/credentials/ssocreds/provider_test.go b/aws/credentials/ssocreds/provider_test.go
@@ -1,3 +1,4 @@
+//go:build go1.9
 // +build go1.9
 
 package ssocreds

diff --git a/aws/credentials/stscreds/web_identity_provider_test.go b/aws/credentials/stscreds/web_identity_provider_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package stscreds_test