From efb08f71411029f3387ad5bab33434923fc7e699 Mon Sep 17 00:00:00 2001 From: Isaiah Vita <82135527+isaiahvita@users.noreply.github.com> Date: Mon, 24 Jul 2023 12:10:51 -0700 Subject: [PATCH] Fix broken S3 tests (#2203) --- .../AwsEndpointAuthSchemeGenerator.java | 13 +-- service/s3/api_op_AbortMultipartUpload.go | 3 +- service/s3/api_op_CompleteMultipartUpload.go | 3 +- service/s3/api_op_CopyObject.go | 3 +- service/s3/api_op_CreateBucket.go | 3 +- service/s3/api_op_CreateMultipartUpload.go | 3 +- service/s3/api_op_DeleteBucket.go | 3 +- ...i_op_DeleteBucketAnalyticsConfiguration.go | 3 +- service/s3/api_op_DeleteBucketCors.go | 3 +- service/s3/api_op_DeleteBucketEncryption.go | 3 +- ...teBucketIntelligentTieringConfiguration.go | 3 +- ...i_op_DeleteBucketInventoryConfiguration.go | 3 +- service/s3/api_op_DeleteBucketLifecycle.go | 3 +- ...api_op_DeleteBucketMetricsConfiguration.go | 3 +- .../api_op_DeleteBucketOwnershipControls.go | 3 +- service/s3/api_op_DeleteBucketPolicy.go | 3 +- service/s3/api_op_DeleteBucketReplication.go | 3 +- service/s3/api_op_DeleteBucketTagging.go | 3 +- service/s3/api_op_DeleteBucketWebsite.go | 3 +- service/s3/api_op_DeleteObject.go | 3 +- service/s3/api_op_DeleteObjectTagging.go | 3 +- service/s3/api_op_DeleteObjects.go | 3 +- service/s3/api_op_DeletePublicAccessBlock.go | 3 +- ...api_op_GetBucketAccelerateConfiguration.go | 3 +- service/s3/api_op_GetBucketAcl.go | 3 +- .../api_op_GetBucketAnalyticsConfiguration.go | 3 +- service/s3/api_op_GetBucketCors.go | 3 +- service/s3/api_op_GetBucketEncryption.go | 3 +- ...etBucketIntelligentTieringConfiguration.go | 3 +- .../api_op_GetBucketInventoryConfiguration.go | 3 +- .../api_op_GetBucketLifecycleConfiguration.go | 3 +- service/s3/api_op_GetBucketLocation.go | 3 +- service/s3/api_op_GetBucketLogging.go | 3 +- .../api_op_GetBucketMetricsConfiguration.go | 3 +- ...i_op_GetBucketNotificationConfiguration.go | 3 +- .../s3/api_op_GetBucketOwnershipControls.go | 3 +- service/s3/api_op_GetBucketPolicy.go | 3 +- service/s3/api_op_GetBucketPolicyStatus.go | 3 +- service/s3/api_op_GetBucketReplication.go | 3 +- service/s3/api_op_GetBucketRequestPayment.go | 3 +- service/s3/api_op_GetBucketTagging.go | 3 +- service/s3/api_op_GetBucketVersioning.go | 3 +- service/s3/api_op_GetBucketWebsite.go | 3 +- service/s3/api_op_GetObject.go | 3 +- service/s3/api_op_GetObjectAcl.go | 3 +- service/s3/api_op_GetObjectAttributes.go | 3 +- service/s3/api_op_GetObjectLegalHold.go | 3 +- .../s3/api_op_GetObjectLockConfiguration.go | 3 +- service/s3/api_op_GetObjectRetention.go | 3 +- service/s3/api_op_GetObjectTagging.go | 3 +- service/s3/api_op_GetObjectTorrent.go | 3 +- service/s3/api_op_GetPublicAccessBlock.go | 3 +- service/s3/api_op_HeadBucket.go | 3 +- service/s3/api_op_HeadObject.go | 3 +- ...pi_op_ListBucketAnalyticsConfigurations.go | 3 +- ...tBucketIntelligentTieringConfigurations.go | 3 +- ...pi_op_ListBucketInventoryConfigurations.go | 3 +- .../api_op_ListBucketMetricsConfigurations.go | 3 +- service/s3/api_op_ListBuckets.go | 3 +- service/s3/api_op_ListMultipartUploads.go | 3 +- service/s3/api_op_ListObjectVersions.go | 3 +- service/s3/api_op_ListObjects.go | 3 +- service/s3/api_op_ListObjectsV2.go | 3 +- service/s3/api_op_ListParts.go | 3 +- ...api_op_PutBucketAccelerateConfiguration.go | 3 +- service/s3/api_op_PutBucketAcl.go | 3 +- .../api_op_PutBucketAnalyticsConfiguration.go | 3 +- service/s3/api_op_PutBucketCors.go | 3 +- service/s3/api_op_PutBucketEncryption.go | 3 +- ...utBucketIntelligentTieringConfiguration.go | 3 +- .../api_op_PutBucketInventoryConfiguration.go | 3 +- .../api_op_PutBucketLifecycleConfiguration.go | 3 +- service/s3/api_op_PutBucketLogging.go | 3 +- .../api_op_PutBucketMetricsConfiguration.go | 3 +- ...i_op_PutBucketNotificationConfiguration.go | 3 +- .../s3/api_op_PutBucketOwnershipControls.go | 3 +- service/s3/api_op_PutBucketPolicy.go | 3 +- service/s3/api_op_PutBucketReplication.go | 3 +- service/s3/api_op_PutBucketRequestPayment.go | 3 +- service/s3/api_op_PutBucketTagging.go | 3 +- service/s3/api_op_PutBucketVersioning.go | 3 +- service/s3/api_op_PutBucketWebsite.go | 3 +- service/s3/api_op_PutObject.go | 3 +- service/s3/api_op_PutObjectAcl.go | 3 +- service/s3/api_op_PutObjectLegalHold.go | 3 +- .../s3/api_op_PutObjectLockConfiguration.go | 3 +- service/s3/api_op_PutObjectRetention.go | 3 +- service/s3/api_op_PutObjectTagging.go | 3 +- service/s3/api_op_PutPublicAccessBlock.go | 3 +- service/s3/api_op_RestoreObject.go | 3 +- service/s3/api_op_SelectObjectContent.go | 3 +- service/s3/api_op_UploadPart.go | 3 +- service/s3/api_op_UploadPartCopy.go | 3 +- service/s3/api_op_WriteGetObjectResponse.go | 3 +- .../internal/customizations/presign_test.go | 2 +- .../s3/internal/customizations/unit_test.go | 85 ++++++++++--------- .../customizations/update_endpoint_test.go | 15 +--- .../s3/serialize_immutable_hostname_bucket.go | 16 +++- 98 files changed, 257 insertions(+), 153 deletions(-) diff --git a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java index 24118c57562..819754af0f9 100644 --- a/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java +++ b/codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java @@ -194,17 +194,20 @@ private GoWriter.Writable generateSigV4AResolution(ServiceShape serviceShape) { if (serviceId.equalsIgnoreCase("S3")) { writer.write( """ - ctx = $T(ctx, v4aScheme.Name) + ctx = $T(ctx, $T) """, - SymbolUtils.createValueSymbolBuilder("SetSignerVersion", AwsCustomGoDependency.S3_CUSTOMIZATION).build() + SymbolUtils.createValueSymbolBuilder("SetSignerVersion", AwsCustomGoDependency.S3_CUSTOMIZATION).build(), + SymbolUtils.createValueSymbolBuilder("Version", AwsGoDependency.INTERNAL_SIGV4A).build() ); } else if (serviceId.equalsIgnoreCase("EventBridge")) { writer.write( """ - ctx = $T(ctx, v4aScheme.Name) + ctx = $T(ctx, $T) """, - SymbolUtils.createValueSymbolBuilder("SetSignerVersion", AwsCustomGoDependency.EVENTBRIDGE_CUSTOMIZATION).build() - ); } else { + SymbolUtils.createValueSymbolBuilder("SetSignerVersion", AwsCustomGoDependency.EVENTBRIDGE_CUSTOMIZATION).build(), + SymbolUtils.createValueSymbolBuilder("Version", AwsGoDependency.INTERNAL_SIGV4A).build() + ); + } else { writer.write(""); } }; diff --git a/service/s3/api_op_AbortMultipartUpload.go b/service/s3/api_op_AbortMultipartUpload.go index b94a62a779e..e67c2c87c00 100644 --- a/service/s3/api_op_AbortMultipartUpload.go +++ b/service/s3/api_op_AbortMultipartUpload.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -349,7 +350,7 @@ func (m *opAbortMultipartUploadResolveEndpointMiddleware) HandleSerialize(ctx co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_CompleteMultipartUpload.go b/service/s3/api_op_CompleteMultipartUpload.go index cd4cbf7d742..b7708534bbf 100644 --- a/service/s3/api_op_CompleteMultipartUpload.go +++ b/service/s3/api_op_CompleteMultipartUpload.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -521,7 +522,7 @@ func (m *opCompleteMultipartUploadResolveEndpointMiddleware) HandleSerialize(ctx } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_CopyObject.go b/service/s3/api_op_CopyObject.go index 34580f80417..a6dee74b162 100644 --- a/service/s3/api_op_CopyObject.go +++ b/service/s3/api_op_CopyObject.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -693,7 +694,7 @@ func (m *opCopyObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_CreateBucket.go b/service/s3/api_op_CreateBucket.go index a6d6a9821f9..478a9e24a83 100644 --- a/service/s3/api_op_CreateBucket.go +++ b/service/s3/api_op_CreateBucket.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -398,7 +399,7 @@ func (m *opCreateBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_CreateMultipartUpload.go b/service/s3/api_op_CreateMultipartUpload.go index 010abe15496..2752da3318e 100644 --- a/service/s3/api_op_CreateMultipartUpload.go +++ b/service/s3/api_op_CreateMultipartUpload.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -670,7 +671,7 @@ func (m *opCreateMultipartUploadResolveEndpointMiddleware) HandleSerialize(ctx c } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucket.go b/service/s3/api_op_DeleteBucket.go index 74b2b0f19be..271ee07a0c9 100644 --- a/service/s3/api_op_DeleteBucket.go +++ b/service/s3/api_op_DeleteBucket.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -331,7 +332,7 @@ func (m *opDeleteBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go index 46b4af7d6bf..5edc7b7e742 100644 --- a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -313,7 +314,7 @@ func (m *opDeleteBucketAnalyticsConfigurationResolveEndpointMiddleware) HandleSe } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketCors.go b/service/s3/api_op_DeleteBucketCors.go index 49e5c73122e..1c9670f1532 100644 --- a/service/s3/api_op_DeleteBucketCors.go +++ b/service/s3/api_op_DeleteBucketCors.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -302,7 +303,7 @@ func (m *opDeleteBucketCorsResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketEncryption.go b/service/s3/api_op_DeleteBucketEncryption.go index b7efb4c6625..536be8ee0ae 100644 --- a/service/s3/api_op_DeleteBucketEncryption.go +++ b/service/s3/api_op_DeleteBucketEncryption.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -310,7 +311,7 @@ func (m *opDeleteBucketEncryptionResolveEndpointMiddleware) HandleSerialize(ctx } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go b/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go index be2b50f6312..a05cf293848 100644 --- a/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go +++ b/service/s3/api_op_DeleteBucketIntelligentTieringConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -314,7 +315,7 @@ func (m *opDeleteBucketIntelligentTieringConfigurationResolveEndpointMiddleware) } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketInventoryConfiguration.go b/service/s3/api_op_DeleteBucketInventoryConfiguration.go index 603e8ac0ab7..697ea3befef 100644 --- a/service/s3/api_op_DeleteBucketInventoryConfiguration.go +++ b/service/s3/api_op_DeleteBucketInventoryConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -312,7 +313,7 @@ func (m *opDeleteBucketInventoryConfigurationResolveEndpointMiddleware) HandleSe } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketLifecycle.go b/service/s3/api_op_DeleteBucketLifecycle.go index 110d2986e88..27d07b8b9df 100644 --- a/service/s3/api_op_DeleteBucketLifecycle.go +++ b/service/s3/api_op_DeleteBucketLifecycle.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -308,7 +309,7 @@ func (m *opDeleteBucketLifecycleResolveEndpointMiddleware) HandleSerialize(ctx c } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketMetricsConfiguration.go b/service/s3/api_op_DeleteBucketMetricsConfiguration.go index 82dd2ed4319..0949ba04580 100644 --- a/service/s3/api_op_DeleteBucketMetricsConfiguration.go +++ b/service/s3/api_op_DeleteBucketMetricsConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -316,7 +317,7 @@ func (m *opDeleteBucketMetricsConfigurationResolveEndpointMiddleware) HandleSeri } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketOwnershipControls.go b/service/s3/api_op_DeleteBucketOwnershipControls.go index f92c34f80c5..111adff6587 100644 --- a/service/s3/api_op_DeleteBucketOwnershipControls.go +++ b/service/s3/api_op_DeleteBucketOwnershipControls.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -302,7 +303,7 @@ func (m *opDeleteBucketOwnershipControlsResolveEndpointMiddleware) HandleSeriali } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketPolicy.go b/service/s3/api_op_DeleteBucketPolicy.go index fb44ba8ea39..deab9d3245f 100644 --- a/service/s3/api_op_DeleteBucketPolicy.go +++ b/service/s3/api_op_DeleteBucketPolicy.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -314,7 +315,7 @@ func (m *opDeleteBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketReplication.go b/service/s3/api_op_DeleteBucketReplication.go index b222a701c39..1c0c7618c99 100644 --- a/service/s3/api_op_DeleteBucketReplication.go +++ b/service/s3/api_op_DeleteBucketReplication.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -307,7 +308,7 @@ func (m *opDeleteBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketTagging.go b/service/s3/api_op_DeleteBucketTagging.go index 3a9e29a8ac9..94054d60ffa 100644 --- a/service/s3/api_op_DeleteBucketTagging.go +++ b/service/s3/api_op_DeleteBucketTagging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -301,7 +302,7 @@ func (m *opDeleteBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteBucketWebsite.go b/service/s3/api_op_DeleteBucketWebsite.go index 3911b86b43b..8179200d456 100644 --- a/service/s3/api_op_DeleteBucketWebsite.go +++ b/service/s3/api_op_DeleteBucketWebsite.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -309,7 +310,7 @@ func (m *opDeleteBucketWebsiteResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteObject.go b/service/s3/api_op_DeleteObject.go index 2189fcbe8a6..a8835e33af1 100644 --- a/service/s3/api_op_DeleteObject.go +++ b/service/s3/api_op_DeleteObject.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -399,7 +400,7 @@ func (m *opDeleteObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteObjectTagging.go b/service/s3/api_op_DeleteObjectTagging.go index 8a2a341d243..0e1d5cc9c91 100644 --- a/service/s3/api_op_DeleteObjectTagging.go +++ b/service/s3/api_op_DeleteObjectTagging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -330,7 +331,7 @@ func (m *opDeleteObjectTaggingResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeleteObjects.go b/service/s3/api_op_DeleteObjects.go index 7e1db3b0ded..abd1603694c 100644 --- a/service/s3/api_op_DeleteObjects.go +++ b/service/s3/api_op_DeleteObjects.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -412,7 +413,7 @@ func (m *opDeleteObjectsResolveEndpointMiddleware) HandleSerialize(ctx context.C } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_DeletePublicAccessBlock.go b/service/s3/api_op_DeletePublicAccessBlock.go index ca1bb63c94a..a22644eb713 100644 --- a/service/s3/api_op_DeletePublicAccessBlock.go +++ b/service/s3/api_op_DeletePublicAccessBlock.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -305,7 +306,7 @@ func (m *opDeletePublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketAccelerateConfiguration.go b/service/s3/api_op_GetBucketAccelerateConfiguration.go index 66e2a90c334..2a5fcce1bd7 100644 --- a/service/s3/api_op_GetBucketAccelerateConfiguration.go +++ b/service/s3/api_op_GetBucketAccelerateConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -330,7 +331,7 @@ func (m *opGetBucketAccelerateConfigurationResolveEndpointMiddleware) HandleSeri } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketAcl.go b/service/s3/api_op_GetBucketAcl.go index 74f7f72250b..2a7cb12699f 100644 --- a/service/s3/api_op_GetBucketAcl.go +++ b/service/s3/api_op_GetBucketAcl.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -329,7 +330,7 @@ func (m *opGetBucketAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketAnalyticsConfiguration.go b/service/s3/api_op_GetBucketAnalyticsConfiguration.go index 3c3079aeba1..ca2214e34ec 100644 --- a/service/s3/api_op_GetBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_GetBucketAnalyticsConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -319,7 +320,7 @@ func (m *opGetBucketAnalyticsConfigurationResolveEndpointMiddleware) HandleSeria } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketCors.go b/service/s3/api_op_GetBucketCors.go index d4b8115e896..96d374133d3 100644 --- a/service/s3/api_op_GetBucketCors.go +++ b/service/s3/api_op_GetBucketCors.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -322,7 +323,7 @@ func (m *opGetBucketCorsResolveEndpointMiddleware) HandleSerialize(ctx context.C } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketEncryption.go b/service/s3/api_op_GetBucketEncryption.go index 8a46b8bf13e..c575117b055 100644 --- a/service/s3/api_op_GetBucketEncryption.go +++ b/service/s3/api_op_GetBucketEncryption.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -315,7 +316,7 @@ func (m *opGetBucketEncryptionResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go b/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go index a5dc711e781..ef00ab3340b 100644 --- a/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go +++ b/service/s3/api_op_GetBucketIntelligentTieringConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -319,7 +320,7 @@ func (m *opGetBucketIntelligentTieringConfigurationResolveEndpointMiddleware) Ha } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketInventoryConfiguration.go b/service/s3/api_op_GetBucketInventoryConfiguration.go index 75a284c1640..415e43bc323 100644 --- a/service/s3/api_op_GetBucketInventoryConfiguration.go +++ b/service/s3/api_op_GetBucketInventoryConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -316,7 +317,7 @@ func (m *opGetBucketInventoryConfigurationResolveEndpointMiddleware) HandleSeria } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketLifecycleConfiguration.go b/service/s3/api_op_GetBucketLifecycleConfiguration.go index 04dc739276c..eb9ddda4736 100644 --- a/service/s3/api_op_GetBucketLifecycleConfiguration.go +++ b/service/s3/api_op_GetBucketLifecycleConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -325,7 +326,7 @@ func (m *opGetBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketLocation.go b/service/s3/api_op_GetBucketLocation.go index c7d7739ed19..46a077ce7a9 100644 --- a/service/s3/api_op_GetBucketLocation.go +++ b/service/s3/api_op_GetBucketLocation.go @@ -12,6 +12,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/aws/smithy-go" @@ -390,7 +391,7 @@ func (m *opGetBucketLocationResolveEndpointMiddleware) HandleSerialize(ctx conte } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketLogging.go b/service/s3/api_op_GetBucketLogging.go index e46472e4b9e..16a68b18dd6 100644 --- a/service/s3/api_op_GetBucketLogging.go +++ b/service/s3/api_op_GetBucketLogging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -307,7 +308,7 @@ func (m *opGetBucketLoggingResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketMetricsConfiguration.go b/service/s3/api_op_GetBucketMetricsConfiguration.go index b32d421ef7c..7970fec89ca 100644 --- a/service/s3/api_op_GetBucketMetricsConfiguration.go +++ b/service/s3/api_op_GetBucketMetricsConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -321,7 +322,7 @@ func (m *opGetBucketMetricsConfigurationResolveEndpointMiddleware) HandleSeriali } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketNotificationConfiguration.go b/service/s3/api_op_GetBucketNotificationConfiguration.go index 502c1fe32e3..b0ba7b3e1a6 100644 --- a/service/s3/api_op_GetBucketNotificationConfiguration.go +++ b/service/s3/api_op_GetBucketNotificationConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -338,7 +339,7 @@ func (m *opGetBucketNotificationConfigurationResolveEndpointMiddleware) HandleSe } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketOwnershipControls.go b/service/s3/api_op_GetBucketOwnershipControls.go index a11e5c5810b..49c75687edc 100644 --- a/service/s3/api_op_GetBucketOwnershipControls.go +++ b/service/s3/api_op_GetBucketOwnershipControls.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -308,7 +309,7 @@ func (m *opGetBucketOwnershipControlsResolveEndpointMiddleware) HandleSerialize( } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketPolicy.go b/service/s3/api_op_GetBucketPolicy.go index c1e14f8b0cd..d73ab5b193f 100644 --- a/service/s3/api_op_GetBucketPolicy.go +++ b/service/s3/api_op_GetBucketPolicy.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" smithyendpoints "github.com/aws/smithy-go/endpoints" "github.com/aws/smithy-go/middleware" @@ -330,7 +331,7 @@ func (m *opGetBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketPolicyStatus.go b/service/s3/api_op_GetBucketPolicyStatus.go index 9adc3b05987..141d1da8bec 100644 --- a/service/s3/api_op_GetBucketPolicyStatus.go +++ b/service/s3/api_op_GetBucketPolicyStatus.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -311,7 +312,7 @@ func (m *opGetBucketPolicyStatusResolveEndpointMiddleware) HandleSerialize(ctx c } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketReplication.go b/service/s3/api_op_GetBucketReplication.go index 5cd8ce06186..647e3e74c11 100644 --- a/service/s3/api_op_GetBucketReplication.go +++ b/service/s3/api_op_GetBucketReplication.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -315,7 +316,7 @@ func (m *opGetBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketRequestPayment.go b/service/s3/api_op_GetBucketRequestPayment.go index 83dbb90c7d7..9d364a1da78 100644 --- a/service/s3/api_op_GetBucketRequestPayment.go +++ b/service/s3/api_op_GetBucketRequestPayment.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -305,7 +306,7 @@ func (m *opGetBucketRequestPaymentResolveEndpointMiddleware) HandleSerialize(ctx } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketTagging.go b/service/s3/api_op_GetBucketTagging.go index 77e7cc0dbca..ff551ba580e 100644 --- a/service/s3/api_op_GetBucketTagging.go +++ b/service/s3/api_op_GetBucketTagging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -312,7 +313,7 @@ func (m *opGetBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketVersioning.go b/service/s3/api_op_GetBucketVersioning.go index c7eace64ba0..a931a961365 100644 --- a/service/s3/api_op_GetBucketVersioning.go +++ b/service/s3/api_op_GetBucketVersioning.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -313,7 +314,7 @@ func (m *opGetBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetBucketWebsite.go b/service/s3/api_op_GetBucketWebsite.go index 38104884d57..888c5c44908 100644 --- a/service/s3/api_op_GetBucketWebsite.go +++ b/service/s3/api_op_GetBucketWebsite.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -320,7 +321,7 @@ func (m *opGetBucketWebsiteResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObject.go b/service/s3/api_op_GetObject.go index 5612004b797..e895c55f73d 100644 --- a/service/s3/api_op_GetObject.go +++ b/service/s3/api_op_GetObject.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -687,7 +688,7 @@ func (m *opGetObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Conte } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObjectAcl.go b/service/s3/api_op_GetObjectAcl.go index db75cc284a6..967153ad791 100644 --- a/service/s3/api_op_GetObjectAcl.go +++ b/service/s3/api_op_GetObjectAcl.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -346,7 +347,7 @@ func (m *opGetObjectAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObjectAttributes.go b/service/s3/api_op_GetObjectAttributes.go index 45d164addd9..d366725e185 100644 --- a/service/s3/api_op_GetObjectAttributes.go +++ b/service/s3/api_op_GetObjectAttributes.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -448,7 +449,7 @@ func (m *opGetObjectAttributesResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObjectLegalHold.go b/service/s3/api_op_GetObjectLegalHold.go index 169728601a0..6745ac5e1ce 100644 --- a/service/s3/api_op_GetObjectLegalHold.go +++ b/service/s3/api_op_GetObjectLegalHold.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -327,7 +328,7 @@ func (m *opGetObjectLegalHoldResolveEndpointMiddleware) HandleSerialize(ctx cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObjectLockConfiguration.go b/service/s3/api_op_GetObjectLockConfiguration.go index 01c73f70d12..fe4446eac26 100644 --- a/service/s3/api_op_GetObjectLockConfiguration.go +++ b/service/s3/api_op_GetObjectLockConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -312,7 +313,7 @@ func (m *opGetObjectLockConfigurationResolveEndpointMiddleware) HandleSerialize( } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObjectRetention.go b/service/s3/api_op_GetObjectRetention.go index 5dbae5e4bda..8beae94d9ba 100644 --- a/service/s3/api_op_GetObjectRetention.go +++ b/service/s3/api_op_GetObjectRetention.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -327,7 +328,7 @@ func (m *opGetObjectRetentionResolveEndpointMiddleware) HandleSerialize(ctx cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObjectTagging.go b/service/s3/api_op_GetObjectTagging.go index d321cb08e99..da9ddf8d041 100644 --- a/service/s3/api_op_GetObjectTagging.go +++ b/service/s3/api_op_GetObjectTagging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -347,7 +348,7 @@ func (m *opGetObjectTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetObjectTorrent.go b/service/s3/api_op_GetObjectTorrent.go index 71e3e3435ca..264c339a183 100644 --- a/service/s3/api_op_GetObjectTorrent.go +++ b/service/s3/api_op_GetObjectTorrent.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -321,7 +322,7 @@ func (m *opGetObjectTorrentResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_GetPublicAccessBlock.go b/service/s3/api_op_GetPublicAccessBlock.go index 1ad5791c479..2e92cb45593 100644 --- a/service/s3/api_op_GetPublicAccessBlock.go +++ b/service/s3/api_op_GetPublicAccessBlock.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -318,7 +319,7 @@ func (m *opGetPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_HeadBucket.go b/service/s3/api_op_HeadBucket.go index f6111d7cb5b..956249368c5 100644 --- a/service/s3/api_op_HeadBucket.go +++ b/service/s3/api_op_HeadBucket.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -681,7 +682,7 @@ func (m *opHeadBucketResolveEndpointMiddleware) HandleSerialize(ctx context.Cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_HeadObject.go b/service/s3/api_op_HeadObject.go index 713fb798055..937485b32d6 100644 --- a/service/s3/api_op_HeadObject.go +++ b/service/s3/api_op_HeadObject.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/aws/smithy-go" @@ -961,7 +962,7 @@ func (m *opHeadObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListBucketAnalyticsConfigurations.go b/service/s3/api_op_ListBucketAnalyticsConfigurations.go index 6cede12e887..e8ea37a7915 100644 --- a/service/s3/api_op_ListBucketAnalyticsConfigurations.go +++ b/service/s3/api_op_ListBucketAnalyticsConfigurations.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -338,7 +339,7 @@ func (m *opListBucketAnalyticsConfigurationsResolveEndpointMiddleware) HandleSer } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go b/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go index 1c0fa3af3dd..99d46e0f434 100644 --- a/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go +++ b/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -332,7 +333,7 @@ func (m *opListBucketIntelligentTieringConfigurationsResolveEndpointMiddleware) } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListBucketInventoryConfigurations.go b/service/s3/api_op_ListBucketInventoryConfigurations.go index a0b55261b0b..cb8049779d9 100644 --- a/service/s3/api_op_ListBucketInventoryConfigurations.go +++ b/service/s3/api_op_ListBucketInventoryConfigurations.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -339,7 +340,7 @@ func (m *opListBucketInventoryConfigurationsResolveEndpointMiddleware) HandleSer } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListBucketMetricsConfigurations.go b/service/s3/api_op_ListBucketMetricsConfigurations.go index ebd6c64a5e5..45888e55c7e 100644 --- a/service/s3/api_op_ListBucketMetricsConfigurations.go +++ b/service/s3/api_op_ListBucketMetricsConfigurations.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -342,7 +343,7 @@ func (m *opListBucketMetricsConfigurationsResolveEndpointMiddleware) HandleSeria } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListBuckets.go b/service/s3/api_op_ListBuckets.go index 2b87d469eff..f9105b2b29c 100644 --- a/service/s3/api_op_ListBuckets.go +++ b/service/s3/api_op_ListBuckets.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -270,7 +271,7 @@ func (m *opListBucketsResolveEndpointMiddleware) HandleSerialize(ctx context.Con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListMultipartUploads.go b/service/s3/api_op_ListMultipartUploads.go index 0bb6cbbcdd5..f0ff127336f 100644 --- a/service/s3/api_op_ListMultipartUploads.go +++ b/service/s3/api_op_ListMultipartUploads.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -439,7 +440,7 @@ func (m *opListMultipartUploadsResolveEndpointMiddleware) HandleSerialize(ctx co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListObjectVersions.go b/service/s3/api_op_ListObjectVersions.go index eee3baa2a19..810700c2fd3 100644 --- a/service/s3/api_op_ListObjectVersions.go +++ b/service/s3/api_op_ListObjectVersions.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -416,7 +417,7 @@ func (m *opListObjectVersionsResolveEndpointMiddleware) HandleSerialize(ctx cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListObjects.go b/service/s3/api_op_ListObjects.go index d08963a2f92..11fd401a799 100644 --- a/service/s3/api_op_ListObjects.go +++ b/service/s3/api_op_ListObjects.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -411,7 +412,7 @@ func (m *opListObjectsResolveEndpointMiddleware) HandleSerialize(ctx context.Con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListObjectsV2.go b/service/s3/api_op_ListObjectsV2.go index ddea546bde1..b9948a4592b 100644 --- a/service/s3/api_op_ListObjectsV2.go +++ b/service/s3/api_op_ListObjectsV2.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -536,7 +537,7 @@ func (m *opListObjectsV2ResolveEndpointMiddleware) HandleSerialize(ctx context.C } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_ListParts.go b/service/s3/api_op_ListParts.go index ea718e309b0..e577ca44b70 100644 --- a/service/s3/api_op_ListParts.go +++ b/service/s3/api_op_ListParts.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -532,7 +533,7 @@ func (m *opListPartsResolveEndpointMiddleware) HandleSerialize(ctx context.Conte } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketAccelerateConfiguration.go b/service/s3/api_op_PutBucketAccelerateConfiguration.go index 65d70b1a366..8d7de0b2792 100644 --- a/service/s3/api_op_PutBucketAccelerateConfiguration.go +++ b/service/s3/api_op_PutBucketAccelerateConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -358,7 +359,7 @@ func (m *opPutBucketAccelerateConfigurationResolveEndpointMiddleware) HandleSeri } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketAcl.go b/service/s3/api_op_PutBucketAcl.go index 569c326fe70..651f8dccb7d 100644 --- a/service/s3/api_op_PutBucketAcl.go +++ b/service/s3/api_op_PutBucketAcl.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -443,7 +444,7 @@ func (m *opPutBucketAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketAnalyticsConfiguration.go b/service/s3/api_op_PutBucketAnalyticsConfiguration.go index 13944ebc3f7..b0ddd090743 100644 --- a/service/s3/api_op_PutBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_PutBucketAnalyticsConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -345,7 +346,7 @@ func (m *opPutBucketAnalyticsConfigurationResolveEndpointMiddleware) HandleSeria } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketCors.go b/service/s3/api_op_PutBucketCors.go index 8cc71d6ae9b..06f2f7d8ed0 100644 --- a/service/s3/api_op_PutBucketCors.go +++ b/service/s3/api_op_PutBucketCors.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -372,7 +373,7 @@ func (m *opPutBucketCorsResolveEndpointMiddleware) HandleSerialize(ctx context.C } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketEncryption.go b/service/s3/api_op_PutBucketEncryption.go index e628351d2fc..25139b8111c 100644 --- a/service/s3/api_op_PutBucketEncryption.go +++ b/service/s3/api_op_PutBucketEncryption.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -373,7 +374,7 @@ func (m *opPutBucketEncryptionResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go b/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go index a1cdaa99fd3..e6f62300f34 100644 --- a/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go +++ b/service/s3/api_op_PutBucketIntelligentTieringConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -332,7 +333,7 @@ func (m *opPutBucketIntelligentTieringConfigurationResolveEndpointMiddleware) Ha } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketInventoryConfiguration.go b/service/s3/api_op_PutBucketInventoryConfiguration.go index 00bda80e89b..218350511e9 100644 --- a/service/s3/api_op_PutBucketInventoryConfiguration.go +++ b/service/s3/api_op_PutBucketInventoryConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -348,7 +349,7 @@ func (m *opPutBucketInventoryConfigurationResolveEndpointMiddleware) HandleSeria } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketLifecycleConfiguration.go b/service/s3/api_op_PutBucketLifecycleConfiguration.go index d8b2212a025..c705c217944 100644 --- a/service/s3/api_op_PutBucketLifecycleConfiguration.go +++ b/service/s3/api_op_PutBucketLifecycleConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -383,7 +384,7 @@ func (m *opPutBucketLifecycleConfigurationResolveEndpointMiddleware) HandleSeria } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketLogging.go b/service/s3/api_op_PutBucketLogging.go index f80d5f67f45..6d8acc5c1e9 100644 --- a/service/s3/api_op_PutBucketLogging.go +++ b/service/s3/api_op_PutBucketLogging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -373,7 +374,7 @@ func (m *opPutBucketLoggingResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketMetricsConfiguration.go b/service/s3/api_op_PutBucketMetricsConfiguration.go index ce9fdb53a05..933a193ddc0 100644 --- a/service/s3/api_op_PutBucketMetricsConfiguration.go +++ b/service/s3/api_op_PutBucketMetricsConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -329,7 +330,7 @@ func (m *opPutBucketMetricsConfigurationResolveEndpointMiddleware) HandleSeriali } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketNotificationConfiguration.go b/service/s3/api_op_PutBucketNotificationConfiguration.go index 6ed3f86aae4..db0aae62118 100644 --- a/service/s3/api_op_PutBucketNotificationConfiguration.go +++ b/service/s3/api_op_PutBucketNotificationConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -340,7 +341,7 @@ func (m *opPutBucketNotificationConfigurationResolveEndpointMiddleware) HandleSe } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketOwnershipControls.go b/service/s3/api_op_PutBucketOwnershipControls.go index 505f7c4b64c..8167ebf82c9 100644 --- a/service/s3/api_op_PutBucketOwnershipControls.go +++ b/service/s3/api_op_PutBucketOwnershipControls.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -328,7 +329,7 @@ func (m *opPutBucketOwnershipControlsResolveEndpointMiddleware) HandleSerialize( } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketPolicy.go b/service/s3/api_op_PutBucketPolicy.go index 797429d4754..aebe036077d 100644 --- a/service/s3/api_op_PutBucketPolicy.go +++ b/service/s3/api_op_PutBucketPolicy.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -362,7 +363,7 @@ func (m *opPutBucketPolicyResolveEndpointMiddleware) HandleSerialize(ctx context } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketReplication.go b/service/s3/api_op_PutBucketReplication.go index 794b9d2c232..b53f1a8bd56 100644 --- a/service/s3/api_op_PutBucketReplication.go +++ b/service/s3/api_op_PutBucketReplication.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -385,7 +386,7 @@ func (m *opPutBucketReplicationResolveEndpointMiddleware) HandleSerialize(ctx co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketRequestPayment.go b/service/s3/api_op_PutBucketRequestPayment.go index 271bb414feb..c15807e5574 100644 --- a/service/s3/api_op_PutBucketRequestPayment.go +++ b/service/s3/api_op_PutBucketRequestPayment.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -349,7 +350,7 @@ func (m *opPutBucketRequestPaymentResolveEndpointMiddleware) HandleSerialize(ctx } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketTagging.go b/service/s3/api_op_PutBucketTagging.go index 4f6082a3034..3d52bd325d6 100644 --- a/service/s3/api_op_PutBucketTagging.go +++ b/service/s3/api_op_PutBucketTagging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -377,7 +378,7 @@ func (m *opPutBucketTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketVersioning.go b/service/s3/api_op_PutBucketVersioning.go index cd40cb3649c..806160e6288 100644 --- a/service/s3/api_op_PutBucketVersioning.go +++ b/service/s3/api_op_PutBucketVersioning.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -367,7 +368,7 @@ func (m *opPutBucketVersioningResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutBucketWebsite.go b/service/s3/api_op_PutBucketWebsite.go index f794c160b85..5945c68a3e6 100644 --- a/service/s3/api_op_PutBucketWebsite.go +++ b/service/s3/api_op_PutBucketWebsite.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -385,7 +386,7 @@ func (m *opPutBucketWebsiteResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutObject.go b/service/s3/api_op_PutObject.go index 4f350484128..143514a4ced 100644 --- a/service/s3/api_op_PutObject.go +++ b/service/s3/api_op_PutObject.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -723,7 +724,7 @@ func (m *opPutObjectResolveEndpointMiddleware) HandleSerialize(ctx context.Conte } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutObjectAcl.go b/service/s3/api_op_PutObjectAcl.go index c2b40ddc07e..74c1fb94634 100644 --- a/service/s3/api_op_PutObjectAcl.go +++ b/service/s3/api_op_PutObjectAcl.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -487,7 +488,7 @@ func (m *opPutObjectAclResolveEndpointMiddleware) HandleSerialize(ctx context.Co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutObjectLegalHold.go b/service/s3/api_op_PutObjectLegalHold.go index 0bd7c4dd2d5..2fd5ca2d5dd 100644 --- a/service/s3/api_op_PutObjectLegalHold.go +++ b/service/s3/api_op_PutObjectLegalHold.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -369,7 +370,7 @@ func (m *opPutObjectLegalHoldResolveEndpointMiddleware) HandleSerialize(ctx cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutObjectLockConfiguration.go b/service/s3/api_op_PutObjectLockConfiguration.go index c303cd0b008..95c76fd9b55 100644 --- a/service/s3/api_op_PutObjectLockConfiguration.go +++ b/service/s3/api_op_PutObjectLockConfiguration.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -362,7 +363,7 @@ func (m *opPutObjectLockConfigurationResolveEndpointMiddleware) HandleSerialize( } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutObjectRetention.go b/service/s3/api_op_PutObjectRetention.go index 15f9a20416b..28be3d4aa08 100644 --- a/service/s3/api_op_PutObjectRetention.go +++ b/service/s3/api_op_PutObjectRetention.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -376,7 +377,7 @@ func (m *opPutObjectRetentionResolveEndpointMiddleware) HandleSerialize(ctx cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutObjectTagging.go b/service/s3/api_op_PutObjectTagging.go index a744ee276cc..ce4d15ef2f4 100644 --- a/service/s3/api_op_PutObjectTagging.go +++ b/service/s3/api_op_PutObjectTagging.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -403,7 +404,7 @@ func (m *opPutObjectTaggingResolveEndpointMiddleware) HandleSerialize(ctx contex } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_PutPublicAccessBlock.go b/service/s3/api_op_PutPublicAccessBlock.go index aad48c881a1..3643b704da8 100644 --- a/service/s3/api_op_PutPublicAccessBlock.go +++ b/service/s3/api_op_PutPublicAccessBlock.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -361,7 +362,7 @@ func (m *opPutPublicAccessBlockResolveEndpointMiddleware) HandleSerialize(ctx co } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_RestoreObject.go b/service/s3/api_op_RestoreObject.go index e87232f26aa..3163f8e5a53 100644 --- a/service/s3/api_op_RestoreObject.go +++ b/service/s3/api_op_RestoreObject.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -519,7 +520,7 @@ func (m *opRestoreObjectResolveEndpointMiddleware) HandleSerialize(ctx context.C } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_SelectObjectContent.go b/service/s3/api_op_SelectObjectContent.go index 949fd8db195..11649836900 100644 --- a/service/s3/api_op_SelectObjectContent.go +++ b/service/s3/api_op_SelectObjectContent.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -526,7 +527,7 @@ func (m *opSelectObjectContentResolveEndpointMiddleware) HandleSerialize(ctx con } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_UploadPart.go b/service/s3/api_op_UploadPart.go index e36fd8d84c0..73532fd9a18 100644 --- a/service/s3/api_op_UploadPart.go +++ b/service/s3/api_op_UploadPart.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/signer/v4" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" internalChecksum "github.com/aws/aws-sdk-go-v2/service/internal/checksum" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" @@ -597,7 +598,7 @@ func (m *opUploadPartResolveEndpointMiddleware) HandleSerialize(ctx context.Cont } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_UploadPartCopy.go b/service/s3/api_op_UploadPartCopy.go index a1cd63d6875..aab7465c881 100644 --- a/service/s3/api_op_UploadPartCopy.go +++ b/service/s3/api_op_UploadPartCopy.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithyendpoints "github.com/aws/smithy-go/endpoints" @@ -526,7 +527,7 @@ func (m *opUploadPartCopyResolveEndpointMiddleware) HandleSerialize(ctx context. } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/api_op_WriteGetObjectResponse.go b/service/s3/api_op_WriteGetObjectResponse.go index 21be478901b..2fe70c42df7 100644 --- a/service/s3/api_op_WriteGetObjectResponse.go +++ b/service/s3/api_op_WriteGetObjectResponse.go @@ -10,6 +10,7 @@ import ( awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" internalauth "github.com/aws/aws-sdk-go-v2/internal/auth" + "github.com/aws/aws-sdk-go-v2/internal/v4a" s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations" "github.com/aws/aws-sdk-go-v2/service/s3/types" smithy "github.com/aws/smithy-go" @@ -557,7 +558,7 @@ func (m *opWriteGetObjectResponseResolveEndpointMiddleware) HandleSerialize(ctx } ctx = awsmiddleware.SetSigningName(ctx, *v4aScheme.SigningName) ctx = awsmiddleware.SetSigningRegion(ctx, v4aScheme.SigningRegionSet[0]) - ctx = s3cust.SetSignerVersion(ctx, v4aScheme.Name) + ctx = s3cust.SetSignerVersion(ctx, v4a.Version) break case *internalauth.AuthenticationSchemeNone: break diff --git a/service/s3/internal/customizations/presign_test.go b/service/s3/internal/customizations/presign_test.go index 4d323f944bf..c2e23f5aea9 100644 --- a/service/s3/internal/customizations/presign_test.go +++ b/service/s3/internal/customizations/presign_test.go @@ -183,7 +183,7 @@ func TestPutObject_PresignURL(t *testing.T) { } }, }, - expectError: "Multi-Region access point ARNs are disabled", + expectError: "Invalid configuration: Multi-Region Access Point ARNs are disabled.", }, "standard case with checksum preset checksum": { input: s3.PutObjectInput{ diff --git a/service/s3/internal/customizations/unit_test.go b/service/s3/internal/customizations/unit_test.go index e909ee6ab6e..f5ca690ca51 100644 --- a/service/s3/internal/customizations/unit_test.go +++ b/service/s3/internal/customizations/unit_test.go @@ -4,7 +4,6 @@ import ( "context" "errors" "net/http" - "net/http/httptest" "strings" "testing" "time" @@ -17,49 +16,47 @@ import ( func Test_EmptyResponse(t *testing.T) { cases := map[string]struct { - status int - responseBody []byte + response *http.Response expectError bool }{ "success case with no response body": { - status: 200, - responseBody: []byte(``), + response: &http.Response{ + StatusCode: 200, + Body: asReadCloser( + ``, + ), + }, }, "error case with no response body": { - status: 400, - responseBody: []byte(``), + response: &http.Response{ + StatusCode: 400, + Body: asReadCloser( + ``, + ), + }, expectError: true, }, } for name, c := range cases { t.Run(name, func(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc( - func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(c.status) - w.Write(c.responseBody) - })) - defer server.Close() ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second) defer cancelFn() cfg := aws.Config{ - Region: "us-east-1", - EndpointResolver: aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) { - return aws.Endpoint{ - URL: server.URL, - SigningName: "s3", - }, nil - }), + Region: "mock-region", Retryer: func() aws.Retryer { return aws.NopRetryer{} }, } - client := s3.NewFromConfig(cfg, func(options *s3.Options) { - options.UsePathStyle = true - }) + client := s3.NewFromConfig(cfg, + func(options *s3.Options) { + options.UsePathStyle = true + options.HTTPClient = &mockHTTPClient{c.response} + }, + ) params := &s3.HeadBucketInput{Bucket: aws.String("aws-sdk-go-data")} _, err := client.HeadBucket(ctx, params) @@ -85,53 +82,61 @@ func Test_EmptyResponse(t *testing.T) { func TestBucketLocationPopulation(t *testing.T) { cases := map[string]struct { - responseBody string + response *http.Response expectLocation string expectError string }{ "empty location": { - responseBody: ``, + response: &http.Response{ + StatusCode: 200, + Body: asReadCloser( + ``, + ), + }, expectLocation: "", }, "EU location": { - responseBody: `EU`, + response: &http.Response{ + StatusCode: 200, + Body: asReadCloser( + `EU`, + ), + }, expectLocation: "EU", }, "AfSouth1 location": { - responseBody: `af-south-1`, + response: &http.Response{ + StatusCode: 200, + Body: asReadCloser( + `af-south-1`, + ), + }, expectLocation: "af-south-1", }, "IncompleteResponse": { - responseBody: ``, + response: &http.Response{ + Body: asReadCloser( + ``, + ), + }, expectError: "unexpected EOF", }, } for name, c := range cases { t.Run(name, func(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc( - func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(200) - w.Write([]byte(c.responseBody)) - })) - defer server.Close() ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second) defer cancelFn() cfg := aws.Config{ Region: "us-east-1", - EndpointResolver: aws.EndpointResolverFunc(func(service, region string) (aws.Endpoint, error) { - return aws.Endpoint{ - URL: server.URL, - SigningName: "s3", - }, nil - }), Retryer: func() aws.Retryer { return aws.NopRetryer{} }, } client := s3.NewFromConfig(cfg, func(options *s3.Options) { options.UsePathStyle = true + options.HTTPClient = &mockHTTPClient{c.response} }) params := &s3.GetBucketLocationInput{ diff --git a/service/s3/internal/customizations/update_endpoint_test.go b/service/s3/internal/customizations/update_endpoint_test.go index 176c58f27cb..dd1ab433bfa 100644 --- a/service/s3/internal/customizations/update_endpoint_test.go +++ b/service/s3/internal/customizations/update_endpoint_test.go @@ -1310,13 +1310,8 @@ func TestMultiRegionAccessPoints_UpdateEndpoint(t *testing.T) { options: s3.Options{ Region: "ap-north-1", }, - bucket: "arn:aws-cn:s3::123456789012:accesspoint:mfzwi23gnjvgw.mrap", - expectedReqURL: "https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com.cn/", - expectedHeader: map[string]string{ - v4a.AmzRegionSetKey: "*", - }, - expectedSigningName: "s3", - expectedSigningRegion: "*", + bucket: "arn:aws-cn:s3::123456789012:accesspoint:mfzwi23gnjvgw.mrap", + expectedErr: "Client was configured for partition `aws` but bucket referred to partition `aws-cn`", }, "region as us-west-2 with mrap disabled": { options: s3.Options{ @@ -1443,10 +1438,8 @@ func TestMultiRegionAccessPoints_UpdateEndpoint(t *testing.T) { Region: "us-west-2", DisableMultiRegionAccessPoints: false, }, - bucket: "arn:aws:s3:us-west-2:123456789012:accesspoint:mfzwi23gnjvgw.mrap", - expectedReqURL: "https://mfzwi23gnjvgw.mrap-123456789012.s3-accesspoint.us-west-2.amazonaws.com/", - expectedSigningName: "s3", - expectedSigningRegion: "us-west-2", + bucket: "arn:aws:s3:us-west-2:123456789012:accesspoint:mfzwi23gnjvgw.mrap", + expectedErr: "Invalid ARN: The access point name may only contain a-z, A-Z, 0-9 and `-`", }, } diff --git a/service/s3/serialize_immutable_hostname_bucket.go b/service/s3/serialize_immutable_hostname_bucket.go index 17dfa83c811..04ab1dc57ca 100644 --- a/service/s3/serialize_immutable_hostname_bucket.go +++ b/service/s3/serialize_immutable_hostname_bucket.go @@ -43,11 +43,21 @@ func (m *serializeImmutableHostnameBucketMiddleware) HandleSerialize( return next.HandleSerialize(ctx, in) } - if bucket, ok := bucketFromInput(in.Parameters); ok && awsrulesfn.ParseARN(bucket) == nil { - request.URL.Path = path.Join(request.URL.Path, bucket) - request.URL.RawPath = path.Join(request.URL.RawPath, httpbinding.EscapePath(bucket, true)) + bucket, ok := bucketFromInput(in.Parameters) + if !ok { + return next.HandleSerialize(ctx, in) } + parsedBucket := awsrulesfn.ParseARN(bucket) + + // disallow ARN buckets except for MRAP arns + if parsedBucket != nil && len(parsedBucket.Region) > 0 { + return next.HandleSerialize(ctx, in) + } + + request.URL.Path = path.Join(request.URL.Path, bucket) + request.URL.RawPath = path.Join(request.URL.RawPath, httpbinding.EscapePath(bucket, true)) + return next.HandleSerialize(ctx, in) }