Updates SDK for Go 1.17 (#1381)

* 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 19, 2021 · 14923fe · 14923fe
1 parent 4fa06e5
commit 14923fe
Show file tree

Hide file tree

Showing 120 changed files with 153 additions and 32 deletions.
diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java-version: ['11', '8']
-        go-version: [1.16]
+        go-version: [1.17]
     env:
       JAVA_TOOL_OPTIONS: "-Xmx2g"
     steps:

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        go-version: [1.16, 1.15]
+        go-version: [1.17, 1.16, 1.15]
     steps:
     - uses: actions/checkout@v2
 
@@ -34,7 +34,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        go-version: [1.16, 1.15]
+        go-version: [1.17, 1.16, 1.15]
     env:
       EACHMODULE_SKIP: "internal\\repotools\\changes"
     steps:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -11,16 +11,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-latest]  # other options: macos-latest, windows-latest
     steps:
       - uses: actions/checkout@v2
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version
+          # Required: the version of golangci-lint is required and must be
+          # specified without patch version
           version: latest
-          # the following causes golangci-init to do nothing, so all it does is install golang and golangci
+          # the following causes golangci-init to do nothing, so all it does is
+          # install golang and golangci
           args: --version
           # Show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

diff --git a/Makefile b/Makefile
@@ -442,32 +442,24 @@ sdkv1check:
 ###################
 # Sandbox Testing #
 ###################
-.PHONY: sandbox-tests sandbox-build-go1.15 sandbox-go1.15 sandbox-test-go1.15 sandbox-build-go1.16 \
-sandbox-go1.16 sandbox-test-go1.16 sandbox-build-gotip sandbox-gotip sandbox-test-gotip update-aws-golang-tip
-
-sandbox-tests: sandbox-test-go1.15 sandbox-test-go1.16 sandbox-test-gotip
-
-sandbox-build-go1.15:
-	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.15 -t "aws-sdk-go-v2-1.15" .
-sandbox-go1.15: sandbox-build-go1.15
-	docker run -i -t aws-sdk-go-v2-1.15 bash
-sandbox-test-go1.15: sandbox-build-go1.15
-	docker run -t aws-sdk-go-v2-1.15
-
-sandbox-build-go1.16:
-	docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.16 -t "aws-sdk-go-v2-1.16" .
-sandbox-go1.16: sandbox-build-go1.16
-	docker run -i -t aws-sdk-go-v2-1.16 bash
-sandbox-test-go1.16: sandbox-build-go1.16
-	docker run -t aws-sdk-go-v2-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 ./internal/awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-v2-tip" .
-sandbox-gotip: sandbox-build-gotip
-	docker run -i -t aws-sdk-go-v2-tip bash
-sandbox-test-gotip: sandbox-build-gotip
-	docker run -t aws-sdk-go-v2-tip
+.PHONY: sandbox-tests sandbox-build-% sandbox-run-% sandbox-test-% update-aws-golang-tip
+
+sandbox-tests: 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 ./internal/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 ./internal/awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .
diff --git a/aws/generate.go b/aws/generate.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

diff --git a/aws/logging_generate.go b/aws/logging_generate.go
@@ -1,3 +1,4 @@
+//go:build clientlogmode
 // +build clientlogmode
 
 package main

diff --git a/aws/middleware/osname.go b/aws/middleware/osname.go
@@ -1,3 +1,4 @@
+//go:build go1.16
 // +build go1.16
 
 package middleware

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

diff --git a/config/codegen/main.go b/config/codegen/main.go
@@ -1,3 +1,4 @@
+//go:build codegen
 // +build codegen
 
 package main

diff --git a/config/shared_config_other_test.go b/config/shared_config_other_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package config

diff --git a/config/shared_config_windows_test.go b/config/shared_config_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config

diff --git a/credentials/ec2rolecreds/integration_test.go b/credentials/ec2rolecreds/integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration && ec2env
 // +build integration,ec2env
 
 package ec2rolecreds

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

diff --git a/feature/dynamodb/expression/error_test.go b/feature/dynamodb/expression/error_test.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package expression

diff --git a/feature/ec2/imds/integration_test.go b/feature/ec2/imds/integration_test.go
@@ -1,3 +1,4 @@
+//go:build integration && ec2env
 // +build integration,ec2env
 
 package imds

diff --git a/feature/s3/manager/default_read_seeker_write_to.go b/feature/s3/manager/default_read_seeker_write_to.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package manager

diff --git a/feature/s3/manager/default_writer_read_from.go b/feature/s3/manager/default_writer_read_from.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package manager

diff --git a/feature/s3/manager/integ_bucket_region_test.go b/feature/s3/manager/integ_bucket_region_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package manager_test

diff --git a/feature/s3/manager/integ_shared_test.go b/feature/s3/manager/integ_shared_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package manager_test

diff --git a/feature/s3/manager/integ_upload_test.go b/feature/s3/manager/integ_upload_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package manager_test

diff --git a/feature/s3/manager/internal/integration/downloader/client.go b/feature/s3/manager/internal/integration/downloader/client.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package downloader

diff --git a/feature/s3/manager/internal/integration/downloader/config.go b/feature/s3/manager/internal/integration/downloader/config.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package downloader

diff --git a/feature/s3/manager/internal/integration/downloader/main_test.go b/feature/s3/manager/internal/integration/downloader/main_test.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package downloader

diff --git a/feature/s3/manager/internal/integration/uploader/client.go b/feature/s3/manager/internal/integration/uploader/client.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package uploader

diff --git a/feature/s3/manager/internal/integration/uploader/config.go b/feature/s3/manager/internal/integration/uploader/config.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package uploader

diff --git a/feature/s3/manager/internal/integration/uploader/main_test.go b/feature/s3/manager/internal/integration/uploader/main_test.go
@@ -1,3 +1,4 @@
+//go:build integration && perftest
 // +build integration,perftest
 
 package uploader

diff --git a/internal/awstesting/sandbox/Dockerfile.test.go1.17 b/internal/awstesting/sandbox/Dockerfile.test.go1.17
@@ -0,0 +1,12 @@
+FROM golang:1.17
+
+ENV GOPROXY=direct
+
+ADD . /go/src/github.com/aws/aws-sdk-go-v2
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+		vim \
+	&& rm -rf /var/list/apt/lists/*
+
+WORKDIR /go/src/github.com/aws/aws-sdk-go-v2
+CMD ["make", "unit"]
diff --git a/internal/ini/fuzz.go b/internal/ini/fuzz.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package ini

diff --git a/internal/ini/fuzz_test.go b/internal/ini/fuzz_test.go
@@ -1,3 +1,4 @@
+//go:build fuzz
 // +build fuzz
 
 // fuzz test data is stored in Amazon S3.

diff --git a/internal/shareddefaults/shared_config_other_test.go b/internal/shareddefaults/shared_config_other_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package shareddefaults_test

diff --git a/internal/shareddefaults/shared_config_windows_test.go b/internal/shareddefaults/shared_config_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package shareddefaults_test

diff --git a/service/internal/integrationtest/acm/smoke_test.go b/service/internal/integrationtest/acm/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package acm

diff --git a/service/internal/integrationtest/apigateway/smoke_test.go b/service/internal/integrationtest/apigateway/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package apigateway

diff --git a/service/internal/integrationtest/applicationautoscaling/smoke_test.go b/service/internal/integrationtest/applicationautoscaling/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package applicationautoscaling

diff --git a/service/internal/integrationtest/applicationdiscoveryservice/smoke_test.go b/service/internal/integrationtest/applicationdiscoveryservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package applicationdiscoveryservice

diff --git a/service/internal/integrationtest/appstream/smoke_test.go b/service/internal/integrationtest/appstream/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package appstream

diff --git a/service/internal/integrationtest/athena/smoke_test.go b/service/internal/integrationtest/athena/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package athena

diff --git a/service/internal/integrationtest/autoscaling/smoke_test.go b/service/internal/integrationtest/autoscaling/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package autoscaling

diff --git a/service/internal/integrationtest/batch/smoke_test.go b/service/internal/integrationtest/batch/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package batch

diff --git a/service/internal/integrationtest/cloudformation/smoke_test.go b/service/internal/integrationtest/cloudformation/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudformation

diff --git a/service/internal/integrationtest/cloudfront/smoke_test.go b/service/internal/integrationtest/cloudfront/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudfront

diff --git a/service/internal/integrationtest/cloudhsmv2/smoke_test.go b/service/internal/integrationtest/cloudhsmv2/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudhsmv2

diff --git a/service/internal/integrationtest/cloudsearch/smoke_test.go b/service/internal/integrationtest/cloudsearch/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudsearch

diff --git a/service/internal/integrationtest/cloudtrail/smoke_test.go b/service/internal/integrationtest/cloudtrail/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudtrail

diff --git a/service/internal/integrationtest/cloudwatch/smoke_test.go b/service/internal/integrationtest/cloudwatch/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cloudwatch

diff --git a/service/internal/integrationtest/codebuild/smoke_test.go b/service/internal/integrationtest/codebuild/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codebuild

diff --git a/service/internal/integrationtest/codecommit/smoke_test.go b/service/internal/integrationtest/codecommit/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codecommit

diff --git a/service/internal/integrationtest/codedeploy/smoke_test.go b/service/internal/integrationtest/codedeploy/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codedeploy

diff --git a/service/internal/integrationtest/codepipeline/smoke_test.go b/service/internal/integrationtest/codepipeline/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codepipeline

diff --git a/service/internal/integrationtest/codestar/smoke_test.go b/service/internal/integrationtest/codestar/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package codestar

diff --git a/service/internal/integrationtest/cognitoidentityprovider/smoke_test.go b/service/internal/integrationtest/cognitoidentityprovider/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package cognitoidentityprovider

diff --git a/service/internal/integrationtest/configservice/smoke_test.go b/service/internal/integrationtest/configservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package configservice

diff --git a/service/internal/integrationtest/costandusagereportservice/smoke_test.go b/service/internal/integrationtest/costandusagereportservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package costandusagereportservice

diff --git a/service/internal/integrationtest/databasemigrationservice/smoke_test.go b/service/internal/integrationtest/databasemigrationservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package databasemigrationservice

diff --git a/service/internal/integrationtest/devicefarm/smoke_test.go b/service/internal/integrationtest/devicefarm/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package devicefarm

diff --git a/service/internal/integrationtest/directconnect/smoke_test.go b/service/internal/integrationtest/directconnect/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package directconnect

diff --git a/service/internal/integrationtest/directoryservice/smoke_test.go b/service/internal/integrationtest/directoryservice/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package directoryservice

diff --git a/service/internal/integrationtest/docdb/smoke_test.go b/service/internal/integrationtest/docdb/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package docdb

diff --git a/service/internal/integrationtest/dynamodb/smoke_test.go b/service/internal/integrationtest/dynamodb/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package dynamodb

diff --git a/service/internal/integrationtest/ec2/smoke_test.go b/service/internal/integrationtest/ec2/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ec2

diff --git a/service/internal/integrationtest/ecr/smoke_test.go b/service/internal/integrationtest/ecr/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ecr

diff --git a/service/internal/integrationtest/ecs/smoke_test.go b/service/internal/integrationtest/ecs/smoke_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package ecs