Merge #67011

67011: go.mod: bump github.com/aws/aws-sdk-go to v1.38.69 r=adityamaru a=adityamaru Release notes: https://github.com/aws/aws-sdk-go/releases Release note: None Co-authored-by: Aditya Maru <[email protected]>
cockroachdb · Jul 13, 2021 · dd1cdfc · dd1cdfc
2 parents 86763c0 + 6c971c1
commit dd1cdfc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -182,8 +182,8 @@ def go_deps():
         name = "com_github_aws_aws_sdk_go",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/aws/aws-sdk-go",
-        sum = "h1:ASmYIgWuPW1p01Xxch3ygaptshrEe7Vt+CirmwIqMtI=",
-        version = "v1.36.33",
+        sum = "h1:V489lmrdkIQSfF6OAGZZ1Cavcm7eczCm2JcGvX+yHRg=",
+        version = "v1.38.69",
     )
     go_repository(
         name = "com_github_axiomhq_hyperloglog",

diff --git a/go.mod b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/apache/arrow/go/arrow v0.0.0-20200610220642-670890229854
 	github.com/apache/thrift v0.0.0-20181211084444-2b7365c54f82 // indirect
 	github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
-	github.com/aws/aws-sdk-go v1.36.33
+	github.com/aws/aws-sdk-go v1.38.69
 	github.com/axiomhq/hyperloglog v0.0.0-20181223111420-4b99d0c2c99e
 	github.com/bazelbuild/rules_go v0.26.0
 	github.com/biogo/store v0.0.0-20160505134755-913427a1d5e8

diff --git a/go.sum b/go.sum
@@ -188,8 +188,8 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGL
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-sdk-go v1.28.8/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
-github.com/aws/aws-sdk-go v1.36.33 h1:ASmYIgWuPW1p01Xxch3ygaptshrEe7Vt+CirmwIqMtI=
-github.com/aws/aws-sdk-go v1.36.33/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.38.69 h1:V489lmrdkIQSfF6OAGZZ1Cavcm7eczCm2JcGvX+yHRg=
+github.com/aws/aws-sdk-go v1.38.69/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/axiomhq/hyperloglog v0.0.0-20181223111420-4b99d0c2c99e h1:190ugM9MsyFauTkR/UqcHG/mn5nmFe6SvHJqEHIrtrA=
 github.com/axiomhq/hyperloglog v0.0.0-20181223111420-4b99d0c2c99e/go.mod h1:IOXAcuKIFq/mDyuQ4wyJuJ79XLMsmLM+5RdQ+vWrL7o=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=

diff --git a/pkg/storage/cloud/amazon/aws_kms_test.go b/pkg/storage/cloud/amazon/aws_kms_test.go
@@ -80,7 +80,7 @@ func TestEncryptDecryptAWS(t *testing.T) {
 			params.Add(KMSRegionParam, kmsRegion)
 
 			uri := fmt.Sprintf("aws:///%s?%s", keyID, params.Encode())
-			_, err := cloud.KMSFromURI(uri, &testKMSEnv{})
+			_, err := cloud.KMSFromURI(uri, &testKMSEnv{externalIOConfig: &base.ExternalIODirConfig{}})
 			require.EqualError(t, err, fmt.Sprintf(
 				`%s is set to '%s', but %s is not set`,
 				cloud.AuthParam,

diff --git a/vendor b/vendor
+0 −4		github.com/aws/aws-sdk-go/aws/client/client.go
+8 −0		github.com/aws/aws-sdk-go/aws/client/logger.go
+1 −1		github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
+60 −0		github.com/aws/aws-sdk-go/aws/credentials/ssocreds/doc.go
+9 −0		github.com/aws/aws-sdk-go/aws/credentials/ssocreds/os.go
+7 −0		github.com/aws/aws-sdk-go/aws/credentials/ssocreds/os_windows.go
+180 −0		github.com/aws/aws-sdk-go/aws/credentials/ssocreds/provider.go
+1 −1		github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
+2 −2		github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
+868 −52		github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
+4 −4		github.com/aws/aws-sdk-go/aws/endpoints/v3model.go
+16 −1		github.com/aws/aws-sdk-go/aws/request/request.go
+27 −4		github.com/aws/aws-sdk-go/aws/session/credentials.go
+1 −1		github.com/aws/aws-sdk-go/aws/session/session.go
+80 −3		github.com/aws/aws-sdk-go/aws/session/shared_config.go
+8 −8		github.com/aws/aws-sdk-go/aws/signer/v4/header_rules.go
+10 −6		github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
+1 −1		github.com/aws/aws-sdk-go/aws/version.go
+21 −1		github.com/aws/aws-sdk-go/internal/s3shared/arn/arn.go
+15 −0		github.com/aws/aws-sdk-go/internal/s3shared/arn/s3_object_lambda_arn.go
+13 −0		github.com/aws/aws-sdk-go/internal/s3shared/endpoint_errors.go
+2 −0		github.com/aws/aws-sdk-go/internal/s3shared/resource_request.go
+4 −0		github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/error.go
+0 −46		github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/writer.go
+1 −1		github.com/aws/aws-sdk-go/private/protocol/rest/build.go
+59 −0		github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go
+134 −0		github.com/aws/aws-sdk-go/private/protocol/restjson/unmarshal_error.go
+52 −5		github.com/aws/aws-sdk-go/private/protocol/timestamp.go
+2 −0		github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
+18 −4		github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
+1,417 −319		github.com/aws/aws-sdk-go/service/kms/api.go
+1,506 −797		github.com/aws/aws-sdk-go/service/s3/api.go
+2 −0		github.com/aws/aws-sdk-go/service/s3/customizations.go
+105 −15		github.com/aws/aws-sdk-go/service/s3/endpoint.go
+102 −18		github.com/aws/aws-sdk-go/service/s3/endpoint_builder.go
+3 −3		github.com/aws/aws-sdk-go/service/s3/errors.go
+4 −0		github.com/aws/aws-sdk-go/service/s3/s3iface/interface.go
+23 −0		github.com/aws/aws-sdk-go/service/s3/s3manager/arn.go
+4 −0		github.com/aws/aws-sdk-go/service/s3/s3manager/download.go
+4 −0		github.com/aws/aws-sdk-go/service/s3/s3manager/upload.go
+22 −23		github.com/aws/aws-sdk-go/service/s3/s3manager/upload_input.go
+3 −0		github.com/aws/aws-sdk-go/service/s3/service.go
+1,210 −0		github.com/aws/aws-sdk-go/service/sso/api.go
+44 −0		github.com/aws/aws-sdk-go/service/sso/doc.go
+44 −0		github.com/aws/aws-sdk-go/service/sso/errors.go
+104 −0		github.com/aws/aws-sdk-go/service/sso/service.go
+86 −0		github.com/aws/aws-sdk-go/service/sso/ssoiface/interface.go
+282 −122		github.com/aws/aws-sdk-go/service/sts/api.go
+5 −1		modules.txt