From c3d4124ccf64fa1bd6b0d51100def46faf09ac88 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Sat, 11 Nov 2023 00:38:17 -0800 Subject: [PATCH] Updates `aws-sdk-go-base` --- go.mod | 8 ++---- go.sum | 12 ++++---- .../remote-state/s3/backend_complete_test.go | 28 +++++++++++++++++-- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 9ab233db91..1fdb1d1c89 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.3.0 - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.38 + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.39 github.com/hashicorp/consul/api v1.13.0 github.com/hashicorp/consul/sdk v0.8.0 github.com/hashicorp/copywrite v0.16.3 @@ -97,7 +97,7 @@ require ( golang.org/x/oauth2 v0.10.0 golang.org/x/sys v0.13.0 golang.org/x/term v0.13.0 - golang.org/x/text v0.13.0 + golang.org/x/text v0.14.0 golang.org/x/tools v0.13.0 golang.org/x/tools/cmd/cover v0.1.0-deprecated google.golang.org/api v0.126.0 @@ -149,7 +149,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.1 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.4.0 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.1 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.26.0 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.27.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.8.1 // indirect @@ -275,5 +275,3 @@ require ( ) go 1.21.3 - -replace github.com/hashicorp/aws-sdk-go-base/v2 => github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.38.0.20231106231929-ee4c6bb6c5c8 diff --git a/go.sum b/go.sum index 76b84207ea..3a230312e5 100644 --- a/go.sum +++ b/go.sum @@ -340,8 +340,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.1/go.mod h1:ToBFBnjeGR2ruMx8IWp/y github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.25.0 h1:wAG9NailFhGhg8Ngg2YeCtzGmFWc63SYqJKdvN5ZMkE= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.25.0/go.mod h1:ByrosnNlEq6xkA0d+FwB4f0HH/5KWCcgBqVxAt+Rsps= -github.com/aws/aws-sdk-go-v2/service/iam v1.26.0 h1:BGEB7NY0e0YZjrQBDN+2kj0ZZg/B5xNjyk0SUjeKuj8= -github.com/aws/aws-sdk-go-v2/service/iam v1.26.0/go.mod h1:K+kpOBBIGJKPAVdyzzCRR6ssqxpVG6SioxWi2/uWctk= +github.com/aws/aws-sdk-go-v2/service/iam v1.27.0 h1:Yho1UMoY/Gno30by4l7dXgIdr78t4OuIpw3VT1xz/zE= +github.com/aws/aws-sdk-go-v2/service/iam v1.27.0/go.mod h1:K+kpOBBIGJKPAVdyzzCRR6ssqxpVG6SioxWi2/uWctk= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.0 h1:CJxo7ZBbaIzmXfV3hjcx36n9V87gJsIUPJflwqEHl3Q= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.0/go.mod h1:yjVfjuY4nD1EW9i387Kau+I6V5cBA5YnC/mWNopjZrI= @@ -645,8 +645,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rH github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.38.0.20231106231929-ee4c6bb6c5c8 h1:9EQc7Lio5Mhc0dkQAz3Kb/qdv+5K5CfIE6Kp3i+Q69E= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.38.0.20231106231929-ee4c6bb6c5c8/go.mod h1:y1qchK9Ii0bpVNfofQIByA3vD7W+RG5x+lDIXhj2ITY= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.39 h1:nyCyZVZJ5CmYelTkCDmC9dO2UgzTB5daeAFn8P9UOtA= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.39/go.mod h1:HMcr0msfsuDQCed/AhmdLlRU0IoAcB31hrvQed3JiLc= github.com/hashicorp/consul/api v1.13.0 h1:2hnLQ0GjQvw7f3O61jMO8gbasZviZTrt9R8WzgiirHc= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= github.com/hashicorp/consul/sdk v0.8.0 h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU= @@ -1402,8 +1402,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/internal/backend/remote-state/s3/backend_complete_test.go b/internal/backend/remote-state/s3/backend_complete_test.go index 1846ac40fd..4c81f15095 100644 --- a/internal/backend/remote-state/s3/backend_complete_test.go +++ b/internal/backend/remote-state/s3/backend_complete_test.go @@ -2034,8 +2034,12 @@ type testCaseDriver struct { config configurer } -func (d *testCaseDriver) Configuration() configtesting.Configurer { - return d.configuration() +func (d *testCaseDriver) Configuration(fs []configtesting.ConfigFunc) configtesting.Configurer { + config := d.configuration() + for _, f := range fs { + f(config) + } + return config } func (d *testCaseDriver) configuration() *configurer { @@ -2112,10 +2116,26 @@ func (c configurer) setKey(s string) { c["key"] = s } +func (c configurer) SetAccessKey(s string) { + c["access_key"] = s +} + +func (c configurer) SetSecretKey(s string) { + c["secret_key"] = s +} + +func (c configurer) SetProfile(s string) { + c["profile"] = s +} + func (c configurer) SetRegion(s string) { c["region"] = s } +func (c configurer) SetUseFIPSEndpoint(b bool) { + c["use_fips_endpoint"] = b +} + func (c configurer) SetSkipCredsValidation(b bool) { c["skip_credentials_validation"] = b } @@ -2132,6 +2152,10 @@ func (t thing) GetCredentials() aws.CredentialsProvider { return t.Credentials } +func (t thing) GetRegion() string { + return t.Region +} + func TestBackendConfig_Authentication_SSO(t *testing.T) { configtesting.SSO(t, &testDriver{}) }