diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 0193caadbfe..953e7700996 100644 --- 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 index 3d984f9eb85..c1b9fa484f9 100644 --- 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 index 1d30d299e9b..00d11721630 100644 --- 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 index bf42d1ea5c5..98408cdb94e 100644 --- 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 index 2866f9a7fb9..89aad2c6771 100644 --- 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 index 3718b26e101..6ee9ddd18bb 100644 --- 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 index 2f9446333a6..31321819048 100644 --- 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 index 9c29f29af17..9975d561bb2 100644 --- 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 index 0d03ce6b625..7277c35001c 100644 --- 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 index 5852b264870..6e3406b1f76 100644 --- 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 index 388b2154182..a68df0ee73f 100644 --- 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 index 8152a864add..0345fab2d97 100644 --- 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 index 4356edb3d5d..79018aba738 100644 --- 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 index 5265cc1b8a4..69491ab063f 100644 --- 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 index d7927bac72d..493f3b1a4f2 100644 --- 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 index 5b269feeba6..4144fe8dc0b 100644 --- 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 index fbb8fe61098..7a62b3a4507 100644 --- 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 index a6b8563ba37..e128f7f9940 100644 --- 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 index ceca7dceecb..d4df39a7a22 100644 --- 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 index b806627b642..0548d60325a 100644 --- 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 index 93678996a3d..8f78e93ed0a 100644 --- 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 diff --git a/aws/crr/cache_test.go b/aws/crr/cache_test.go index 2c6b18bb9bb..7e1162c5b04 100644 --- a/aws/crr/cache_test.go +++ b/aws/crr/cache_test.go @@ -63,7 +63,7 @@ func TestCacheAdd(t *testing.T) { }, }, validKeys: map[string]Endpoint{ - "foo": Endpoint{ + "foo": { Key: "foo", Addresses: []WeightedAddress{ { @@ -71,7 +71,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "bar": Endpoint{ + "bar": { Key: "bar", Addresses: []WeightedAddress{ { @@ -79,7 +79,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "baz": Endpoint{ + "baz": { Key: "baz", Addresses: []WeightedAddress{ { @@ -87,7 +87,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "qux": Endpoint{ + "qux": { Key: "qux", Addresses: []WeightedAddress{ { @@ -95,7 +95,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "moo": Endpoint{ + "moo": { Key: "moo", Addresses: []WeightedAddress{ { @@ -151,7 +151,7 @@ func TestCacheAdd(t *testing.T) { }, }, validKeys: map[string]Endpoint{ - "foo": Endpoint{ + "foo": { Key: "foo", Addresses: []WeightedAddress{ { @@ -159,7 +159,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "bar": Endpoint{ + "bar": { Key: "bar", Addresses: []WeightedAddress{ { @@ -167,7 +167,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "baz": Endpoint{ + "baz": { Key: "baz", Addresses: []WeightedAddress{ { @@ -175,7 +175,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "qux": Endpoint{ + "qux": { Key: "qux", Addresses: []WeightedAddress{ { @@ -183,7 +183,7 @@ func TestCacheAdd(t *testing.T) { }, }, }, - "moo": Endpoint{ + "moo": { Key: "moo", Addresses: []WeightedAddress{ { @@ -283,7 +283,7 @@ func TestCacheGet(t *testing.T) { }, }, validKeys: map[string]Endpoint{ - "foo": Endpoint{ + "foo": { Key: "foo", Addresses: []WeightedAddress{ { @@ -291,7 +291,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "bar": Endpoint{ + "bar": { Key: "bar", Addresses: []WeightedAddress{ { @@ -299,7 +299,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "baz": Endpoint{ + "baz": { Key: "baz", Addresses: []WeightedAddress{ { @@ -307,7 +307,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "qux": Endpoint{ + "qux": { Key: "qux", Addresses: []WeightedAddress{ { @@ -315,7 +315,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "moo": Endpoint{ + "moo": { Key: "moo", Addresses: []WeightedAddress{ { @@ -370,7 +370,7 @@ func TestCacheGet(t *testing.T) { }, }, validKeys: map[string]Endpoint{ - "foo": Endpoint{ + "foo": { Key: "foo", Addresses: []WeightedAddress{ { @@ -378,7 +378,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "bar": Endpoint{ + "bar": { Key: "bar", Addresses: []WeightedAddress{ { @@ -386,7 +386,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "baz": Endpoint{ + "baz": { Key: "baz", Addresses: []WeightedAddress{ { @@ -394,7 +394,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "qux": Endpoint{ + "qux": { Key: "qux", Addresses: []WeightedAddress{ { @@ -402,7 +402,7 @@ func TestCacheGet(t *testing.T) { }, }, }, - "moo": Endpoint{ + "moo": { Key: "moo", Addresses: []WeightedAddress{ { diff --git a/aws/crr/sync_map.go b/aws/crr/sync_map.go index e414eaace28..f7b65ac0134 100644 --- a/aws/crr/sync_map.go +++ b/aws/crr/sync_map.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package crr diff --git a/aws/crr/sync_map_1_8.go b/aws/crr/sync_map_1_8.go index e0b12200855..eb4f6aca2f2 100644 --- a/aws/crr/sync_map_1_8.go +++ b/aws/crr/sync_map_1_8.go @@ -1,3 +1,4 @@ +//go:build !go1.9 // +build !go1.9 package crr diff --git a/aws/csm/address_test.go b/aws/csm/address_test.go index b0add7c4593..5e7f6159a84 100644 --- a/aws/csm/address_test.go +++ b/aws/csm/address_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package csm diff --git a/aws/csm/metric_test.go b/aws/csm/metric_test.go index 7aef212b6b2..4a2f34577ac 100644 --- a/aws/csm/metric_test.go +++ b/aws/csm/metric_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package csm diff --git a/aws/csm/reporter_test.go b/aws/csm/reporter_test.go index 7efdaccf06a..65a84efeb2c 100644 --- a/aws/csm/reporter_test.go +++ b/aws/csm/reporter_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package csm_test diff --git a/aws/ec2metadata/api_test.go b/aws/ec2metadata/api_test.go index b331a7c0a63..9d364aaa26b 100644 --- a/aws/ec2metadata/api_test.go +++ b/aws/ec2metadata/api_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ec2metadata_test diff --git a/aws/ec2metadata/service_test.go b/aws/ec2metadata/service_test.go index fea0d666c2c..e16a8b5f644 100644 --- a/aws/ec2metadata/service_test.go +++ b/aws/ec2metadata/service_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ec2metadata_test diff --git a/aws/endpoints/v3model_codegen.go b/aws/endpoints/v3model_codegen.go index 0fdfcc56e05..db6efd60527 100644 --- a/aws/endpoints/v3model_codegen.go +++ b/aws/endpoints/v3model_codegen.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package endpoints diff --git a/aws/endpoints/v3model_legacy_region_test.go b/aws/endpoints/v3model_legacy_region_test.go index 30745b204a0..ddec8d4d8c9 100644 --- a/aws/endpoints/v3model_legacy_region_test.go +++ b/aws/endpoints/v3model_legacy_region_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package endpoints diff --git a/aws/endpoints/v3model_test.go b/aws/endpoints/v3model_test.go index 196196d9c4e..7beaa7c08ef 100644 --- a/aws/endpoints/v3model_test.go +++ b/aws/endpoints/v3model_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package endpoints diff --git a/aws/request/connection_reset_error_test.go b/aws/request/connection_reset_error_test.go index d4648be08cc..80fa8f42cdc 100644 --- a/aws/request/connection_reset_error_test.go +++ b/aws/request/connection_reset_error_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package request_test diff --git a/aws/request/request_1_5_test.go b/aws/request/request_1_5_test.go index 91b4e7b3bf3..e68e3382e14 100644 --- a/aws/request/request_1_5_test.go +++ b/aws/request/request_1_5_test.go @@ -1,3 +1,4 @@ +//go:build !go1.6 // +build !go1.6 package request_test diff --git a/aws/request/request_1_6_test.go b/aws/request/request_1_6_test.go index 5d0d3496532..ec7b504dbd5 100644 --- a/aws/request/request_1_6_test.go +++ b/aws/request/request_1_6_test.go @@ -1,3 +1,4 @@ +//go:build go1.6 // +build go1.6 package request_test diff --git a/aws/request/request_1_7.go b/aws/request/request_1_7.go index e36e468b7c6..5921b8ff2ab 100644 --- a/aws/request/request_1_7.go +++ b/aws/request/request_1_7.go @@ -1,3 +1,4 @@ +//go:build !go1.8 // +build !go1.8 package request diff --git a/aws/request/request_1_7_test.go b/aws/request/request_1_7_test.go index ca6150cb0c0..440e382f921 100644 --- a/aws/request/request_1_7_test.go +++ b/aws/request/request_1_7_test.go @@ -1,3 +1,4 @@ +//go:build !go1.8 // +build !go1.8 package request diff --git a/aws/request/request_1_8.go b/aws/request/request_1_8.go index de1292f45a2..ea643c9c44b 100644 --- a/aws/request/request_1_8.go +++ b/aws/request/request_1_8.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package request diff --git a/aws/request/request_1_8_test.go b/aws/request/request_1_8_test.go index 1f0aa7c7ca5..39afe2e8376 100644 --- a/aws/request/request_1_8_test.go +++ b/aws/request/request_1_8_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package request_test diff --git a/aws/request/request_context.go b/aws/request/request_context.go index a7365cd1e46..d8c5053025c 100644 --- a/aws/request/request_context.go +++ b/aws/request/request_context.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package request diff --git a/aws/request/request_context_1_6.go b/aws/request/request_context_1_6.go index 307fa0705be..49a243ef2d0 100644 --- a/aws/request/request_context_1_6.go +++ b/aws/request/request_context_1_6.go @@ -1,3 +1,4 @@ +//go:build !go1.7 // +build !go1.7 package request diff --git a/aws/session/client_tls_cert_test.go b/aws/session/client_tls_cert_test.go index 177d5643273..e1eaaba7b8b 100644 --- a/aws/session/client_tls_cert_test.go +++ b/aws/session/client_tls_cert_test.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package session diff --git a/aws/session/credentials_test.go b/aws/session/credentials_test.go index 145961a72c4..914ee8a986e 100644 --- a/aws/session/credentials_test.go +++ b/aws/session/credentials_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package session diff --git a/aws/session/csm_test.go b/aws/session/csm_test.go index 90da22bc700..e15cf344d3d 100644 --- a/aws/session/csm_test.go +++ b/aws/session/csm_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package session diff --git a/aws/session/custom_transport.go b/aws/session/custom_transport.go index 593aedc4218..4390ad52f49 100644 --- a/aws/session/custom_transport.go +++ b/aws/session/custom_transport.go @@ -1,3 +1,4 @@ +//go:build go1.13 // +build go1.13 package session diff --git a/aws/session/custom_transport_go1.12.go b/aws/session/custom_transport_go1.12.go index 1bf31cf8e56..668565bea0c 100644 --- a/aws/session/custom_transport_go1.12.go +++ b/aws/session/custom_transport_go1.12.go @@ -1,3 +1,4 @@ +//go:build !go1.13 && go1.7 // +build !go1.13,go1.7 package session diff --git a/aws/session/custom_transport_go1.5.go b/aws/session/custom_transport_go1.5.go index 253d7bc9d55..e101aa6b6c0 100644 --- a/aws/session/custom_transport_go1.5.go +++ b/aws/session/custom_transport_go1.5.go @@ -1,3 +1,4 @@ +//go:build !go1.6 && go1.5 // +build !go1.6,go1.5 package session diff --git a/aws/session/custom_transport_go1.6.go b/aws/session/custom_transport_go1.6.go index db240605441..b5fcbe0d1e0 100644 --- a/aws/session/custom_transport_go1.6.go +++ b/aws/session/custom_transport_go1.6.go @@ -1,3 +1,4 @@ +//go:build !go1.7 && go1.6 // +build !go1.7,go1.6 package session diff --git a/aws/session/env_config_test.go b/aws/session/env_config_test.go index deb201109cc..5bab0f95b37 100644 --- a/aws/session/env_config_test.go +++ b/aws/session/env_config_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package session diff --git a/aws/session/session_test.go b/aws/session/session_test.go index a03d6d014db..a1c94ec9a0f 100644 --- a/aws/session/session_test.go +++ b/aws/session/session_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package session diff --git a/aws/session/shared_config_test.go b/aws/session/shared_config_test.go index 2fc198218c0..8ed70960feb 100644 --- a/aws/session/shared_config_test.go +++ b/aws/session/shared_config_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package session diff --git a/aws/signer/v4/functional_1_5_test.go b/aws/signer/v4/functional_1_5_test.go index f5bb66fcfdd..35280a492f9 100644 --- a/aws/signer/v4/functional_1_5_test.go +++ b/aws/signer/v4/functional_1_5_test.go @@ -1,3 +1,4 @@ +//go:build go1.5 // +build go1.5 package v4_test diff --git a/aws/signer/v4/headers_test.go b/aws/signer/v4/headers_test.go index 69b38844c87..fa34da1aa2a 100644 --- a/aws/signer/v4/headers_test.go +++ b/aws/signer/v4/headers_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package v4 diff --git a/aws/signer/v4/request_context_go1.5.go b/aws/signer/v4/request_context_go1.5.go index f35fc860b3b..cf672b6ac46 100644 --- a/aws/signer/v4/request_context_go1.5.go +++ b/aws/signer/v4/request_context_go1.5.go @@ -1,3 +1,4 @@ +//go:build !go1.7 // +build !go1.7 package v4 diff --git a/aws/signer/v4/request_context_go1.7.go b/aws/signer/v4/request_context_go1.7.go index fed5c859ca6..21fe74e6fac 100644 --- a/aws/signer/v4/request_context_go1.7.go +++ b/aws/signer/v4/request_context_go1.7.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package v4 diff --git a/aws/signer/v4/stream_test.go b/aws/signer/v4/stream_test.go index 1e974db52fb..284c105b1ad 100644 --- a/aws/signer/v4/stream_test.go +++ b/aws/signer/v4/stream_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package v4 diff --git a/aws/signer/v4/uri_path.go b/aws/signer/v4/uri_path.go index bd082e9d1f7..7711ec7377f 100644 --- a/aws/signer/v4/uri_path.go +++ b/aws/signer/v4/uri_path.go @@ -1,3 +1,4 @@ +//go:build go1.5 // +build go1.5 package v4 diff --git a/aws/url.go b/aws/url.go index 6192b2455b6..fed561bd597 100644 --- a/aws/url.go +++ b/aws/url.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package aws diff --git a/aws/url_1_7.go b/aws/url_1_7.go index 0210d2720e7..95282db03b8 100644 --- a/aws/url_1_7.go +++ b/aws/url_1_7.go @@ -1,3 +1,4 @@ +//go:build !go1.8 // +build !go1.8 package aws diff --git a/awstesting/cmd/bucket_cleanup/main.go b/awstesting/cmd/bucket_cleanup/main.go index 73a5dabcc11..466de8868f2 100644 --- a/awstesting/cmd/bucket_cleanup/main.go +++ b/awstesting/cmd/bucket_cleanup/main.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package main diff --git a/awstesting/integration/integration.go b/awstesting/integration/integration.go index 36acf5ad1bc..c4180161fa7 100644 --- a/awstesting/integration/integration.go +++ b/awstesting/integration/integration.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration // Package integration performs initialization and validation for integration diff --git a/awstesting/integration/performance/s3DownloadManager/client.go b/awstesting/integration/performance/s3DownloadManager/client.go index fe208b42127..649ca5a0162 100644 --- a/awstesting/integration/performance/s3DownloadManager/client.go +++ b/awstesting/integration/performance/s3DownloadManager/client.go @@ -1,3 +1,4 @@ +//go:build go1.13 && integration && perftest // +build go1.13,integration,perftest package main diff --git a/awstesting/integration/performance/s3DownloadManager/config.go b/awstesting/integration/performance/s3DownloadManager/config.go index 27d779e0723..c41166f9b0a 100644 --- a/awstesting/integration/performance/s3DownloadManager/config.go +++ b/awstesting/integration/performance/s3DownloadManager/config.go @@ -1,3 +1,4 @@ +//go:build go1.13 && integration && perftest // +build go1.13,integration,perftest package main diff --git a/awstesting/integration/performance/s3DownloadManager/main.go b/awstesting/integration/performance/s3DownloadManager/main.go index cce2640a13a..42ef1f23651 100644 --- a/awstesting/integration/performance/s3DownloadManager/main.go +++ b/awstesting/integration/performance/s3DownloadManager/main.go @@ -1,3 +1,4 @@ +//go:build go1.13 && integration && perftest // +build go1.13,integration,perftest package main diff --git a/awstesting/integration/performance/s3DownloadManager/main_test.go b/awstesting/integration/performance/s3DownloadManager/main_test.go index c0bbf72d0ba..2930e873395 100644 --- a/awstesting/integration/performance/s3DownloadManager/main_test.go +++ b/awstesting/integration/performance/s3DownloadManager/main_test.go @@ -1,3 +1,4 @@ +//go:build go1.13 && integration && perftest // +build go1.13,integration,perftest package main @@ -51,7 +52,7 @@ func (b *BenchmarkConfig) SetupFlags(prefix string, flagSet *flag.FlagSet) { s3manager.DefaultDownloadConcurrency, 2*s3manager.DefaultDownloadConcurrency, 100), - "part sizes to benchmark separated comma") + "part sizes to benchmark separated comma") flagSet.StringVar(&b.bufferSize, "buffer", fmt.Sprintf("%d,%d", 0, 1*sdkio.MebiByte), "part sizes to benchmark separated comma") flagSet.Int64Var(&b.uploadPartSize, "upload-part-size", 0, "upload part size, defaults to download part size if not specified") diff --git a/awstesting/integration/performance/s3DownloadManager/metric.go b/awstesting/integration/performance/s3DownloadManager/metric.go index cb734e3635d..92a6393266b 100644 --- a/awstesting/integration/performance/s3DownloadManager/metric.go +++ b/awstesting/integration/performance/s3DownloadManager/metric.go @@ -1,3 +1,4 @@ +//go:build go1.13 && integration && perftest // +build go1.13,integration,perftest package main diff --git a/awstesting/integration/performance/s3GetObject/client.go b/awstesting/integration/performance/s3GetObject/client.go index ed0190dd3ce..b61b7ca7921 100644 --- a/awstesting/integration/performance/s3GetObject/client.go +++ b/awstesting/integration/performance/s3GetObject/client.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3GetObject/config.go b/awstesting/integration/performance/s3GetObject/config.go index a6f5196f855..a88b1de5262 100644 --- a/awstesting/integration/performance/s3GetObject/config.go +++ b/awstesting/integration/performance/s3GetObject/config.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3GetObject/logger.go b/awstesting/integration/performance/s3GetObject/logger.go index f03f4c51217..5da4fb69f77 100644 --- a/awstesting/integration/performance/s3GetObject/logger.go +++ b/awstesting/integration/performance/s3GetObject/logger.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3GetObject/main.go b/awstesting/integration/performance/s3GetObject/main.go index 6c055d15df7..6034364c350 100644 --- a/awstesting/integration/performance/s3GetObject/main.go +++ b/awstesting/integration/performance/s3GetObject/main.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3GetObject/trace.go b/awstesting/integration/performance/s3GetObject/trace.go index 8738446ed11..9ca7373cead 100644 --- a/awstesting/integration/performance/s3GetObject/trace.go +++ b/awstesting/integration/performance/s3GetObject/trace.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3UploadManager/client.go b/awstesting/integration/performance/s3UploadManager/client.go index 3b16c5f900b..0a022ee5d61 100644 --- a/awstesting/integration/performance/s3UploadManager/client.go +++ b/awstesting/integration/performance/s3UploadManager/client.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3UploadManager/config.go b/awstesting/integration/performance/s3UploadManager/config.go index 17de69457a7..79ec87b3652 100644 --- a/awstesting/integration/performance/s3UploadManager/config.go +++ b/awstesting/integration/performance/s3UploadManager/config.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3UploadManager/main.go b/awstesting/integration/performance/s3UploadManager/main.go index 32b19c2003f..e3e3cf99b2f 100644 --- a/awstesting/integration/performance/s3UploadManager/main.go +++ b/awstesting/integration/performance/s3UploadManager/main.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3UploadManager/main_test.go b/awstesting/integration/performance/s3UploadManager/main_test.go index 68fa990f046..16db4981ca1 100644 --- a/awstesting/integration/performance/s3UploadManager/main_test.go +++ b/awstesting/integration/performance/s3UploadManager/main_test.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/performance/s3UploadManager/metric.go b/awstesting/integration/performance/s3UploadManager/metric.go index 7c905369978..0da058dc1af 100644 --- a/awstesting/integration/performance/s3UploadManager/metric.go +++ b/awstesting/integration/performance/s3UploadManager/metric.go @@ -1,3 +1,4 @@ +//go:build integration && perftest // +build integration,perftest package main diff --git a/awstesting/integration/s3integ/shared.go b/awstesting/integration/s3integ/shared.go index 9fffcdb398d..cf7e90e3f35 100644 --- a/awstesting/integration/s3integ/shared.go +++ b/awstesting/integration/s3integ/shared.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3integ diff --git a/awstesting/sandbox/Dockerfile.test.go1.17 b/awstesting/sandbox/Dockerfile.test.go1.17 new file mode 100644 index 00000000000..734b081807f --- /dev/null +++ b/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 + +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 +CMD ["make", "get-deps-verify", "unit"] diff --git a/example/aws/credentials/plugincreds/main.go b/example/aws/credentials/plugincreds/main.go index 710de1d4e2f..79d69816f12 100644 --- a/example/aws/credentials/plugincreds/main.go +++ b/example/aws/credentials/plugincreds/main.go @@ -1,3 +1,4 @@ +//go:build example && go18 // +build example,go18 package main diff --git a/example/aws/credentials/plugincreds/plugin/plugin.go b/example/aws/credentials/plugincreds/plugin/plugin.go index dabfa1f6b01..c790e086414 100644 --- a/example/aws/credentials/plugincreds/plugin/plugin.go +++ b/example/aws/credentials/plugincreds/plugin/plugin.go @@ -1,3 +1,4 @@ +//go:build example && go18 // +build example,go18 package main diff --git a/example/aws/endpoints/customEndpoint/customEndpoint.go b/example/aws/endpoints/customEndpoint/customEndpoint.go index ff7b6a745f1..2604d4d493f 100644 --- a/example/aws/endpoints/customEndpoint/customEndpoint.go +++ b/example/aws/endpoints/customEndpoint/customEndpoint.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/aws/endpoints/enumEndpoints/enumEndpoints.go b/example/aws/endpoints/enumEndpoints/enumEndpoints.go index 431070121c2..a44d298d9a1 100644 --- a/example/aws/endpoints/enumEndpoints/enumEndpoints.go +++ b/example/aws/endpoints/enumEndpoints/enumEndpoints.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/aws/proxyWithTLSClientCert/main.go b/example/aws/proxyWithTLSClientCert/main.go index 012bad17a6d..521e70e166a 100644 --- a/example/aws/proxyWithTLSClientCert/main.go +++ b/example/aws/proxyWithTLSClientCert/main.go @@ -1,3 +1,4 @@ +//go:build example && go1.15 // +build example,go1.15 package main diff --git a/example/aws/request/customRetryer/custom_retryer.go b/example/aws/request/customRetryer/custom_retryer.go index f8d62829f5c..baa04ea7a83 100644 --- a/example/aws/request/customRetryer/custom_retryer.go +++ b/example/aws/request/customRetryer/custom_retryer.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go b/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go index ee1da3a63bd..c4a9054407f 100644 --- a/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go +++ b/example/aws/request/handleServiceErrorCodes/handleServiceErrorCodes.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/aws/request/withContext/withContext.go b/example/aws/request/withContext/withContext.go index e629221347e..3faeb9cbf46 100644 --- a/example/aws/request/withContext/withContext.go +++ b/example/aws/request/withContext/withContext.go @@ -1,3 +1,4 @@ +//go:build example && go1.7 // +build example,go1.7 package main diff --git a/example/service/cloudfront/signCookies/signCookies.go b/example/service/cloudfront/signCookies/signCookies.go index 70bd335f159..157a69864e3 100644 --- a/example/service/cloudfront/signCookies/signCookies.go +++ b/example/service/cloudfront/signCookies/signCookies.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/dynamodb/expression/scan.go b/example/service/dynamodb/expression/scan.go index 921a56228ab..4b687f34e83 100644 --- a/example/service/dynamodb/expression/scan.go +++ b/example/service/dynamodb/expression/scan.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/dynamodb/scanItems/scanItems.go b/example/service/dynamodb/scanItems/scanItems.go index 5fec4269d91..a2cb31ad985 100644 --- a/example/service/dynamodb/scanItems/scanItems.go +++ b/example/service/dynamodb/scanItems/scanItems.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/dynamodb/unitTest/unitTest.go b/example/service/dynamodb/unitTest/unitTest.go index 74e65f90a68..906308e317d 100644 --- a/example/service/dynamodb/unitTest/unitTest.go +++ b/example/service/dynamodb/unitTest/unitTest.go @@ -1,3 +1,4 @@ +//go:build example // +build example // Package unitTest demonstrates how to unit test, without needing to pass a diff --git a/example/service/dynamodb/unitTest/unitTest_test.go b/example/service/dynamodb/unitTest/unitTest_test.go index 83078acc34a..fd0ef5dfb12 100644 --- a/example/service/dynamodb/unitTest/unitTest_test.go +++ b/example/service/dynamodb/unitTest/unitTest_test.go @@ -1,3 +1,4 @@ +//go:build example // +build example // Unit tests for package unitTest. diff --git a/example/service/ec2/filterInstances/filter_ec2_by_tag.go b/example/service/ec2/filterInstances/filter_ec2_by_tag.go index c01946dca03..cb3a7166d07 100644 --- a/example/service/ec2/filterInstances/filter_ec2_by_tag.go +++ b/example/service/ec2/filterInstances/filter_ec2_by_tag.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/ec2/instancesbyRegion/instancesByRegion.go b/example/service/ec2/instancesbyRegion/instancesByRegion.go index 07a0bcd26b9..c12384b3dca 100644 --- a/example/service/ec2/instancesbyRegion/instancesByRegion.go +++ b/example/service/ec2/instancesbyRegion/instancesByRegion.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/ecr/createRepository/createRepository.go b/example/service/ecr/createRepository/createRepository.go index ae9d62be278..16d04f3c088 100644 --- a/example/service/ecr/createRepository/createRepository.go +++ b/example/service/ecr/createRepository/createRepository.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main @@ -29,7 +30,7 @@ func main() { input := &ecr.CreateRepositoryInput{ RepositoryName: aws.String(repoName), } - + output, err := svc.CreateRepository(input) if err != nil { fmt.Printf("\nError creating the repo %v in region %v\n%v\n", repoName, aws.StringValue(config.Region), err.Error()) diff --git a/example/service/ecr/deleteRepository/deleteRepository.go b/example/service/ecr/deleteRepository/deleteRepository.go index 826aa80f22d..d5c6bb30b12 100644 --- a/example/service/ecr/deleteRepository/deleteRepository.go +++ b/example/service/ecr/deleteRepository/deleteRepository.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/mediastoredata/streamingNonSeekableReader/main.go b/example/service/mediastoredata/streamingNonSeekableReader/main.go index c5a55105ddc..d68a24916ea 100644 --- a/example/service/mediastoredata/streamingNonSeekableReader/main.go +++ b/example/service/mediastoredata/streamingNonSeekableReader/main.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/rds/rdsutils/authentication/iam_authentication.go b/example/service/rds/rdsutils/authentication/iam_authentication.go index 393d2f1c6dc..0d8edaf2625 100644 --- a/example/service/rds/rdsutils/authentication/iam_authentication.go +++ b/example/service/rds/rdsutils/authentication/iam_authentication.go @@ -1,3 +1,4 @@ +//go:build example && skip // +build example,skip package main diff --git a/example/service/s3/concatObjects/concatObjects.go b/example/service/s3/concatObjects/concatObjects.go index 47cba6072e5..0006c86b337 100644 --- a/example/service/s3/concatObjects/concatObjects.go +++ b/example/service/s3/concatObjects/concatObjects.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/getObjectWithProgress/getObjectWithProgress.go b/example/service/s3/getObjectWithProgress/getObjectWithProgress.go index 52c448c7bdf..2da6c38c783 100644 --- a/example/service/s3/getObjectWithProgress/getObjectWithProgress.go +++ b/example/service/s3/getObjectWithProgress/getObjectWithProgress.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/listObjects/listObjects.go b/example/service/s3/listObjects/listObjects.go index 3ed5eed0737..d64162db13d 100644 --- a/example/service/s3/listObjects/listObjects.go +++ b/example/service/s3/listObjects/listObjects.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go b/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go index d399f54a785..2b9940ea4c6 100644 --- a/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go +++ b/example/service/s3/listObjectsConcurrently/listObjectsConcurrently.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/loggingUploadObjectReadBehavior/main.go b/example/service/s3/loggingUploadObjectReadBehavior/main.go index 0e895b07921..1dd2eec1864 100644 --- a/example/service/s3/loggingUploadObjectReadBehavior/main.go +++ b/example/service/s3/loggingUploadObjectReadBehavior/main.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/presignURL/client/client.go b/example/service/s3/presignURL/client/client.go index b5c6d82e1df..576be61a3e8 100644 --- a/example/service/s3/presignURL/client/client.go +++ b/example/service/s3/presignURL/client/client.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/presignURL/server/server.go b/example/service/s3/presignURL/server/server.go index ddf3f42e2d1..d5074287bba 100644 --- a/example/service/s3/presignURL/server/server.go +++ b/example/service/s3/presignURL/server/server.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/putObjectAcl/putObjectAcl.go b/example/service/s3/putObjectAcl/putObjectAcl.go index c32aef5bec2..9bf9eeff4b1 100644 --- a/example/service/s3/putObjectAcl/putObjectAcl.go +++ b/example/service/s3/putObjectAcl/putObjectAcl.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/putObjectWithProcess/putObjWithProcess.go b/example/service/s3/putObjectWithProcess/putObjWithProcess.go index f3c5cf418c8..c110310317e 100644 --- a/example/service/s3/putObjectWithProcess/putObjWithProcess.go +++ b/example/service/s3/putObjectWithProcess/putObjWithProcess.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/sync/sync.go b/example/service/s3/sync/sync.go index 19e9fddb421..6032a9708dc 100644 --- a/example/service/s3/sync/sync.go +++ b/example/service/s3/sync/sync.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/usingAccessPoints/usingAccessPoints.go b/example/service/s3/usingAccessPoints/usingAccessPoints.go index 1ced55760cc..a18a5236803 100644 --- a/example/service/s3/usingAccessPoints/usingAccessPoints.go +++ b/example/service/s3/usingAccessPoints/usingAccessPoints.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/s3/usingPrivateLink/usingPrivateLink.go b/example/service/s3/usingPrivateLink/usingPrivateLink.go index a874c76d017..f8df54e0ad4 100644 --- a/example/service/s3/usingPrivateLink/usingPrivateLink.go +++ b/example/service/s3/usingPrivateLink/usingPrivateLink.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/sqs/mockingClientsForTests/ifaceExample.go b/example/service/sqs/mockingClientsForTests/ifaceExample.go index 2e186e73ba1..0c320b0e7c0 100644 --- a/example/service/sqs/mockingClientsForTests/ifaceExample.go +++ b/example/service/sqs/mockingClientsForTests/ifaceExample.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/example/service/sqs/mockingClientsForTests/ifaceExample_test.go b/example/service/sqs/mockingClientsForTests/ifaceExample_test.go index b2b32f81177..96b1d129d56 100644 --- a/example/service/sqs/mockingClientsForTests/ifaceExample_test.go +++ b/example/service/sqs/mockingClientsForTests/ifaceExample_test.go @@ -1,3 +1,4 @@ +//go:build example // +build example package main diff --git a/internal/context/background_go1.5.go b/internal/context/background_go1.5.go index 876dcb3fde2..365345353e4 100644 --- a/internal/context/background_go1.5.go +++ b/internal/context/background_go1.5.go @@ -1,3 +1,4 @@ +//go:build !go1.7 // +build !go1.7 package context diff --git a/internal/ini/fuzz.go b/internal/ini/fuzz.go index 8d462f77e24..6e545b63bc4 100644 --- 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 index 77ec20564a2..e949ad7d9b8 100644 --- 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/ini/ini_lexer_test.go b/internal/ini/ini_lexer_test.go index f1fb609f6cc..6cf3e74852d 100644 --- a/internal/ini/ini_lexer_test.go +++ b/internal/ini/ini_lexer_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/ini_parser_test.go b/internal/ini/ini_parser_test.go index 40b59359c87..ff4d931a63c 100644 --- a/internal/ini/ini_parser_test.go +++ b/internal/ini/ini_parser_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/literal_tokens_test.go b/internal/ini/literal_tokens_test.go index ff4837fde47..cbbdfd69c3a 100644 --- a/internal/ini/literal_tokens_test.go +++ b/internal/ini/literal_tokens_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/number_helper_test.go b/internal/ini/number_helper_test.go index da1c757088c..b337de70e18 100644 --- a/internal/ini/number_helper_test.go +++ b/internal/ini/number_helper_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/op_tokens_test.go b/internal/ini/op_tokens_test.go index 9dfcda0b0c1..5ccdcdce25e 100644 --- a/internal/ini/op_tokens_test.go +++ b/internal/ini/op_tokens_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/parse_stack_test.go b/internal/ini/parse_stack_test.go index f22c124015b..60f84ec79ee 100644 --- a/internal/ini/parse_stack_test.go +++ b/internal/ini/parse_stack_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/sep_tokens_test.go b/internal/ini/sep_tokens_test.go index 2b5d68aa6fb..ee5d4a427f1 100644 --- a/internal/ini/sep_tokens_test.go +++ b/internal/ini/sep_tokens_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/skipper_test.go b/internal/ini/skipper_test.go index d070edb0b7c..5ad6c10baa5 100644 --- a/internal/ini/skipper_test.go +++ b/internal/ini/skipper_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/value_util_test.go b/internal/ini/value_util_test.go index b4c8d15a9d3..2557f1917e9 100644 --- a/internal/ini/value_util_test.go +++ b/internal/ini/value_util_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/ini/walker_test.go b/internal/ini/walker_test.go index cc70a12e23a..6e70b629b31 100644 --- a/internal/ini/walker_test.go +++ b/internal/ini/walker_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ini diff --git a/internal/s3shared/arn/accesspoint_arn_test.go b/internal/s3shared/arn/accesspoint_arn_test.go index 604a93e9b51..02da979301b 100644 --- a/internal/s3shared/arn/accesspoint_arn_test.go +++ b/internal/s3shared/arn/accesspoint_arn_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package arn diff --git a/internal/s3shared/arn/arn_test.go b/internal/s3shared/arn/arn_test.go index d0c9a99cde9..1823dd29788 100644 --- a/internal/s3shared/arn/arn_test.go +++ b/internal/s3shared/arn/arn_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package arn diff --git a/internal/s3shared/arn/outpost_arn_test.go b/internal/s3shared/arn/outpost_arn_test.go index 3a0094366ef..af202e5170d 100644 --- a/internal/s3shared/arn/outpost_arn_test.go +++ b/internal/s3shared/arn/outpost_arn_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package arn diff --git a/internal/sdkio/io_go1.6.go b/internal/sdkio/io_go1.6.go index 5aa9137e0f9..037a998c4c3 100644 --- a/internal/sdkio/io_go1.6.go +++ b/internal/sdkio/io_go1.6.go @@ -1,3 +1,4 @@ +//go:build !go1.7 // +build !go1.7 package sdkio diff --git a/internal/sdkio/io_go1.7.go b/internal/sdkio/io_go1.7.go index e5f005613b7..65e7c60c4de 100644 --- a/internal/sdkio/io_go1.7.go +++ b/internal/sdkio/io_go1.7.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package sdkio diff --git a/internal/sdkmath/floor.go b/internal/sdkmath/floor.go index 44898eed0fd..a8452878324 100644 --- a/internal/sdkmath/floor.go +++ b/internal/sdkmath/floor.go @@ -1,3 +1,4 @@ +//go:build go1.10 // +build go1.10 package sdkmath diff --git a/internal/sdkmath/floor_go1.9.go b/internal/sdkmath/floor_go1.9.go index 810ec7f08b0..a3ae3e5dba8 100644 --- a/internal/sdkmath/floor_go1.9.go +++ b/internal/sdkmath/floor_go1.9.go @@ -1,3 +1,4 @@ +//go:build !go1.10 // +build !go1.10 package sdkmath diff --git a/internal/sdkrand/read.go b/internal/sdkrand/read.go index f4651da2da5..4bae66ceed5 100644 --- a/internal/sdkrand/read.go +++ b/internal/sdkrand/read.go @@ -1,3 +1,4 @@ +//go:build go1.6 // +build go1.6 package sdkrand diff --git a/internal/sdkrand/read_1_5.go b/internal/sdkrand/read_1_5.go index b1d93a33d48..3a6ab882516 100644 --- a/internal/sdkrand/read_1_5.go +++ b/internal/sdkrand/read_1_5.go @@ -1,3 +1,4 @@ +//go:build !go1.6 // +build !go1.6 package sdkrand diff --git a/internal/shareddefaults/shared_config_other_test.go b/internal/shareddefaults/shared_config_other_test.go index e17d44d9887..c94bc3d3bcf 100644 --- 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 index 4a38998bf89..8f68b1ce191 100644 --- 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/internal/smithytesting/document_test.go b/internal/smithytesting/document_test.go index db99b671d17..445ee6d0716 100644 --- a/internal/smithytesting/document_test.go +++ b/internal/smithytesting/document_test.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package smithytesting diff --git a/internal/strings/strings_test.go b/internal/strings/strings_test.go index 34d1769487f..3bd6ce3c22f 100644 --- a/internal/strings/strings_test.go +++ b/internal/strings/strings_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package strings diff --git a/models/apis/check_collisions_test.go b/models/apis/check_collisions_test.go index bdeb0d4a835..2d7242c6b3e 100644 --- a/models/apis/check_collisions_test.go +++ b/models/apis/check_collisions_test.go @@ -1,3 +1,4 @@ +//go:build awsinclude // +build awsinclude package apis diff --git a/models/apis/stub.go b/models/apis/stub.go index bb72b0a708c..f857143b434 100644 --- a/models/apis/stub.go +++ b/models/apis/stub.go @@ -1,3 +1,4 @@ +//go:build awsinclude // +build awsinclude package apis diff --git a/private/model/api/api.go b/private/model/api/api.go index e44aaa9f132..507ecb39297 100644 --- a/private/model/api/api.go +++ b/private/model/api/api.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen // Package api represents API abstractions for rendering service generated files. diff --git a/private/model/api/api_test.go b/private/model/api/api_test.go index 40754cfa8f6..966152255ec 100644 --- a/private/model/api/api_test.go +++ b/private/model/api/api_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 && codegen // +build go1.8,codegen package api diff --git a/private/model/api/codegentest/service/awsendpointdiscoverytest/endpoint_discovery_test.go b/private/model/api/codegentest/service/awsendpointdiscoverytest/endpoint_discovery_test.go index fdcc2f0d562..6a5c1930806 100644 --- a/private/model/api/codegentest/service/awsendpointdiscoverytest/endpoint_discovery_test.go +++ b/private/model/api/codegentest/service/awsendpointdiscoverytest/endpoint_discovery_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package awsendpointdiscoverytest diff --git a/private/model/api/codegentest/service/restjsonservice/eventstream_test.go b/private/model/api/codegentest/service/restjsonservice/eventstream_test.go index 5f696334a14..9864b23a4de 100644 --- a/private/model/api/codegentest/service/restjsonservice/eventstream_test.go +++ b/private/model/api/codegentest/service/restjsonservice/eventstream_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15 +//go:build go1.16 +// +build go1.16 package restjsonservice diff --git a/private/model/api/codegentest/service/restxmlservice/eventstream_test.go b/private/model/api/codegentest/service/restxmlservice/eventstream_test.go index ed0ad117e11..098cc4961f6 100644 --- a/private/model/api/codegentest/service/restxmlservice/eventstream_test.go +++ b/private/model/api/codegentest/service/restxmlservice/eventstream_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15 +//go:build go1.16 +// +build go1.16 package restxmlservice diff --git a/private/model/api/codegentest/service/rpcservice/eventstream_test.go b/private/model/api/codegentest/service/rpcservice/eventstream_test.go index 3a7229779c5..4ef9285fc1c 100644 --- a/private/model/api/codegentest/service/rpcservice/eventstream_test.go +++ b/private/model/api/codegentest/service/rpcservice/eventstream_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15 +//go:build go1.16 +// +build go1.16 package rpcservice diff --git a/private/model/api/customization_passes.go b/private/model/api/customization_passes.go index a1c797b7884..0d3abae9bd3 100644 --- a/private/model/api/customization_passes.go +++ b/private/model/api/customization_passes.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/docstring.go b/private/model/api/docstring.go index 43f94084742..672b4a14894 100644 --- a/private/model/api/docstring.go +++ b/private/model/api/docstring.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/docstring_test.go b/private/model/api/docstring_test.go index 5f5ae3943d6..06ded3a7a60 100644 --- a/private/model/api/docstring_test.go +++ b/private/model/api/docstring_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 && codegen // +build go1.8,codegen package api diff --git a/private/model/api/endpoint_trait.go b/private/model/api/endpoint_trait.go index 08eba2da820..9fa3b985df4 100644 --- a/private/model/api/endpoint_trait.go +++ b/private/model/api/endpoint_trait.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/eventstream.go b/private/model/api/eventstream.go index 4d9b36e881a..aed64944c51 100644 --- a/private/model/api/eventstream.go +++ b/private/model/api/eventstream.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/eventstream_tmpl.go b/private/model/api/eventstream_tmpl.go index 1f3c58f311a..116f175967a 100644 --- a/private/model/api/eventstream_tmpl.go +++ b/private/model/api/eventstream_tmpl.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/eventstream_tmpl_reader.go b/private/model/api/eventstream_tmpl_reader.go index 3e5caf34dad..7a33ce60d4b 100644 --- a/private/model/api/eventstream_tmpl_reader.go +++ b/private/model/api/eventstream_tmpl_reader.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/eventstream_tmpl_readertests.go b/private/model/api/eventstream_tmpl_readertests.go index cb79741e1b2..b1c229d9dc2 100644 --- a/private/model/api/eventstream_tmpl_readertests.go +++ b/private/model/api/eventstream_tmpl_readertests.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/eventstream_tmpl_tests.go b/private/model/api/eventstream_tmpl_tests.go index d590d5a546e..a29872cef19 100644 --- a/private/model/api/eventstream_tmpl_tests.go +++ b/private/model/api/eventstream_tmpl_tests.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/eventstream_tmpl_writer.go b/private/model/api/eventstream_tmpl_writer.go index bb043cbf207..6fa9b105e90 100644 --- a/private/model/api/eventstream_tmpl_writer.go +++ b/private/model/api/eventstream_tmpl_writer.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/eventstream_tmpl_writertests.go b/private/model/api/eventstream_tmpl_writertests.go index b126dbdf58a..e91f7a219e3 100644 --- a/private/model/api/eventstream_tmpl_writertests.go +++ b/private/model/api/eventstream_tmpl_writertests.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/example.go b/private/model/api/example.go index 790920ed345..94083aabfbc 100644 --- a/private/model/api/example.go +++ b/private/model/api/example.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/example_test.go b/private/model/api/example_test.go index 4083ebf8abd..1497fc9d297 100644 --- a/private/model/api/example_test.go +++ b/private/model/api/example_test.go @@ -1,3 +1,4 @@ +//go:build go1.10 && codegen // +build go1.10,codegen package api diff --git a/private/model/api/examples_builder.go b/private/model/api/examples_builder.go index ba1447ee2fa..852da8c5d5c 100644 --- a/private/model/api/examples_builder.go +++ b/private/model/api/examples_builder.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/examples_builder_customizations.go b/private/model/api/examples_builder_customizations.go index aac099e1aae..47a6b4c032e 100644 --- a/private/model/api/examples_builder_customizations.go +++ b/private/model/api/examples_builder_customizations.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/exportable_name.go b/private/model/api/exportable_name.go index 124e9008ea7..3146df107e6 100644 --- a/private/model/api/exportable_name.go +++ b/private/model/api/exportable_name.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/legacy_io_suffix.go b/private/model/api/legacy_io_suffix.go index a774df967ca..d1c8ccc1bd5 100644 --- a/private/model/api/legacy_io_suffix.go +++ b/private/model/api/legacy_io_suffix.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/load.go b/private/model/api/load.go index 9c95da0d685..664788f03a2 100644 --- a/private/model/api/load.go +++ b/private/model/api/load.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/load_test.go b/private/model/api/load_test.go index d5d0a84af1e..c7c75e0a688 100644 --- a/private/model/api/load_test.go +++ b/private/model/api/load_test.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/logger.go b/private/model/api/logger.go index 7a618513973..d29998bd180 100644 --- a/private/model/api/logger.go +++ b/private/model/api/logger.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/operation.go b/private/model/api/operation.go index 4f9cfcbff54..2656ef457ea 100644 --- a/private/model/api/operation.go +++ b/private/model/api/operation.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/pagination.go b/private/model/api/pagination.go index 65c3b9dcf47..4c338ab16d7 100644 --- a/private/model/api/pagination.go +++ b/private/model/api/pagination.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/param_filler.go b/private/model/api/param_filler.go index 5a9138f2df6..224badf2a58 100644 --- a/private/model/api/param_filler.go +++ b/private/model/api/param_filler.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/passes.go b/private/model/api/passes.go index 3d4d8873624..c60921a1d15 100644 --- a/private/model/api/passes.go +++ b/private/model/api/passes.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/passes_test.go b/private/model/api/passes_test.go index 379f27a1146..e344545e31a 100644 --- a/private/model/api/passes_test.go +++ b/private/model/api/passes_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 && codegen // +build go1.8,codegen package api diff --git a/private/model/api/s3manger_input.go b/private/model/api/s3manger_input.go index cba08f29afe..dc90ca62fd4 100644 --- a/private/model/api/s3manger_input.go +++ b/private/model/api/s3manger_input.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/service_name.go b/private/model/api/service_name.go index 9d9243a9867..43eb49ea130 100644 --- a/private/model/api/service_name.go +++ b/private/model/api/service_name.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/shape.go b/private/model/api/shape.go index 6709e9a1554..d9801a22be4 100644 --- a/private/model/api/shape.go +++ b/private/model/api/shape.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/shape_alias.go b/private/model/api/shape_alias.go index f5e7ad2318c..1e2ef7a1f86 100644 --- a/private/model/api/shape_alias.go +++ b/private/model/api/shape_alias.go @@ -1,19 +1,19 @@ package api var shapeNameAliases = map[string]map[string]string{ - "APIGateway": map[string]string{ + "APIGateway": { "RequestValidator": "UpdateRequestValidatorOutput", "VpcLink": "UpdateVpcLinkOutput", "GatewayResponse": "UpdateGatewayResponseOutput", }, - "Lambda": map[string]string{ + "Lambda": { "Concurrency": "PutFunctionConcurrencyOutput", }, - "Neptune": map[string]string{ + "Neptune": { "DBClusterParameterGroupNameMessage": "ResetDBClusterParameterGroupOutput", "DBParameterGroupNameMessage": "ResetDBParameterGroupOutput", }, - "RDS": map[string]string{ + "RDS": { "DBClusterBacktrack": "BacktrackDBClusterOutput", }, } diff --git a/private/model/api/shape_validation.go b/private/model/api/shape_validation.go index 5e6ec8bdf94..857e1dc259f 100644 --- a/private/model/api/shape_validation.go +++ b/private/model/api/shape_validation.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/shape_value_builder.go b/private/model/api/shape_value_builder.go index 9f5d0f4bbbc..80cf8fd9dbd 100644 --- a/private/model/api/shape_value_builder.go +++ b/private/model/api/shape_value_builder.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/shapetag_test.go b/private/model/api/shapetag_test.go index 43115cbf84a..76426193975 100644 --- a/private/model/api/shapetag_test.go +++ b/private/model/api/shapetag_test.go @@ -1,3 +1,4 @@ +//go:build 1.6 && codegen // +build 1.6,codegen package api_test diff --git a/private/model/api/smoke.go b/private/model/api/smoke.go index fd3ac9f2888..498278a732b 100644 --- a/private/model/api/smoke.go +++ b/private/model/api/smoke.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/api/waiters.go b/private/model/api/waiters.go index d5d8826e49f..33ccd8cec55 100644 --- a/private/model/api/waiters.go +++ b/private/model/api/waiters.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package api diff --git a/private/model/cli/api-info/api-info.go b/private/model/cli/api-info/api-info.go index ee2b66d6492..5170d4fccb6 100644 --- a/private/model/cli/api-info/api-info.go +++ b/private/model/cli/api-info/api-info.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package main diff --git a/private/model/cli/cleanup-models/main.go b/private/model/cli/cleanup-models/main.go index 4c36373668a..2fed4f964fa 100644 --- a/private/model/cli/cleanup-models/main.go +++ b/private/model/cli/cleanup-models/main.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package main diff --git a/private/model/cli/gen-api/main.go b/private/model/cli/gen-api/main.go index 5cb0a85b4ae..d95cd7cc95e 100644 --- a/private/model/cli/gen-api/main.go +++ b/private/model/cli/gen-api/main.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen // Command aws-gen-gocli parses a JSON description of an AWS API and generates a @@ -293,7 +294,7 @@ func writeAPIErrorsFile(g *generateInfo) error { func writeAPIEventStreamTestFile(g *generateInfo) error { return writeGoFile(filepath.Join(g.PackageDir, "eventstream_test.go"), codeLayout, - "// +build go1.15\n", + "//go:build go1.16\n// +build go1.16\n", g.API.PackageName(), g.API.APIEventStreamTestGoCode(), ) @@ -311,7 +312,7 @@ func writeS3ManagerUploadInputFile(g *generateInfo) error { func writeAPISmokeTestsFile(g *generateInfo) error { return writeGoFile(filepath.Join(g.PackageDir, "integ_test.go"), codeLayout, - "// +build go1.15,integration\n", + "//go:build go1.16 && integration\n// +build go1.16,integration\n", g.API.PackageName()+"_test", g.API.APISmokeTestsGoCode(), ) diff --git a/private/model/cli/gen-endpoints/main.go b/private/model/cli/gen-endpoints/main.go index fed7ab1fcd1..fa549b9345a 100644 --- a/private/model/cli/gen-endpoints/main.go +++ b/private/model/cli/gen-endpoints/main.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen // Command gen-endpoints parses a JSON description of the AWS endpoint diff --git a/private/model/cli/gen-protocol-tests/main.go b/private/model/cli/gen-protocol-tests/main.go index f53699993e2..2d60b7be26b 100644 --- a/private/model/cli/gen-protocol-tests/main.go +++ b/private/model/cli/gen-protocol-tests/main.go @@ -1,3 +1,4 @@ +//go:build codegen // +build codegen package main diff --git a/private/protocol/ec2query/build_bench_test.go b/private/protocol/ec2query/build_bench_test.go index 1aacc82212c..ad22b3b6b61 100644 --- a/private/protocol/ec2query/build_bench_test.go +++ b/private/protocol/ec2query/build_bench_test.go @@ -1,3 +1,4 @@ +//go:build bench // +build bench package ec2query_test diff --git a/private/protocol/ec2query/unmarshal_error_test.go b/private/protocol/ec2query/unmarshal_error_test.go index 4dd0a7d01ab..ad83dc4a354 100644 --- a/private/protocol/ec2query/unmarshal_error_test.go +++ b/private/protocol/ec2query/unmarshal_error_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package ec2query diff --git a/private/protocol/eventstream/eventstreamapi/signer_test.go b/private/protocol/eventstream/eventstreamapi/signer_test.go index e4ae113a8cc..a394ad69bac 100644 --- a/private/protocol/eventstream/eventstreamapi/signer_test.go +++ b/private/protocol/eventstream/eventstreamapi/signer_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package eventstreamapi diff --git a/private/protocol/eventstream/eventstreamapi/writer_test.go b/private/protocol/eventstream/eventstreamapi/writer_test.go index 39343334a0a..e5d6ed48a20 100644 --- a/private/protocol/eventstream/eventstreamapi/writer_test.go +++ b/private/protocol/eventstream/eventstreamapi/writer_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package eventstreamapi diff --git a/private/protocol/eventstream/eventstreamtest/setup_server.go b/private/protocol/eventstream/eventstreamtest/setup_server.go index f49571a4aa7..5140abd29b6 100644 --- a/private/protocol/eventstream/eventstreamtest/setup_server.go +++ b/private/protocol/eventstream/eventstreamtest/setup_server.go @@ -1,3 +1,4 @@ +//go:build !go1.10 // +build !go1.10 package eventstreamtest diff --git a/private/protocol/eventstream/eventstreamtest/setup_server_1_10.go b/private/protocol/eventstream/eventstreamtest/setup_server_1_10.go index ba43fc5b038..642c8235aa3 100644 --- a/private/protocol/eventstream/eventstreamtest/setup_server_1_10.go +++ b/private/protocol/eventstream/eventstreamtest/setup_server_1_10.go @@ -1,3 +1,4 @@ +//go:build go1.15 // +build go1.15 package eventstreamtest diff --git a/private/protocol/eventstream/eventstreamtest/stub_go1.9.go b/private/protocol/eventstream/eventstreamtest/stub_go1.9.go index 3bc539f87ea..67d026ce610 100644 --- a/private/protocol/eventstream/eventstreamtest/stub_go1.9.go +++ b/private/protocol/eventstream/eventstreamtest/stub_go1.9.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package eventstreamtest diff --git a/private/protocol/eventstream/eventstreamtest/stub_old.go b/private/protocol/eventstream/eventstreamtest/stub_old.go index 1a5b83e1fe9..cc18c264f0f 100644 --- a/private/protocol/eventstream/eventstreamtest/stub_old.go +++ b/private/protocol/eventstream/eventstreamtest/stub_old.go @@ -1,3 +1,4 @@ +//go:build !go1.9 // +build !go1.9 package eventstreamtest diff --git a/private/protocol/eventstream/eventstreamtest/testing.go b/private/protocol/eventstream/eventstreamtest/testing.go index 56eac7f459d..3f77d9d9f91 100644 --- a/private/protocol/eventstream/eventstreamtest/testing.go +++ b/private/protocol/eventstream/eventstreamtest/testing.go @@ -1,3 +1,4 @@ +//go:build go1.15 // +build go1.15 package eventstreamtest diff --git a/private/protocol/eventstream/eventstreamtest/testing_1_7.go b/private/protocol/eventstream/eventstreamtest/testing_1_7.go index 8fda2f19b61..58145f14943 100644 --- a/private/protocol/eventstream/eventstreamtest/testing_1_7.go +++ b/private/protocol/eventstream/eventstreamtest/testing_1_7.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package eventstreamtest diff --git a/private/protocol/host_prefix_test.go b/private/protocol/host_prefix_test.go index ff70e7cbbfe..9245cf6c9af 100644 --- a/private/protocol/host_prefix_test.go +++ b/private/protocol/host_prefix_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package protocol diff --git a/private/protocol/host_test.go b/private/protocol/host_test.go index 59850f8379d..1f400a9888a 100644 --- a/private/protocol/host_test.go +++ b/private/protocol/host_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package protocol diff --git a/private/protocol/json/jsonutil/unmarshal_test.go b/private/protocol/json/jsonutil/unmarshal_test.go index b3ac068b314..a91b46c34fa 100644 --- a/private/protocol/json/jsonutil/unmarshal_test.go +++ b/private/protocol/json/jsonutil/unmarshal_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package jsonutil_test diff --git a/private/protocol/jsonrpc/build_bench_test.go b/private/protocol/jsonrpc/build_bench_test.go index 563caa05cf0..9cdfef2d16d 100644 --- a/private/protocol/jsonrpc/build_bench_test.go +++ b/private/protocol/jsonrpc/build_bench_test.go @@ -1,3 +1,4 @@ +//go:build bench // +build bench package jsonrpc_test diff --git a/private/protocol/jsonrpc/unmarshal_error_test.go b/private/protocol/jsonrpc/unmarshal_error_test.go index 3c6dc005e4e..88bf5ac6c56 100644 --- a/private/protocol/jsonrpc/unmarshal_error_test.go +++ b/private/protocol/jsonrpc/unmarshal_error_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package jsonrpc diff --git a/private/protocol/protocol_go1.7_test.go b/private/protocol/protocol_go1.7_test.go index 1f87846f036..51cf8c62bc7 100644 --- a/private/protocol/protocol_go1.7_test.go +++ b/private/protocol/protocol_go1.7_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package protocol diff --git a/private/protocol/query/unmarshal_error_test.go b/private/protocol/query/unmarshal_error_test.go index 5242a0cfd6f..34bf1a56486 100644 --- a/private/protocol/query/unmarshal_error_test.go +++ b/private/protocol/query/unmarshal_error_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package query diff --git a/private/protocol/rest/rest_test.go b/private/protocol/rest/rest_test.go index e5b50564d94..f98a3b58912 100644 --- a/private/protocol/rest/rest_test.go +++ b/private/protocol/rest/rest_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package rest_test diff --git a/private/protocol/restjson/build_bench_test.go b/private/protocol/restjson/build_bench_test.go index 7a8a8c2c382..7018e0312ea 100644 --- a/private/protocol/restjson/build_bench_test.go +++ b/private/protocol/restjson/build_bench_test.go @@ -1,3 +1,4 @@ +//go:build bench // +build bench package restjson_test diff --git a/private/protocol/restjson/unmarshal_error_test.go b/private/protocol/restjson/unmarshal_error_test.go index 8c1aa97dc2a..97c43b7054b 100644 --- a/private/protocol/restjson/unmarshal_error_test.go +++ b/private/protocol/restjson/unmarshal_error_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package restjson diff --git a/private/protocol/restxml/build_bench_test.go b/private/protocol/restxml/build_bench_test.go index 13106ee43b0..dad31a8a4ae 100644 --- a/private/protocol/restxml/build_bench_test.go +++ b/private/protocol/restxml/build_bench_test.go @@ -1,3 +1,4 @@ +//go:build bench // +build bench package restxml_test diff --git a/private/protocol/timestamp_test.go b/private/protocol/timestamp_test.go index 3bb561a0ced..637002560e0 100644 --- a/private/protocol/timestamp_test.go +++ b/private/protocol/timestamp_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package protocol diff --git a/private/protocol/xml/xmlutil/build_test.go b/private/protocol/xml/xmlutil/build_test.go index a50900c857a..f1b305368c3 100644 --- a/private/protocol/xml/xmlutil/build_test.go +++ b/private/protocol/xml/xmlutil/build_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package xmlutil diff --git a/service/acm/integ_test.go b/service/acm/integ_test.go index 8614f18d54b..9e2590a6a57 100644 --- a/service/acm/integ_test.go +++ b/service/acm/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package acm_test diff --git a/service/apigateway/integ_test.go b/service/apigateway/integ_test.go index d9f6bfd80db..0262d2510d9 100644 --- a/service/apigateway/integ_test.go +++ b/service/apigateway/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package apigateway_test diff --git a/service/applicationautoscaling/integ_test.go b/service/applicationautoscaling/integ_test.go index 0728f326692..87caa6511a0 100644 --- a/service/applicationautoscaling/integ_test.go +++ b/service/applicationautoscaling/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package applicationautoscaling_test diff --git a/service/applicationdiscoveryservice/integ_test.go b/service/applicationdiscoveryservice/integ_test.go index 8210d90d016..7c4bb577a59 100644 --- a/service/applicationdiscoveryservice/integ_test.go +++ b/service/applicationdiscoveryservice/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package applicationdiscoveryservice_test diff --git a/service/appstream/integ_test.go b/service/appstream/integ_test.go index 0e2baaf51bc..57595f88423 100644 --- a/service/appstream/integ_test.go +++ b/service/appstream/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package appstream_test diff --git a/service/athena/integ_test.go b/service/athena/integ_test.go index ccef81c0ac4..e16374a5c0f 100644 --- a/service/athena/integ_test.go +++ b/service/athena/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package athena_test diff --git a/service/autoscaling/integ_test.go b/service/autoscaling/integ_test.go index 802fbece6b2..ee646a2a499 100644 --- a/service/autoscaling/integ_test.go +++ b/service/autoscaling/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package autoscaling_test diff --git a/service/batch/integ_test.go b/service/batch/integ_test.go index fcf48c7b741..e6a5e9b52f9 100644 --- a/service/batch/integ_test.go +++ b/service/batch/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package batch_test diff --git a/service/cloudformation/integ_test.go b/service/cloudformation/integ_test.go index 70099a5cbbc..b9011d9828e 100644 --- a/service/cloudformation/integ_test.go +++ b/service/cloudformation/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudformation_test diff --git a/service/cloudfront/integ_test.go b/service/cloudfront/integ_test.go index 68518775629..2f46eb925f2 100644 --- a/service/cloudfront/integ_test.go +++ b/service/cloudfront/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudfront_test diff --git a/service/cloudfront/sign/policy_json_1_6.go b/service/cloudfront/sign/policy_json_1_6.go index 0e8f77dfaef..d19462c2b03 100644 --- a/service/cloudfront/sign/policy_json_1_6.go +++ b/service/cloudfront/sign/policy_json_1_6.go @@ -1,3 +1,4 @@ +//go:build !go1.7 // +build !go1.7 package sign diff --git a/service/cloudfront/sign/policy_json_1_7.go b/service/cloudfront/sign/policy_json_1_7.go index 16502ce79e8..6037704a0d6 100644 --- a/service/cloudfront/sign/policy_json_1_7.go +++ b/service/cloudfront/sign/policy_json_1_7.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package sign diff --git a/service/cloudhsmv2/integ_test.go b/service/cloudhsmv2/integ_test.go index 3ade356a59b..0d93c028c26 100644 --- a/service/cloudhsmv2/integ_test.go +++ b/service/cloudhsmv2/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudhsmv2_test diff --git a/service/cloudsearch/integ_test.go b/service/cloudsearch/integ_test.go index 555654621f5..fb57af16eaf 100644 --- a/service/cloudsearch/integ_test.go +++ b/service/cloudsearch/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudsearch_test diff --git a/service/cloudtrail/integ_test.go b/service/cloudtrail/integ_test.go index fbf6763bfa4..7110af08ab1 100644 --- a/service/cloudtrail/integ_test.go +++ b/service/cloudtrail/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudtrail_test diff --git a/service/cloudwatch/integ_test.go b/service/cloudwatch/integ_test.go index cec052d0e4b..0e3952c1fe5 100644 --- a/service/cloudwatch/integ_test.go +++ b/service/cloudwatch/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudwatch_test diff --git a/service/cloudwatchevents/integ_test.go b/service/cloudwatchevents/integ_test.go index b77be119caa..2ad9e8cb97f 100644 --- a/service/cloudwatchevents/integ_test.go +++ b/service/cloudwatchevents/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudwatchevents_test diff --git a/service/cloudwatchlogs/integ_test.go b/service/cloudwatchlogs/integ_test.go index 09b48cc1b2d..4fe858c27eb 100644 --- a/service/cloudwatchlogs/integ_test.go +++ b/service/cloudwatchlogs/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cloudwatchlogs_test diff --git a/service/codebuild/integ_test.go b/service/codebuild/integ_test.go index 6e636e7f34a..21248d1a026 100644 --- a/service/codebuild/integ_test.go +++ b/service/codebuild/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package codebuild_test diff --git a/service/codecommit/integ_test.go b/service/codecommit/integ_test.go index 08a26d60840..e9f3604cae5 100644 --- a/service/codecommit/integ_test.go +++ b/service/codecommit/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package codecommit_test diff --git a/service/codedeploy/integ_test.go b/service/codedeploy/integ_test.go index b540b17e8c3..ffb5e9c1d1c 100644 --- a/service/codedeploy/integ_test.go +++ b/service/codedeploy/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package codedeploy_test diff --git a/service/codepipeline/integ_test.go b/service/codepipeline/integ_test.go index 9241ed1cbc6..5f8dfa764a3 100644 --- a/service/codepipeline/integ_test.go +++ b/service/codepipeline/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package codepipeline_test diff --git a/service/codestar/integ_test.go b/service/codestar/integ_test.go index 6fd48a1e696..0324ded4c90 100644 --- a/service/codestar/integ_test.go +++ b/service/codestar/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package codestar_test diff --git a/service/cognitoidentity/customizations_test.go b/service/cognitoidentity/customizations_test.go index 77a1176b1f7..dd63dca3a1b 100644 --- a/service/cognitoidentity/customizations_test.go +++ b/service/cognitoidentity/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package cognitoidentity_test diff --git a/service/cognitoidentity/integ_test.go b/service/cognitoidentity/integ_test.go index 446c1cf8e46..8f54b90e0e6 100644 --- a/service/cognitoidentity/integ_test.go +++ b/service/cognitoidentity/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cognitoidentity_test diff --git a/service/cognitoidentityprovider/integ_test.go b/service/cognitoidentityprovider/integ_test.go index ef43ba6fb33..7e2ba47b320 100644 --- a/service/cognitoidentityprovider/integ_test.go +++ b/service/cognitoidentityprovider/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cognitoidentityprovider_test diff --git a/service/cognitosync/integ_test.go b/service/cognitosync/integ_test.go index 9c8e727e516..6517c718b8b 100644 --- a/service/cognitosync/integ_test.go +++ b/service/cognitosync/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package cognitosync_test diff --git a/service/configservice/integ_test.go b/service/configservice/integ_test.go index 476d11d9537..cac45374506 100644 --- a/service/configservice/integ_test.go +++ b/service/configservice/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package configservice_test diff --git a/service/costandusagereportservice/integ_test.go b/service/costandusagereportservice/integ_test.go index ff111bc7c8b..27aec157b98 100644 --- a/service/costandusagereportservice/integ_test.go +++ b/service/costandusagereportservice/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package costandusagereportservice_test diff --git a/service/databasemigrationservice/integ_test.go b/service/databasemigrationservice/integ_test.go index 760abe5b59b..277cbbb56c9 100644 --- a/service/databasemigrationservice/integ_test.go +++ b/service/databasemigrationservice/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package databasemigrationservice_test diff --git a/service/devicefarm/integ_test.go b/service/devicefarm/integ_test.go index 81c7fefb3cd..bcde0c2806d 100644 --- a/service/devicefarm/integ_test.go +++ b/service/devicefarm/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package devicefarm_test diff --git a/service/directconnect/integ_test.go b/service/directconnect/integ_test.go index 2a6aa5acf3f..9fd85d35534 100644 --- a/service/directconnect/integ_test.go +++ b/service/directconnect/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package directconnect_test diff --git a/service/directoryservice/integ_test.go b/service/directoryservice/integ_test.go index b8741f386a9..3511b35a38b 100644 --- a/service/directoryservice/integ_test.go +++ b/service/directoryservice/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package directoryservice_test diff --git a/service/docdb/customizations_test.go b/service/docdb/customizations_test.go index 0120548158d..b702e963fda 100644 --- a/service/docdb/customizations_test.go +++ b/service/docdb/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package docdb diff --git a/service/docdb/integ_test.go b/service/docdb/integ_test.go index 7ba05cbfc33..24068dd9ea2 100644 --- a/service/docdb/integ_test.go +++ b/service/docdb/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package docdb_test diff --git a/service/dynamodb/dynamodbattribute/fields_go1.9.go b/service/dynamodb/dynamodbattribute/fields_go1.9.go index 9240f3b91bf..e09e2749625 100644 --- a/service/dynamodb/dynamodbattribute/fields_go1.9.go +++ b/service/dynamodb/dynamodbattribute/fields_go1.9.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package dynamodbattribute diff --git a/service/dynamodb/dynamodbattribute/fields_go_old.go b/service/dynamodb/dynamodbattribute/fields_go_old.go index 66591c85699..3162677f421 100644 --- a/service/dynamodb/dynamodbattribute/fields_go_old.go +++ b/service/dynamodb/dynamodbattribute/fields_go_old.go @@ -1,3 +1,4 @@ +//go:build !go1.9 // +build !go1.9 package dynamodbattribute diff --git a/service/dynamodb/expression/condition_test.go b/service/dynamodb/expression/condition_test.go index 3f7d8282505..b5a50781d82 100644 --- a/service/dynamodb/expression/condition_test.go +++ b/service/dynamodb/expression/condition_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package expression diff --git a/service/dynamodb/expression/error_test.go b/service/dynamodb/expression/error_test.go index 7b4b2217700..07e125fcf96 100644 --- a/service/dynamodb/expression/error_test.go +++ b/service/dynamodb/expression/error_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package expression diff --git a/service/dynamodb/expression/expression_test.go b/service/dynamodb/expression/expression_test.go index 43bad82e565..958b60ac51f 100644 --- a/service/dynamodb/expression/expression_test.go +++ b/service/dynamodb/expression/expression_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package expression diff --git a/service/dynamodb/expression/key_condition_test.go b/service/dynamodb/expression/key_condition_test.go index 9d06054e017..857462a5ca9 100644 --- a/service/dynamodb/expression/key_condition_test.go +++ b/service/dynamodb/expression/key_condition_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package expression diff --git a/service/dynamodb/expression/operand_test.go b/service/dynamodb/expression/operand_test.go index 9d1a35d8ee4..927f537ed73 100644 --- a/service/dynamodb/expression/operand_test.go +++ b/service/dynamodb/expression/operand_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package expression diff --git a/service/dynamodb/expression/projection_test.go b/service/dynamodb/expression/projection_test.go index 7cbec12f336..f8d7f4bf661 100644 --- a/service/dynamodb/expression/projection_test.go +++ b/service/dynamodb/expression/projection_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package expression diff --git a/service/dynamodb/expression/update_test.go b/service/dynamodb/expression/update_test.go index 2e8a47351be..3df674d851f 100644 --- a/service/dynamodb/expression/update_test.go +++ b/service/dynamodb/expression/update_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package expression diff --git a/service/dynamodb/integ_cust_test.go b/service/dynamodb/integ_cust_test.go index 0d4b17424a8..54c20102753 100644 --- a/service/dynamodb/integ_cust_test.go +++ b/service/dynamodb/integ_cust_test.go @@ -1,3 +1,4 @@ +//go:build go1.10 && integration // +build go1.10,integration package dynamodb diff --git a/service/dynamodb/integ_test.go b/service/dynamodb/integ_test.go index 2949db05f3e..0a72f780d3c 100644 --- a/service/dynamodb/integ_test.go +++ b/service/dynamodb/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package dynamodb_test diff --git a/service/ec2/customizations_test.go b/service/ec2/customizations_test.go index 975442227ab..4df996fd593 100644 --- a/service/ec2/customizations_test.go +++ b/service/ec2/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package ec2_test diff --git a/service/ec2/integ_test.go b/service/ec2/integ_test.go index 59938b35fac..06224bc332a 100644 --- a/service/ec2/integ_test.go +++ b/service/ec2/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package ec2_test diff --git a/service/ecr/integ_test.go b/service/ecr/integ_test.go index 12c417c972e..aa5e944126b 100644 --- a/service/ecr/integ_test.go +++ b/service/ecr/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package ecr_test diff --git a/service/ecs/integ_test.go b/service/ecs/integ_test.go index 85b5f772ace..2f8ca2069c7 100644 --- a/service/ecs/integ_test.go +++ b/service/ecs/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package ecs_test diff --git a/service/efs/integ_test.go b/service/efs/integ_test.go index bf3dc437eec..721ec216a23 100644 --- a/service/efs/integ_test.go +++ b/service/efs/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package efs_test diff --git a/service/elasticache/integ_test.go b/service/elasticache/integ_test.go index e7920da7051..3c03f15a286 100644 --- a/service/elasticache/integ_test.go +++ b/service/elasticache/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package elasticache_test diff --git a/service/elasticbeanstalk/integ_test.go b/service/elasticbeanstalk/integ_test.go index 8c51b581b27..0e9942be83e 100644 --- a/service/elasticbeanstalk/integ_test.go +++ b/service/elasticbeanstalk/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package elasticbeanstalk_test diff --git a/service/elasticsearchservice/integ_test.go b/service/elasticsearchservice/integ_test.go index 6e9ec57276f..1f7027c7fc1 100644 --- a/service/elasticsearchservice/integ_test.go +++ b/service/elasticsearchservice/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package elasticsearchservice_test diff --git a/service/elastictranscoder/integ_test.go b/service/elastictranscoder/integ_test.go index 13d6e54c2db..1a235987b50 100644 --- a/service/elastictranscoder/integ_test.go +++ b/service/elastictranscoder/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package elastictranscoder_test diff --git a/service/elb/integ_test.go b/service/elb/integ_test.go index c3fb6a7b0ed..1c63b3080a8 100644 --- a/service/elb/integ_test.go +++ b/service/elb/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package elb_test diff --git a/service/elbv2/integ_test.go b/service/elbv2/integ_test.go index 3706d5aae6f..5ed67152fce 100644 --- a/service/elbv2/integ_test.go +++ b/service/elbv2/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package elbv2_test diff --git a/service/emr/integ_test.go b/service/emr/integ_test.go index f20ffd61d9a..8dd7185732b 100644 --- a/service/emr/integ_test.go +++ b/service/emr/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package emr_test diff --git a/service/eventbridge/integ_test.go b/service/eventbridge/integ_test.go index 48fff761831..1ba0cc36117 100644 --- a/service/eventbridge/integ_test.go +++ b/service/eventbridge/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package eventbridge_test diff --git a/service/finspace/cust_integ_test.go b/service/finspace/cust_integ_test.go index 06a555aca89..f5c21b8d3bd 100644 --- a/service/finspace/cust_integ_test.go +++ b/service/finspace/cust_integ_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 && integration // +build go1.7,integration package finspace diff --git a/service/finspace/customizations_test.go b/service/finspace/customizations_test.go index 812defcbe2a..2e0417a5b06 100644 --- a/service/finspace/customizations_test.go +++ b/service/finspace/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package finspace diff --git a/service/finspacedata/cust_integ_test.go b/service/finspacedata/cust_integ_test.go index bacce3dd064..fcc4eb0f12e 100644 --- a/service/finspacedata/cust_integ_test.go +++ b/service/finspacedata/cust_integ_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 && integration // +build go1.7,integration package finspacedata diff --git a/service/finspacedata/customizations_test.go b/service/finspacedata/customizations_test.go index 7b5e275671e..b4e5b195a81 100644 --- a/service/finspacedata/customizations_test.go +++ b/service/finspacedata/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package finspacedata diff --git a/service/firehose/integ_test.go b/service/firehose/integ_test.go index 8ca6e471488..922e12a8e16 100644 --- a/service/firehose/integ_test.go +++ b/service/firehose/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package firehose_test diff --git a/service/gamelift/integ_test.go b/service/gamelift/integ_test.go index 9a41ebff26e..8d387782218 100644 --- a/service/gamelift/integ_test.go +++ b/service/gamelift/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package gamelift_test diff --git a/service/glacier/customizations_test.go b/service/glacier/customizations_test.go index 06ba110b7e2..8e882bd1820 100644 --- a/service/glacier/customizations_test.go +++ b/service/glacier/customizations_test.go @@ -1,3 +1,4 @@ +//go:build !integration // +build !integration package glacier_test diff --git a/service/glacier/integ_test.go b/service/glacier/integ_test.go index c9c9918df5e..44a2385207a 100644 --- a/service/glacier/integ_test.go +++ b/service/glacier/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package glacier_test diff --git a/service/glue/integ_test.go b/service/glue/integ_test.go index 1094af7c113..a5874f387f4 100644 --- a/service/glue/integ_test.go +++ b/service/glue/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package glue_test diff --git a/service/health/integ_test.go b/service/health/integ_test.go index ee16fdd3e77..b8d04190374 100644 --- a/service/health/integ_test.go +++ b/service/health/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package health_test diff --git a/service/iam/integ_test.go b/service/iam/integ_test.go index 9afff56a8e0..bf41bccdb6a 100644 --- a/service/iam/integ_test.go +++ b/service/iam/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package iam_test diff --git a/service/inspector/integ_test.go b/service/inspector/integ_test.go index ecc4186a6d5..025d800245a 100644 --- a/service/inspector/integ_test.go +++ b/service/inspector/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package inspector_test diff --git a/service/iot/integ_test.go b/service/iot/integ_test.go index 362db5f0de9..3999eeb8b45 100644 --- a/service/iot/integ_test.go +++ b/service/iot/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package iot_test diff --git a/service/kinesis/cust_integ_eventstream_test.go b/service/kinesis/cust_integ_eventstream_test.go index 60638503530..bcc3920bb00 100644 --- a/service/kinesis/cust_integ_eventstream_test.go +++ b/service/kinesis/cust_integ_eventstream_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package kinesis_test diff --git a/service/kinesis/cust_integ_shared_test.go b/service/kinesis/cust_integ_shared_test.go index 67448087fd9..a408ef4c4ba 100644 --- a/service/kinesis/cust_integ_shared_test.go +++ b/service/kinesis/cust_integ_shared_test.go @@ -1,3 +1,4 @@ +//go:build integration && go1.15 // +build integration,go1.15 package kinesis_test diff --git a/service/kinesis/eventstream_test.go b/service/kinesis/eventstream_test.go index 01dfc384bce..129386433e0 100644 --- a/service/kinesis/eventstream_test.go +++ b/service/kinesis/eventstream_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15 +//go:build go1.16 +// +build go1.16 package kinesis diff --git a/service/kinesis/integ_test.go b/service/kinesis/integ_test.go index 7ff83373dda..00a8810daf1 100644 --- a/service/kinesis/integ_test.go +++ b/service/kinesis/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package kinesis_test diff --git a/service/kms/integ_test.go b/service/kms/integ_test.go index a43d99aaa65..ad35575ade3 100644 --- a/service/kms/integ_test.go +++ b/service/kms/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package kms_test diff --git a/service/lambda/integ_test.go b/service/lambda/integ_test.go index b8a83f5ee74..a652b60bb77 100644 --- a/service/lambda/integ_test.go +++ b/service/lambda/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package lambda_test diff --git a/service/lexmodelsv2/cust_integ_test.go b/service/lexmodelsv2/cust_integ_test.go index 0205b9ecd9d..26ff6849285 100644 --- a/service/lexmodelsv2/cust_integ_test.go +++ b/service/lexmodelsv2/cust_integ_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 && integration // +build go1.7,integration package lexmodelsv2 diff --git a/service/lexmodelsv2/customizations_test.go b/service/lexmodelsv2/customizations_test.go index 0049db8f948..208a521f7cc 100644 --- a/service/lexmodelsv2/customizations_test.go +++ b/service/lexmodelsv2/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package lexmodelsv2 diff --git a/service/lexruntimev2/eventstream_test.go b/service/lexruntimev2/eventstream_test.go index 537a5e58579..100b7cb9208 100644 --- a/service/lexruntimev2/eventstream_test.go +++ b/service/lexruntimev2/eventstream_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15 +//go:build go1.16 +// +build go1.16 package lexruntimev2 diff --git a/service/lightsail/integ_test.go b/service/lightsail/integ_test.go index 97720af8b93..da1c998aa8c 100644 --- a/service/lightsail/integ_test.go +++ b/service/lightsail/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package lightsail_test diff --git a/service/lookoutmetrics/cust_integ_test.go b/service/lookoutmetrics/cust_integ_test.go index 423b2fcda05..048c19d5908 100644 --- a/service/lookoutmetrics/cust_integ_test.go +++ b/service/lookoutmetrics/cust_integ_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 && integration // +build go1.7,integration package lookoutmetrics diff --git a/service/lookoutmetrics/customizations_test.go b/service/lookoutmetrics/customizations_test.go index 27613b24149..3114219e244 100644 --- a/service/lookoutmetrics/customizations_test.go +++ b/service/lookoutmetrics/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package lookoutmetrics diff --git a/service/marketplacecommerceanalytics/integ_test.go b/service/marketplacecommerceanalytics/integ_test.go index b87bf2db0b0..43a5a2f772a 100644 --- a/service/marketplacecommerceanalytics/integ_test.go +++ b/service/marketplacecommerceanalytics/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package marketplacecommerceanalytics_test diff --git a/service/neptune/customizations_test.go b/service/neptune/customizations_test.go index e192bc22c0d..acf21ba003c 100644 --- a/service/neptune/customizations_test.go +++ b/service/neptune/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package neptune diff --git a/service/neptune/integ_test.go b/service/neptune/integ_test.go index f753abfd37a..a3471305527 100644 --- a/service/neptune/integ_test.go +++ b/service/neptune/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package neptune_test diff --git a/service/opsworks/integ_test.go b/service/opsworks/integ_test.go index dfe8979ccd8..62f088d2a64 100644 --- a/service/opsworks/integ_test.go +++ b/service/opsworks/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package opsworks_test diff --git a/service/pinpointemail/integ_test.go b/service/pinpointemail/integ_test.go index 61896557a0f..1db54c1d2c6 100644 --- a/service/pinpointemail/integ_test.go +++ b/service/pinpointemail/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package pinpointemail_test diff --git a/service/polly/integ_test.go b/service/polly/integ_test.go index 4de3cffc062..6d2c7bf80e8 100644 --- a/service/polly/integ_test.go +++ b/service/polly/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package polly_test diff --git a/service/rds/customizations_test.go b/service/rds/customizations_test.go index ba3d89d5d9f..dd3de54845e 100644 --- a/service/rds/customizations_test.go +++ b/service/rds/customizations_test.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package rds diff --git a/service/rds/integ_test.go b/service/rds/integ_test.go index fe635024c41..ef8a7ee799b 100644 --- a/service/rds/integ_test.go +++ b/service/rds/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package rds_test diff --git a/service/rds/rdsutils/example_test.go b/service/rds/rdsutils/example_test.go index 32147c6f789..ac49825cad1 100644 --- a/service/rds/rdsutils/example_test.go +++ b/service/rds/rdsutils/example_test.go @@ -1,3 +1,4 @@ +//go:build example // +build example package rdsutils_test diff --git a/service/redshift/integ_test.go b/service/redshift/integ_test.go index bc089aec823..3e80ab04fa1 100644 --- a/service/redshift/integ_test.go +++ b/service/redshift/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package redshift_test diff --git a/service/rekognition/integ_test.go b/service/rekognition/integ_test.go index 5823d4fc45f..fbbd5cf5130 100644 --- a/service/rekognition/integ_test.go +++ b/service/rekognition/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package rekognition_test diff --git a/service/route53/integ_test.go b/service/route53/integ_test.go index d2838b2fece..773b4bd3e6b 100644 --- a/service/route53/integ_test.go +++ b/service/route53/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package route53_test diff --git a/service/route53/unmarshal_error_test.go b/service/route53/unmarshal_error_test.go index 29329b41ebc..df12778c38a 100644 --- a/service/route53/unmarshal_error_test.go +++ b/service/route53/unmarshal_error_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package route53 diff --git a/service/route53domains/integ_test.go b/service/route53domains/integ_test.go index 546e66f6195..668a818a00a 100644 --- a/service/route53domains/integ_test.go +++ b/service/route53domains/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package route53domains_test diff --git a/service/route53resolver/integ_test.go b/service/route53resolver/integ_test.go index cd948f13d72..2af490bc6ff 100644 --- a/service/route53resolver/integ_test.go +++ b/service/route53resolver/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package route53resolver_test diff --git a/service/s3/cust_integ_endpoint_test.go b/service/s3/cust_integ_endpoint_test.go index f0c9f467aaf..52cfc251638 100644 --- a/service/s3/cust_integ_endpoint_test.go +++ b/service/s3/cust_integ_endpoint_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3_test diff --git a/service/s3/cust_integ_eventstream_test.go b/service/s3/cust_integ_eventstream_test.go index 40a5b700b0e..290714f56e8 100644 --- a/service/s3/cust_integ_eventstream_test.go +++ b/service/s3/cust_integ_eventstream_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3_test diff --git a/service/s3/cust_integ_object_checksum_test.go b/service/s3/cust_integ_object_checksum_test.go index 290bc9cf065..1d36eb06459 100644 --- a/service/s3/cust_integ_object_checksum_test.go +++ b/service/s3/cust_integ_object_checksum_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3_test diff --git a/service/s3/cust_integ_shared_test.go b/service/s3/cust_integ_shared_test.go index 8ae38de0f13..6becb1832cc 100644 --- a/service/s3/cust_integ_shared_test.go +++ b/service/s3/cust_integ_shared_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3_test diff --git a/service/s3/cust_integ_test.go b/service/s3/cust_integ_test.go index f4598a9c80a..9f90b697242 100644 --- a/service/s3/cust_integ_test.go +++ b/service/s3/cust_integ_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3_test diff --git a/service/s3/endpoint_test.go b/service/s3/endpoint_test.go index e2fc75d09f2..22c5d2dbb7d 100644 --- a/service/s3/endpoint_test.go +++ b/service/s3/endpoint_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3 diff --git a/service/s3/eventstream_test.go b/service/s3/eventstream_test.go index cc6c9ea94a6..236242925c9 100644 --- a/service/s3/eventstream_test.go +++ b/service/s3/eventstream_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15 +//go:build go1.16 +// +build go1.16 package s3 diff --git a/service/s3/integ_test.go b/service/s3/integ_test.go index cadcc556cdf..dfe216e8055 100644 --- a/service/s3/integ_test.go +++ b/service/s3/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package s3_test diff --git a/service/s3/platform_handlers.go b/service/s3/platform_handlers.go index 8e6f3307d41..308b7d473e2 100644 --- a/service/s3/platform_handlers.go +++ b/service/s3/platform_handlers.go @@ -1,3 +1,4 @@ +//go:build !go1.6 // +build !go1.6 package s3 diff --git a/service/s3/platform_handlers_go1.6.go b/service/s3/platform_handlers_go1.6.go index 14d05f7b75a..339019d3217 100644 --- a/service/s3/platform_handlers_go1.6.go +++ b/service/s3/platform_handlers_go1.6.go @@ -1,3 +1,4 @@ +//go:build go1.6 // +build go1.6 package s3 diff --git a/service/s3/platform_handlers_go1.6_test.go b/service/s3/platform_handlers_go1.6_test.go index 0675537ca71..6a8d83cca90 100644 --- a/service/s3/platform_handlers_go1.6_test.go +++ b/service/s3/platform_handlers_go1.6_test.go @@ -1,3 +1,4 @@ +//go:build go1.6 // +build go1.6 package s3_test diff --git a/service/s3/s3crypto/aes_gcm_test.go b/service/s3/s3crypto/aes_gcm_test.go index 29e67d15105..96980bd9d14 100644 --- a/service/s3/s3crypto/aes_gcm_test.go +++ b/service/s3/s3crypto/aes_gcm_test.go @@ -1,3 +1,4 @@ +//go:build go1.9 // +build go1.9 package s3crypto diff --git a/service/s3/s3crypto/decryption_client_v2_test.go b/service/s3/s3crypto/decryption_client_v2_test.go index 218025f3493..a41e399d1c5 100644 --- a/service/s3/s3crypto/decryption_client_v2_test.go +++ b/service/s3/s3crypto/decryption_client_v2_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3crypto_test diff --git a/service/s3/s3crypto/encryption_client_v2_test.go b/service/s3/s3crypto/encryption_client_v2_test.go index f881ed2cbff..c90f43b9809 100644 --- a/service/s3/s3crypto/encryption_client_v2_test.go +++ b/service/s3/s3crypto/encryption_client_v2_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3crypto diff --git a/service/s3/s3crypto/envelope_test.go b/service/s3/s3crypto/envelope_test.go index 66900d69425..9d100e9b431 100644 --- a/service/s3/s3crypto/envelope_test.go +++ b/service/s3/s3crypto/envelope_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3crypto diff --git a/service/s3/s3crypto/integ_test.go b/service/s3/s3crypto/integ_test.go index faee032da1a..9e5e17f1a30 100644 --- a/service/s3/s3crypto/integ_test.go +++ b/service/s3/s3crypto/integ_test.go @@ -1,3 +1,4 @@ +//go:build go1.9 && s3crypto_integ // +build go1.9,s3crypto_integ package s3crypto_test diff --git a/service/s3/s3crypto/integration/main_test.go b/service/s3/s3crypto/integration/main_test.go index 55250f64381..66394ff82cd 100644 --- a/service/s3/s3crypto/integration/main_test.go +++ b/service/s3/s3crypto/integration/main_test.go @@ -1,3 +1,4 @@ +//go:build integration && go1.14 // +build integration,go1.14 package integration diff --git a/service/s3/s3crypto/mat_desc_test.go b/service/s3/s3crypto/mat_desc_test.go index 056c56d89cd..415a2f3eef7 100644 --- a/service/s3/s3crypto/mat_desc_test.go +++ b/service/s3/s3crypto/mat_desc_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3crypto diff --git a/service/s3/s3manager/batch_1_7_test.go b/service/s3/s3manager/batch_1_7_test.go index bbe94b877b2..8dcdc1bb141 100644 --- a/service/s3/s3manager/batch_1_7_test.go +++ b/service/s3/s3manager/batch_1_7_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3manager diff --git a/service/s3/s3manager/default_read_seeker_write_to.go b/service/s3/s3manager/default_read_seeker_write_to.go index 42276530a8b..e013be27e1c 100644 --- a/service/s3/s3manager/default_read_seeker_write_to.go +++ b/service/s3/s3manager/default_read_seeker_write_to.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package s3manager diff --git a/service/s3/s3manager/default_writer_read_from.go b/service/s3/s3manager/default_writer_read_from.go index ada50c24355..5583c30a440 100644 --- a/service/s3/s3manager/default_writer_read_from.go +++ b/service/s3/s3manager/default_writer_read_from.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package s3manager diff --git a/service/s3/s3manager/download_test.go b/service/s3/s3manager/download_test.go index c6eb0c4ee43..00ff8d785af 100644 --- a/service/s3/s3manager/download_test.go +++ b/service/s3/s3manager/download_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3manager_test diff --git a/service/s3/s3manager/integ_bucket_region_test.go b/service/s3/s3manager/integ_bucket_region_test.go index ac3f58ad7e5..52d13473631 100644 --- a/service/s3/s3manager/integ_bucket_region_test.go +++ b/service/s3/s3manager/integ_bucket_region_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3manager_test diff --git a/service/s3/s3manager/integ_shared_test.go b/service/s3/s3manager/integ_shared_test.go index e5fd91d7e70..7d567ae8efb 100644 --- a/service/s3/s3manager/integ_shared_test.go +++ b/service/s3/s3manager/integ_shared_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3manager_test diff --git a/service/s3/s3manager/integ_upload_test.go b/service/s3/s3manager/integ_upload_test.go index 3eadd99b265..0d57b3525ce 100644 --- a/service/s3/s3manager/integ_upload_test.go +++ b/service/s3/s3manager/integ_upload_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3manager_test diff --git a/service/s3/s3manager/pool_test.go b/service/s3/s3manager/pool_test.go index e609a31a9ff..a8112eca412 100644 --- a/service/s3/s3manager/pool_test.go +++ b/service/s3/s3manager/pool_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3manager diff --git a/service/s3/s3manager/upload_internal_test.go b/service/s3/s3manager/upload_internal_test.go index a71c250685a..c760a536d3e 100644 --- a/service/s3/s3manager/upload_internal_test.go +++ b/service/s3/s3manager/upload_internal_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3manager diff --git a/service/s3/s3manager/upload_test.go b/service/s3/s3manager/upload_test.go index d2a49df28cd..838c38950ee 100644 --- a/service/s3/s3manager/upload_test.go +++ b/service/s3/s3manager/upload_test.go @@ -1,3 +1,4 @@ +//go:build go1.8 // +build go1.8 package s3manager_test diff --git a/service/s3/statusok_error_test.go b/service/s3/statusok_error_test.go index eef602d7c56..dc8176aa7ce 100644 --- a/service/s3/statusok_error_test.go +++ b/service/s3/statusok_error_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3_test diff --git a/service/s3control/cust_integ_public_lockdown_test.go b/service/s3control/cust_integ_public_lockdown_test.go index 1f210824e3b..6e0d4c6c98d 100644 --- a/service/s3control/cust_integ_public_lockdown_test.go +++ b/service/s3control/cust_integ_public_lockdown_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3control_test diff --git a/service/s3control/cust_integ_shared_test.go b/service/s3control/cust_integ_shared_test.go index 6113eb11a5d..66129d0b444 100644 --- a/service/s3control/cust_integ_shared_test.go +++ b/service/s3control/cust_integ_shared_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package s3control_test diff --git a/service/s3control/endpoint_test.go b/service/s3control/endpoint_test.go index 493a3e0f8e3..92447fcb5c0 100644 --- a/service/s3control/endpoint_test.go +++ b/service/s3control/endpoint_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package s3control diff --git a/service/secretsmanager/integ_test.go b/service/secretsmanager/integ_test.go index 662608b7c39..c167331a8bf 100644 --- a/service/secretsmanager/integ_test.go +++ b/service/secretsmanager/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package secretsmanager_test diff --git a/service/servicecatalog/integ_test.go b/service/servicecatalog/integ_test.go index 250cebefb18..ff22a2c1fb0 100644 --- a/service/servicecatalog/integ_test.go +++ b/service/servicecatalog/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package servicecatalog_test diff --git a/service/ses/integ_test.go b/service/ses/integ_test.go index 2fed11bf0db..bf99601541b 100644 --- a/service/ses/integ_test.go +++ b/service/ses/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package ses_test diff --git a/service/sfn/integ_test.go b/service/sfn/integ_test.go index a2a5cab1938..303e3d7076b 100644 --- a/service/sfn/integ_test.go +++ b/service/sfn/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package sfn_test diff --git a/service/shield/integ_test.go b/service/shield/integ_test.go index 7b29f2f6421..7d20f38f332 100644 --- a/service/shield/integ_test.go +++ b/service/shield/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package shield_test diff --git a/service/sms/integ_test.go b/service/sms/integ_test.go index 161a85353b6..3378a300663 100644 --- a/service/sms/integ_test.go +++ b/service/sms/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package sms_test diff --git a/service/snowball/integ_test.go b/service/snowball/integ_test.go index b9005c467a6..a4774819dce 100644 --- a/service/snowball/integ_test.go +++ b/service/snowball/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package snowball_test diff --git a/service/sns/integ_test.go b/service/sns/integ_test.go index 0ba32db572b..7b0ddef54c7 100644 --- a/service/sns/integ_test.go +++ b/service/sns/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package sns_test diff --git a/service/sqs/integ_test.go b/service/sqs/integ_test.go index c01627c6a46..fb1b0a94366 100644 --- a/service/sqs/integ_test.go +++ b/service/sqs/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package sqs_test diff --git a/service/ssm/integ_test.go b/service/ssm/integ_test.go index 1bb5def062c..a7481c72b99 100644 --- a/service/ssm/integ_test.go +++ b/service/ssm/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package ssm_test diff --git a/service/sts/integ_test.go b/service/sts/integ_test.go index 0fde6c27705..6bff8291286 100644 --- a/service/sts/integ_test.go +++ b/service/sts/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package sts_test diff --git a/service/support/integ_test.go b/service/support/integ_test.go index 6036aff0aeb..8665218b94e 100644 --- a/service/support/integ_test.go +++ b/service/support/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package support_test diff --git a/service/transcribestreamingservice/cust_integ_eventstream_test.go b/service/transcribestreamingservice/cust_integ_eventstream_test.go index 7565d768158..b2655782ffb 100644 --- a/service/transcribestreamingservice/cust_integ_eventstream_test.go +++ b/service/transcribestreamingservice/cust_integ_eventstream_test.go @@ -1,3 +1,4 @@ +//go:build integration // +build integration package transcribestreamingservice diff --git a/service/transcribestreamingservice/eventstream_example_test.go b/service/transcribestreamingservice/eventstream_example_test.go index 24c1baf1678..4fb0fdfd75b 100644 --- a/service/transcribestreamingservice/eventstream_example_test.go +++ b/service/transcribestreamingservice/eventstream_example_test.go @@ -1,3 +1,4 @@ +//go:build go1.7 // +build go1.7 package transcribestreamingservice diff --git a/service/transcribestreamingservice/eventstream_test.go b/service/transcribestreamingservice/eventstream_test.go index 726df7319b9..85a133118c0 100644 --- a/service/transcribestreamingservice/eventstream_test.go +++ b/service/transcribestreamingservice/eventstream_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15 +//go:build go1.16 +// +build go1.16 package transcribestreamingservice diff --git a/service/transcribestreamingservice/unit_test.go b/service/transcribestreamingservice/unit_test.go index 7e1d29046f3..74187ef5eb0 100644 --- a/service/transcribestreamingservice/unit_test.go +++ b/service/transcribestreamingservice/unit_test.go @@ -1,3 +1,4 @@ +//go:build go1.10 // +build go1.10 package transcribestreamingservice diff --git a/service/waf/integ_test.go b/service/waf/integ_test.go index e2f9496d2ab..148bdbba38f 100644 --- a/service/waf/integ_test.go +++ b/service/waf/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package waf_test diff --git a/service/wafregional/integ_test.go b/service/wafregional/integ_test.go index 24c402017eb..87f4aed7f64 100644 --- a/service/wafregional/integ_test.go +++ b/service/wafregional/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package wafregional_test diff --git a/service/wafv2/integ_test.go b/service/wafv2/integ_test.go index 043d2e586c8..2c3b75f1627 100644 --- a/service/wafv2/integ_test.go +++ b/service/wafv2/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package wafv2_test diff --git a/service/workspaces/integ_test.go b/service/workspaces/integ_test.go index ce78ca6e756..6884c177d78 100644 --- a/service/workspaces/integ_test.go +++ b/service/workspaces/integ_test.go @@ -1,6 +1,7 @@ // Code generated by private/model/cli/gen-api/main.go. DO NOT EDIT. -// +build go1.15,integration +//go:build go1.16 && integration +// +build go1.16,integration package workspaces_test