diff --git a/service/s3/api_client.go b/service/s3/api_client.go index 18ea6cff9cc..2825f4011d6 100644 --- a/service/s3/api_client.go +++ b/service/s3/api_client.go @@ -236,196 +236,10 @@ func addMetadataRetrieverMiddleware(stack *middleware.Stack) error { return s3shared.AddMetadataRetrieverMiddleware(stack) } -// getBucketFromInput returns a boolean indicating if the input has a modeled -// bucket name, and a pointer to string denoting a provided bucket member value -func getBucketFromInput(input interface{}) (*string, bool) { - switch i := input.(type) { - case *AbortMultipartUploadInput: - return i.Bucket, true - case *CompleteMultipartUploadInput: - return i.Bucket, true - case *CopyObjectInput: - return i.Bucket, true - case *CreateBucketInput: - return i.Bucket, true - case *CreateMultipartUploadInput: - return i.Bucket, true - case *DeleteBucketInput: - return i.Bucket, true - case *DeleteBucketAnalyticsConfigurationInput: - return i.Bucket, true - case *DeleteBucketCorsInput: - return i.Bucket, true - case *DeleteBucketEncryptionInput: - return i.Bucket, true - case *DeleteBucketInventoryConfigurationInput: - return i.Bucket, true - case *DeleteBucketLifecycleInput: - return i.Bucket, true - case *DeleteBucketMetricsConfigurationInput: - return i.Bucket, true - case *DeleteBucketOwnershipControlsInput: - return i.Bucket, true - case *DeleteBucketPolicyInput: - return i.Bucket, true - case *DeleteBucketReplicationInput: - return i.Bucket, true - case *DeleteBucketTaggingInput: - return i.Bucket, true - case *DeleteBucketWebsiteInput: - return i.Bucket, true - case *DeleteObjectInput: - return i.Bucket, true - case *DeleteObjectsInput: - return i.Bucket, true - case *DeleteObjectTaggingInput: - return i.Bucket, true - case *DeletePublicAccessBlockInput: - return i.Bucket, true - case *GetBucketAccelerateConfigurationInput: - return i.Bucket, true - case *GetBucketAclInput: - return i.Bucket, true - case *GetBucketAnalyticsConfigurationInput: - return i.Bucket, true - case *GetBucketCorsInput: - return i.Bucket, true - case *GetBucketEncryptionInput: - return i.Bucket, true - case *GetBucketInventoryConfigurationInput: - return i.Bucket, true - case *GetBucketLifecycleConfigurationInput: - return i.Bucket, true - case *GetBucketLoggingInput: - return i.Bucket, true - case *GetBucketMetricsConfigurationInput: - return i.Bucket, true - case *GetBucketNotificationConfigurationInput: - return i.Bucket, true - case *GetBucketOwnershipControlsInput: - return i.Bucket, true - case *GetBucketPolicyInput: - return i.Bucket, true - case *GetBucketPolicyStatusInput: - return i.Bucket, true - case *GetBucketReplicationInput: - return i.Bucket, true - case *GetBucketRequestPaymentInput: - return i.Bucket, true - case *GetBucketTaggingInput: - return i.Bucket, true - case *GetBucketVersioningInput: - return i.Bucket, true - case *GetBucketWebsiteInput: - return i.Bucket, true - case *GetObjectInput: - return i.Bucket, true - case *GetObjectAclInput: - return i.Bucket, true - case *GetObjectLegalHoldInput: - return i.Bucket, true - case *GetObjectLockConfigurationInput: - return i.Bucket, true - case *GetObjectRetentionInput: - return i.Bucket, true - case *GetObjectTaggingInput: - return i.Bucket, true - case *GetObjectTorrentInput: - return i.Bucket, true - case *GetPublicAccessBlockInput: - return i.Bucket, true - case *HeadBucketInput: - return i.Bucket, true - case *HeadObjectInput: - return i.Bucket, true - case *ListBucketAnalyticsConfigurationsInput: - return i.Bucket, true - case *ListBucketInventoryConfigurationsInput: - return i.Bucket, true - case *ListBucketMetricsConfigurationsInput: - return i.Bucket, true - case *ListMultipartUploadsInput: - return i.Bucket, true - case *ListObjectsInput: - return i.Bucket, true - case *ListObjectsV2Input: - return i.Bucket, true - case *ListObjectVersionsInput: - return i.Bucket, true - case *ListPartsInput: - return i.Bucket, true - case *PutBucketAccelerateConfigurationInput: - return i.Bucket, true - case *PutBucketAclInput: - return i.Bucket, true - case *PutBucketAnalyticsConfigurationInput: - return i.Bucket, true - case *PutBucketCorsInput: - return i.Bucket, true - case *PutBucketEncryptionInput: - return i.Bucket, true - case *PutBucketInventoryConfigurationInput: - return i.Bucket, true - case *PutBucketLifecycleConfigurationInput: - return i.Bucket, true - case *PutBucketLoggingInput: - return i.Bucket, true - case *PutBucketMetricsConfigurationInput: - return i.Bucket, true - case *PutBucketNotificationConfigurationInput: - return i.Bucket, true - case *PutBucketOwnershipControlsInput: - return i.Bucket, true - case *PutBucketPolicyInput: - return i.Bucket, true - case *PutBucketReplicationInput: - return i.Bucket, true - case *PutBucketRequestPaymentInput: - return i.Bucket, true - case *PutBucketTaggingInput: - return i.Bucket, true - case *PutBucketVersioningInput: - return i.Bucket, true - case *PutBucketWebsiteInput: - return i.Bucket, true - case *PutObjectInput: - return i.Bucket, true - case *PutObjectAclInput: - return i.Bucket, true - case *PutObjectLegalHoldInput: - return i.Bucket, true - case *PutObjectLockConfigurationInput: - return i.Bucket, true - case *PutObjectRetentionInput: - return i.Bucket, true - case *PutObjectTaggingInput: - return i.Bucket, true - case *PutPublicAccessBlockInput: - return i.Bucket, true - case *RestoreObjectInput: - return i.Bucket, true - case *UploadPartInput: - return i.Bucket, true - case *UploadPartCopyInput: - return i.Bucket, true - default: - return nil, false - } -} - -// supportAccelerate returns a boolean indicating if the operation associated with -// the provided input supports S3 Transfer Acceleration -func supportAccelerate(input interface{}) bool { - switch input.(type) { - case *CreateBucketInput: - return false - case *DeleteBucketInput: - return false - case *ListBucketsInput: - return false - default: - return true - } +// nopGetBucketAccessor is no-op accessor for operation that don't support bucket +// member as input +func nopGetBucketAccessor(input interface{}) (*string, bool) { + return nil, false } func addResponseErrorMiddleware(stack *middleware.Stack) error { diff --git a/service/s3/api_op_AbortMultipartUpload.go b/service/s3/api_op_AbortMultipartUpload.go index 279821d6966..a2766715581 100644 --- a/service/s3/api_op_AbortMultipartUpload.go +++ b/service/s3/api_op_AbortMultipartUpload.go @@ -195,10 +195,21 @@ func newServiceMetadataMiddleware_opAbortMultipartUpload(region string) *awsmidd } } +// getAbortMultipartUploadBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getAbortMultipartUploadBucketMember(input interface{}) (*string, bool) { + in := input.(*AbortMultipartUploadInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addAbortMultipartUploadUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getAbortMultipartUploadBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_CompleteMultipartUpload.go b/service/s3/api_op_CompleteMultipartUpload.go index 221a9e729a1..05957b7728b 100644 --- a/service/s3/api_op_CompleteMultipartUpload.go +++ b/service/s3/api_op_CompleteMultipartUpload.go @@ -286,10 +286,21 @@ func newServiceMetadataMiddleware_opCompleteMultipartUpload(region string) *awsm } } +// getCompleteMultipartUploadBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getCompleteMultipartUploadBucketMember(input interface{}) (*string, bool) { + in := input.(*CompleteMultipartUploadInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addCompleteMultipartUploadUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getCompleteMultipartUploadBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_CopyObject.go b/service/s3/api_op_CopyObject.go index 0b3e238c2c4..b7062957cea 100644 --- a/service/s3/api_op_CopyObject.go +++ b/service/s3/api_op_CopyObject.go @@ -509,10 +509,20 @@ func newServiceMetadataMiddleware_opCopyObject(region string) *awsmiddleware.Reg } } +// getCopyObjectBucketMember returns a pointer to string denoting a provided bucket +// member valueand a boolean indicating if the input has a modeled bucket name, +func getCopyObjectBucketMember(input interface{}) (*string, bool) { + in := input.(*CopyObjectInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addCopyObjectUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getCopyObjectBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_CreateBucket.go b/service/s3/api_op_CreateBucket.go index 4155fbd1741..bedb4a12dd3 100644 --- a/service/s3/api_op_CreateBucket.go +++ b/service/s3/api_op_CreateBucket.go @@ -239,10 +239,21 @@ func newServiceMetadataMiddleware_opCreateBucket(region string) *awsmiddleware.R } } +// getCreateBucketBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getCreateBucketBucketMember(input interface{}) (*string, bool) { + in := input.(*CreateBucketInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addCreateBucketUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getCreateBucketBucketMember, + SupportsAccelerate: false, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_CreateMultipartUpload.go b/service/s3/api_op_CreateMultipartUpload.go index c893d6afa0f..d6470133108 100644 --- a/service/s3/api_op_CreateMultipartUpload.go +++ b/service/s3/api_op_CreateMultipartUpload.go @@ -535,10 +535,21 @@ func newServiceMetadataMiddleware_opCreateMultipartUpload(region string) *awsmid } } +// getCreateMultipartUploadBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getCreateMultipartUploadBucketMember(input interface{}) (*string, bool) { + in := input.(*CreateMultipartUploadInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addCreateMultipartUploadUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getCreateMultipartUploadBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucket.go b/service/s3/api_op_DeleteBucket.go index ea9756ef5f4..43096a30b77 100644 --- a/service/s3/api_op_DeleteBucket.go +++ b/service/s3/api_op_DeleteBucket.go @@ -131,10 +131,21 @@ func newServiceMetadataMiddleware_opDeleteBucket(region string) *awsmiddleware.R } } +// getDeleteBucketBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getDeleteBucketBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketBucketMember, + SupportsAccelerate: false, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go index 4d8bc23061f..e1f597a2789 100644 --- a/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_DeleteBucketAnalyticsConfiguration.go @@ -151,10 +151,21 @@ func newServiceMetadataMiddleware_opDeleteBucketAnalyticsConfiguration(region st } } +// getDeleteBucketAnalyticsConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getDeleteBucketAnalyticsConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketAnalyticsConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketAnalyticsConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketAnalyticsConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketCors.go b/service/s3/api_op_DeleteBucketCors.go index fefdf870633..084fbb257f4 100644 --- a/service/s3/api_op_DeleteBucketCors.go +++ b/service/s3/api_op_DeleteBucketCors.go @@ -134,10 +134,21 @@ func newServiceMetadataMiddleware_opDeleteBucketCors(region string) *awsmiddlewa } } +// getDeleteBucketCorsBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getDeleteBucketCorsBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketCorsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketCorsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketCorsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketEncryption.go b/service/s3/api_op_DeleteBucketEncryption.go index 8858a5b3925..b306e1d62ce 100644 --- a/service/s3/api_op_DeleteBucketEncryption.go +++ b/service/s3/api_op_DeleteBucketEncryption.go @@ -143,10 +143,21 @@ func newServiceMetadataMiddleware_opDeleteBucketEncryption(region string) *awsmi } } +// getDeleteBucketEncryptionBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeleteBucketEncryptionBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketEncryptionInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketEncryptionUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketEncryptionBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketInventoryConfiguration.go b/service/s3/api_op_DeleteBucketInventoryConfiguration.go index db69a627a26..898dcae59b7 100644 --- a/service/s3/api_op_DeleteBucketInventoryConfiguration.go +++ b/service/s3/api_op_DeleteBucketInventoryConfiguration.go @@ -150,10 +150,21 @@ func newServiceMetadataMiddleware_opDeleteBucketInventoryConfiguration(region st } } +// getDeleteBucketInventoryConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getDeleteBucketInventoryConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketInventoryConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketInventoryConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketInventoryConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketLifecycle.go b/service/s3/api_op_DeleteBucketLifecycle.go index f6e61fcf4d2..0259c617bb6 100644 --- a/service/s3/api_op_DeleteBucketLifecycle.go +++ b/service/s3/api_op_DeleteBucketLifecycle.go @@ -140,10 +140,21 @@ func newServiceMetadataMiddleware_opDeleteBucketLifecycle(region string) *awsmid } } +// getDeleteBucketLifecycleBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeleteBucketLifecycleBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketLifecycleInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketLifecycleUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketLifecycleBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketMetricsConfiguration.go b/service/s3/api_op_DeleteBucketMetricsConfiguration.go index cf2e26877fe..1d0915b3190 100644 --- a/service/s3/api_op_DeleteBucketMetricsConfiguration.go +++ b/service/s3/api_op_DeleteBucketMetricsConfiguration.go @@ -156,10 +156,21 @@ func newServiceMetadataMiddleware_opDeleteBucketMetricsConfiguration(region stri } } +// getDeleteBucketMetricsConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getDeleteBucketMetricsConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketMetricsConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketMetricsConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketMetricsConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketOwnershipControls.go b/service/s3/api_op_DeleteBucketOwnershipControls.go index d2ba1e52ea1..38584463c25 100644 --- a/service/s3/api_op_DeleteBucketOwnershipControls.go +++ b/service/s3/api_op_DeleteBucketOwnershipControls.go @@ -131,10 +131,21 @@ func newServiceMetadataMiddleware_opDeleteBucketOwnershipControls(region string) } } +// getDeleteBucketOwnershipControlsBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getDeleteBucketOwnershipControlsBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketOwnershipControlsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketOwnershipControlsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketOwnershipControlsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketPolicy.go b/service/s3/api_op_DeleteBucketPolicy.go index cdc55fbdb57..271ead1d172 100644 --- a/service/s3/api_op_DeleteBucketPolicy.go +++ b/service/s3/api_op_DeleteBucketPolicy.go @@ -142,10 +142,21 @@ func newServiceMetadataMiddleware_opDeleteBucketPolicy(region string) *awsmiddle } } +// getDeleteBucketPolicyBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeleteBucketPolicyBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketPolicyInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketPolicyUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketPolicyBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketReplication.go b/service/s3/api_op_DeleteBucketReplication.go index 5691acdff6d..d04369c5fc9 100644 --- a/service/s3/api_op_DeleteBucketReplication.go +++ b/service/s3/api_op_DeleteBucketReplication.go @@ -141,10 +141,21 @@ func newServiceMetadataMiddleware_opDeleteBucketReplication(region string) *awsm } } +// getDeleteBucketReplicationBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeleteBucketReplicationBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketReplicationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketReplicationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketReplicationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketTagging.go b/service/s3/api_op_DeleteBucketTagging.go index e37fd586a02..1803154bfd3 100644 --- a/service/s3/api_op_DeleteBucketTagging.go +++ b/service/s3/api_op_DeleteBucketTagging.go @@ -132,10 +132,21 @@ func newServiceMetadataMiddleware_opDeleteBucketTagging(region string) *awsmiddl } } +// getDeleteBucketTaggingBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeleteBucketTaggingBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketTaggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketTaggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteBucketWebsite.go b/service/s3/api_op_DeleteBucketWebsite.go index eac349c299c..faa410e90c8 100644 --- a/service/s3/api_op_DeleteBucketWebsite.go +++ b/service/s3/api_op_DeleteBucketWebsite.go @@ -141,10 +141,21 @@ func newServiceMetadataMiddleware_opDeleteBucketWebsite(region string) *awsmiddl } } +// getDeleteBucketWebsiteBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeleteBucketWebsiteBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteBucketWebsiteInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteBucketWebsiteUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteBucketWebsiteBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteObject.go b/service/s3/api_op_DeleteObject.go index e38c1780dc4..95593af67de 100644 --- a/service/s3/api_op_DeleteObject.go +++ b/service/s3/api_op_DeleteObject.go @@ -199,10 +199,21 @@ func newServiceMetadataMiddleware_opDeleteObject(region string) *awsmiddleware.R } } +// getDeleteObjectBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getDeleteObjectBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteObjectInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteObjectUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteObjectBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteObjectTagging.go b/service/s3/api_op_DeleteObjectTagging.go index 46f80a6c9be..0232fcd99f9 100644 --- a/service/s3/api_op_DeleteObjectTagging.go +++ b/service/s3/api_op_DeleteObjectTagging.go @@ -164,10 +164,21 @@ func newServiceMetadataMiddleware_opDeleteObjectTagging(region string) *awsmiddl } } +// getDeleteObjectTaggingBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeleteObjectTaggingBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteObjectTaggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteObjectTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteObjectTaggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeleteObjects.go b/service/s3/api_op_DeleteObjects.go index 97af323d6b6..1d6e35a776b 100644 --- a/service/s3/api_op_DeleteObjects.go +++ b/service/s3/api_op_DeleteObjects.go @@ -222,10 +222,21 @@ func newServiceMetadataMiddleware_opDeleteObjects(region string) *awsmiddleware. } } +// getDeleteObjectsBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getDeleteObjectsBucketMember(input interface{}) (*string, bool) { + in := input.(*DeleteObjectsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeleteObjectsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeleteObjectsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_DeletePublicAccessBlock.go b/service/s3/api_op_DeletePublicAccessBlock.go index c3b47688b12..f3e15dd21f0 100644 --- a/service/s3/api_op_DeletePublicAccessBlock.go +++ b/service/s3/api_op_DeletePublicAccessBlock.go @@ -145,10 +145,21 @@ func newServiceMetadataMiddleware_opDeletePublicAccessBlock(region string) *awsm } } +// getDeletePublicAccessBlockBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getDeletePublicAccessBlockBucketMember(input interface{}) (*string, bool) { + in := input.(*DeletePublicAccessBlockInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addDeletePublicAccessBlockUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getDeletePublicAccessBlockBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketAccelerateConfiguration.go b/service/s3/api_op_GetBucketAccelerateConfiguration.go index f3447307556..6b589f5e475 100644 --- a/service/s3/api_op_GetBucketAccelerateConfiguration.go +++ b/service/s3/api_op_GetBucketAccelerateConfiguration.go @@ -151,10 +151,21 @@ func newServiceMetadataMiddleware_opGetBucketAccelerateConfiguration(region stri } } +// getGetBucketAccelerateConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getGetBucketAccelerateConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketAccelerateConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketAccelerateConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketAccelerateConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketAcl.go b/service/s3/api_op_GetBucketAcl.go index 7fad0506c13..5abe57d4d69 100644 --- a/service/s3/api_op_GetBucketAcl.go +++ b/service/s3/api_op_GetBucketAcl.go @@ -137,10 +137,21 @@ func newServiceMetadataMiddleware_opGetBucketAcl(region string) *awsmiddleware.R } } +// getGetBucketAclBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetBucketAclBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketAclInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketAclUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketAclBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketAnalyticsConfiguration.go b/service/s3/api_op_GetBucketAnalyticsConfiguration.go index 6f46256a7e0..1948ff302c6 100644 --- a/service/s3/api_op_GetBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_GetBucketAnalyticsConfiguration.go @@ -156,10 +156,21 @@ func newServiceMetadataMiddleware_opGetBucketAnalyticsConfiguration(region strin } } +// getGetBucketAnalyticsConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getGetBucketAnalyticsConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketAnalyticsConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketAnalyticsConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketAnalyticsConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketCors.go b/service/s3/api_op_GetBucketCors.go index 9aefa022b02..ca91c4220e1 100644 --- a/service/s3/api_op_GetBucketCors.go +++ b/service/s3/api_op_GetBucketCors.go @@ -140,10 +140,21 @@ func newServiceMetadataMiddleware_opGetBucketCors(region string) *awsmiddleware. } } +// getGetBucketCorsBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetBucketCorsBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketCorsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketCorsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketCorsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketEncryption.go b/service/s3/api_op_GetBucketEncryption.go index ab37edc97ba..203fcb9d09f 100644 --- a/service/s3/api_op_GetBucketEncryption.go +++ b/service/s3/api_op_GetBucketEncryption.go @@ -147,10 +147,21 @@ func newServiceMetadataMiddleware_opGetBucketEncryption(region string) *awsmiddl } } +// getGetBucketEncryptionBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetBucketEncryptionBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketEncryptionInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketEncryptionUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketEncryptionBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketInventoryConfiguration.go b/service/s3/api_op_GetBucketInventoryConfiguration.go index 7f4180e80cb..9b4d7a5d5ce 100644 --- a/service/s3/api_op_GetBucketInventoryConfiguration.go +++ b/service/s3/api_op_GetBucketInventoryConfiguration.go @@ -154,10 +154,21 @@ func newServiceMetadataMiddleware_opGetBucketInventoryConfiguration(region strin } } +// getGetBucketInventoryConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getGetBucketInventoryConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketInventoryConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketInventoryConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketInventoryConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketLifecycleConfiguration.go b/service/s3/api_op_GetBucketLifecycleConfiguration.go index 1857127acba..981b31697e9 100644 --- a/service/s3/api_op_GetBucketLifecycleConfiguration.go +++ b/service/s3/api_op_GetBucketLifecycleConfiguration.go @@ -171,10 +171,21 @@ func newServiceMetadataMiddleware_opGetBucketLifecycleConfiguration(region strin } } +// getGetBucketLifecycleConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getGetBucketLifecycleConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketLifecycleConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketLifecycleConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketLifecycleConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketLocation.go b/service/s3/api_op_GetBucketLocation.go index a734c66fc7a..f43346c7bc4 100644 --- a/service/s3/api_op_GetBucketLocation.go +++ b/service/s3/api_op_GetBucketLocation.go @@ -142,10 +142,21 @@ func newServiceMetadataMiddleware_opGetBucketLocation(region string) *awsmiddlew } } +// getGetBucketLocationBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetBucketLocationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketLocationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketLocationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketLocationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketLogging.go b/service/s3/api_op_GetBucketLogging.go index af08cbbaaa2..cdef1cf29e0 100644 --- a/service/s3/api_op_GetBucketLogging.go +++ b/service/s3/api_op_GetBucketLogging.go @@ -139,10 +139,21 @@ func newServiceMetadataMiddleware_opGetBucketLogging(region string) *awsmiddlewa } } +// getGetBucketLoggingBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetBucketLoggingBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketLoggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketLoggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketLoggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketMetricsConfiguration.go b/service/s3/api_op_GetBucketMetricsConfiguration.go index 48ddb09063d..fb79e8e92ba 100644 --- a/service/s3/api_op_GetBucketMetricsConfiguration.go +++ b/service/s3/api_op_GetBucketMetricsConfiguration.go @@ -161,10 +161,21 @@ func newServiceMetadataMiddleware_opGetBucketMetricsConfiguration(region string) } } +// getGetBucketMetricsConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getGetBucketMetricsConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketMetricsConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketMetricsConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketMetricsConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketNotificationConfiguration.go b/service/s3/api_op_GetBucketNotificationConfiguration.go index d58f7f1a0e0..7f16e0461fd 100644 --- a/service/s3/api_op_GetBucketNotificationConfiguration.go +++ b/service/s3/api_op_GetBucketNotificationConfiguration.go @@ -153,10 +153,21 @@ func newServiceMetadataMiddleware_opGetBucketNotificationConfiguration(region st } } +// getGetBucketNotificationConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getGetBucketNotificationConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketNotificationConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketNotificationConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketNotificationConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketOwnershipControls.go b/service/s3/api_op_GetBucketOwnershipControls.go index 555bc2bf1ed..6d56188b108 100644 --- a/service/s3/api_op_GetBucketOwnershipControls.go +++ b/service/s3/api_op_GetBucketOwnershipControls.go @@ -137,10 +137,21 @@ func newServiceMetadataMiddleware_opGetBucketOwnershipControls(region string) *a } } +// getGetBucketOwnershipControlsBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetBucketOwnershipControlsBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketOwnershipControlsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketOwnershipControlsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketOwnershipControlsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketPolicy.go b/service/s3/api_op_GetBucketPolicy.go index ce75d6abd41..977dc89aff1 100644 --- a/service/s3/api_op_GetBucketPolicy.go +++ b/service/s3/api_op_GetBucketPolicy.go @@ -141,10 +141,21 @@ func newServiceMetadataMiddleware_opGetBucketPolicy(region string) *awsmiddlewar } } +// getGetBucketPolicyBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetBucketPolicyBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketPolicyInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketPolicyUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketPolicyBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketPolicyStatus.go b/service/s3/api_op_GetBucketPolicyStatus.go index eab4b5a34c8..fc741381f02 100644 --- a/service/s3/api_op_GetBucketPolicyStatus.go +++ b/service/s3/api_op_GetBucketPolicyStatus.go @@ -151,10 +151,21 @@ func newServiceMetadataMiddleware_opGetBucketPolicyStatus(region string) *awsmid } } +// getGetBucketPolicyStatusBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetBucketPolicyStatusBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketPolicyStatusInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketPolicyStatusUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketPolicyStatusBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketReplication.go b/service/s3/api_op_GetBucketReplication.go index 8f555e626bc..fbcaadfc992 100644 --- a/service/s3/api_op_GetBucketReplication.go +++ b/service/s3/api_op_GetBucketReplication.go @@ -150,10 +150,21 @@ func newServiceMetadataMiddleware_opGetBucketReplication(region string) *awsmidd } } +// getGetBucketReplicationBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetBucketReplicationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketReplicationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketReplicationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketReplicationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketRequestPayment.go b/service/s3/api_op_GetBucketRequestPayment.go index fdfa0582c2b..cdb657494e1 100644 --- a/service/s3/api_op_GetBucketRequestPayment.go +++ b/service/s3/api_op_GetBucketRequestPayment.go @@ -134,10 +134,21 @@ func newServiceMetadataMiddleware_opGetBucketRequestPayment(region string) *awsm } } +// getGetBucketRequestPaymentBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetBucketRequestPaymentBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketRequestPaymentInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketRequestPaymentUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketRequestPaymentBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketTagging.go b/service/s3/api_op_GetBucketTagging.go index b7029d6061e..7b908593b6c 100644 --- a/service/s3/api_op_GetBucketTagging.go +++ b/service/s3/api_op_GetBucketTagging.go @@ -148,10 +148,21 @@ func newServiceMetadataMiddleware_opGetBucketTagging(region string) *awsmiddlewa } } +// getGetBucketTaggingBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetBucketTaggingBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketTaggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketTaggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketVersioning.go b/service/s3/api_op_GetBucketVersioning.go index 53360ec60e3..769ca092936 100644 --- a/service/s3/api_op_GetBucketVersioning.go +++ b/service/s3/api_op_GetBucketVersioning.go @@ -148,10 +148,21 @@ func newServiceMetadataMiddleware_opGetBucketVersioning(region string) *awsmiddl } } +// getGetBucketVersioningBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetBucketVersioningBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketVersioningInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketVersioningUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketVersioningBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetBucketWebsite.go b/service/s3/api_op_GetBucketWebsite.go index 293e56b9a9c..fef46bc8afd 100644 --- a/service/s3/api_op_GetBucketWebsite.go +++ b/service/s3/api_op_GetBucketWebsite.go @@ -152,10 +152,21 @@ func newServiceMetadataMiddleware_opGetBucketWebsite(region string) *awsmiddlewa } } +// getGetBucketWebsiteBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetBucketWebsiteBucketMember(input interface{}) (*string, bool) { + in := input.(*GetBucketWebsiteInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetBucketWebsiteUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetBucketWebsiteBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetObject.go b/service/s3/api_op_GetObject.go index 15dfd6f1401..106d94da378 100644 --- a/service/s3/api_op_GetObject.go +++ b/service/s3/api_op_GetObject.go @@ -450,10 +450,20 @@ func newServiceMetadataMiddleware_opGetObject(region string) *awsmiddleware.Regi } } +// getGetObjectBucketMember returns a pointer to string denoting a provided bucket +// member valueand a boolean indicating if the input has a modeled bucket name, +func getGetObjectBucketMember(input interface{}) (*string, bool) { + in := input.(*GetObjectInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetObjectUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetObjectBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetObjectAcl.go b/service/s3/api_op_GetObjectAcl.go index e8970409259..e6702863dec 100644 --- a/service/s3/api_op_GetObjectAcl.go +++ b/service/s3/api_op_GetObjectAcl.go @@ -173,10 +173,21 @@ func newServiceMetadataMiddleware_opGetObjectAcl(region string) *awsmiddleware.R } } +// getGetObjectAclBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetObjectAclBucketMember(input interface{}) (*string, bool) { + in := input.(*GetObjectAclInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetObjectAclUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetObjectAclBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetObjectLegalHold.go b/service/s3/api_op_GetObjectLegalHold.go index 165bcdf12bb..62980557cc5 100644 --- a/service/s3/api_op_GetObjectLegalHold.go +++ b/service/s3/api_op_GetObjectLegalHold.go @@ -153,10 +153,21 @@ func newServiceMetadataMiddleware_opGetObjectLegalHold(region string) *awsmiddle } } +// getGetObjectLegalHoldBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetObjectLegalHoldBucketMember(input interface{}) (*string, bool) { + in := input.(*GetObjectLegalHoldInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetObjectLegalHoldUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetObjectLegalHoldBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetObjectLockConfiguration.go b/service/s3/api_op_GetObjectLockConfiguration.go index 3a382188761..f208c84fbee 100644 --- a/service/s3/api_op_GetObjectLockConfiguration.go +++ b/service/s3/api_op_GetObjectLockConfiguration.go @@ -138,10 +138,21 @@ func newServiceMetadataMiddleware_opGetObjectLockConfiguration(region string) *a } } +// getGetObjectLockConfigurationBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetObjectLockConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*GetObjectLockConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetObjectLockConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetObjectLockConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetObjectRetention.go b/service/s3/api_op_GetObjectRetention.go index e15ade691a6..ab3f645fa51 100644 --- a/service/s3/api_op_GetObjectRetention.go +++ b/service/s3/api_op_GetObjectRetention.go @@ -153,10 +153,21 @@ func newServiceMetadataMiddleware_opGetObjectRetention(region string) *awsmiddle } } +// getGetObjectRetentionBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetObjectRetentionBucketMember(input interface{}) (*string, bool) { + in := input.(*GetObjectRetentionInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetObjectRetentionUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetObjectRetentionBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetObjectTagging.go b/service/s3/api_op_GetObjectTagging.go index 2ba4ad4a310..9cfa44fcdb8 100644 --- a/service/s3/api_op_GetObjectTagging.go +++ b/service/s3/api_op_GetObjectTagging.go @@ -169,10 +169,21 @@ func newServiceMetadataMiddleware_opGetObjectTagging(region string) *awsmiddlewa } } +// getGetObjectTaggingBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetObjectTaggingBucketMember(input interface{}) (*string, bool) { + in := input.(*GetObjectTaggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetObjectTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetObjectTaggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetObjectTorrent.go b/service/s3/api_op_GetObjectTorrent.go index af8d921e07f..72bd81180d7 100644 --- a/service/s3/api_op_GetObjectTorrent.go +++ b/service/s3/api_op_GetObjectTorrent.go @@ -153,10 +153,21 @@ func newServiceMetadataMiddleware_opGetObjectTorrent(region string) *awsmiddlewa } } +// getGetObjectTorrentBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getGetObjectTorrentBucketMember(input interface{}) (*string, bool) { + in := input.(*GetObjectTorrentInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetObjectTorrentUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetObjectTorrentBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_GetPublicAccessBlock.go b/service/s3/api_op_GetPublicAccessBlock.go index 4515ba4078a..14b195e9f54 100644 --- a/service/s3/api_op_GetPublicAccessBlock.go +++ b/service/s3/api_op_GetPublicAccessBlock.go @@ -158,10 +158,21 @@ func newServiceMetadataMiddleware_opGetPublicAccessBlock(region string) *awsmidd } } +// getGetPublicAccessBlockBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getGetPublicAccessBlockBucketMember(input interface{}) (*string, bool) { + in := input.(*GetPublicAccessBlockInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addGetPublicAccessBlockUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getGetPublicAccessBlockBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_HeadBucket.go b/service/s3/api_op_HeadBucket.go index 2f281e47dfd..23b1181298a 100644 --- a/service/s3/api_op_HeadBucket.go +++ b/service/s3/api_op_HeadBucket.go @@ -147,10 +147,20 @@ func newServiceMetadataMiddleware_opHeadBucket(region string) *awsmiddleware.Reg } } +// getHeadBucketBucketMember returns a pointer to string denoting a provided bucket +// member valueand a boolean indicating if the input has a modeled bucket name, +func getHeadBucketBucketMember(input interface{}) (*string, bool) { + in := input.(*HeadBucketInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addHeadBucketUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getHeadBucketBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_HeadObject.go b/service/s3/api_op_HeadObject.go index 6153de8f0ed..a7e12ef908e 100644 --- a/service/s3/api_op_HeadObject.go +++ b/service/s3/api_op_HeadObject.go @@ -424,10 +424,20 @@ func newServiceMetadataMiddleware_opHeadObject(region string) *awsmiddleware.Reg } } +// getHeadObjectBucketMember returns a pointer to string denoting a provided bucket +// member valueand a boolean indicating if the input has a modeled bucket name, +func getHeadObjectBucketMember(input interface{}) (*string, bool) { + in := input.(*HeadObjectInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addHeadObjectUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getHeadObjectBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListBucketAnalyticsConfigurations.go b/service/s3/api_op_ListBucketAnalyticsConfigurations.go index b779b9f5595..679c53c41bc 100644 --- a/service/s3/api_op_ListBucketAnalyticsConfigurations.go +++ b/service/s3/api_op_ListBucketAnalyticsConfigurations.go @@ -176,10 +176,21 @@ func newServiceMetadataMiddleware_opListBucketAnalyticsConfigurations(region str } } +// getListBucketAnalyticsConfigurationsBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getListBucketAnalyticsConfigurationsBucketMember(input interface{}) (*string, bool) { + in := input.(*ListBucketAnalyticsConfigurationsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListBucketAnalyticsConfigurationsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListBucketAnalyticsConfigurationsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListBucketInventoryConfigurations.go b/service/s3/api_op_ListBucketInventoryConfigurations.go index d72cc7bfe27..0e6aa66f4f1 100644 --- a/service/s3/api_op_ListBucketInventoryConfigurations.go +++ b/service/s3/api_op_ListBucketInventoryConfigurations.go @@ -177,10 +177,21 @@ func newServiceMetadataMiddleware_opListBucketInventoryConfigurations(region str } } +// getListBucketInventoryConfigurationsBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getListBucketInventoryConfigurationsBucketMember(input interface{}) (*string, bool) { + in := input.(*ListBucketInventoryConfigurationsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListBucketInventoryConfigurationsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListBucketInventoryConfigurationsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListBucketMetricsConfigurations.go b/service/s3/api_op_ListBucketMetricsConfigurations.go index 84b58df41ea..121847b1c72 100644 --- a/service/s3/api_op_ListBucketMetricsConfigurations.go +++ b/service/s3/api_op_ListBucketMetricsConfigurations.go @@ -180,10 +180,21 @@ func newServiceMetadataMiddleware_opListBucketMetricsConfigurations(region strin } } +// getListBucketMetricsConfigurationsBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getListBucketMetricsConfigurationsBucketMember(input interface{}) (*string, bool) { + in := input.(*ListBucketMetricsConfigurationsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListBucketMetricsConfigurationsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListBucketMetricsConfigurationsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListBuckets.go b/service/s3/api_op_ListBuckets.go index 3790c43605a..d61ea14eadf 100644 --- a/service/s3/api_op_ListBuckets.go +++ b/service/s3/api_op_ListBuckets.go @@ -120,8 +120,9 @@ func newServiceMetadataMiddleware_opListBuckets(region string) *awsmiddleware.Re func addListBucketsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: nopGetBucketAccessor, + SupportsAccelerate: false, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListMultipartUploads.go b/service/s3/api_op_ListMultipartUploads.go index c4a5219a203..52039be7e2a 100644 --- a/service/s3/api_op_ListMultipartUploads.go +++ b/service/s3/api_op_ListMultipartUploads.go @@ -271,10 +271,21 @@ func newServiceMetadataMiddleware_opListMultipartUploads(region string) *awsmidd } } +// getListMultipartUploadsBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getListMultipartUploadsBucketMember(input interface{}) (*string, bool) { + in := input.(*ListMultipartUploadsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListMultipartUploadsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListMultipartUploadsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListObjectVersions.go b/service/s3/api_op_ListObjectVersions.go index 22fd7801454..55eb14895b5 100644 --- a/service/s3/api_op_ListObjectVersions.go +++ b/service/s3/api_op_ListObjectVersions.go @@ -236,10 +236,21 @@ func newServiceMetadataMiddleware_opListObjectVersions(region string) *awsmiddle } } +// getListObjectVersionsBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getListObjectVersionsBucketMember(input interface{}) (*string, bool) { + in := input.(*ListObjectVersionsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListObjectVersionsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListObjectVersionsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListObjects.go b/service/s3/api_op_ListObjects.go index 202cc5f8a7c..6c604f89efa 100644 --- a/service/s3/api_op_ListObjects.go +++ b/service/s3/api_op_ListObjects.go @@ -245,10 +245,21 @@ func newServiceMetadataMiddleware_opListObjects(region string) *awsmiddleware.Re } } +// getListObjectsBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getListObjectsBucketMember(input interface{}) (*string, bool) { + in := input.(*ListObjectsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListObjectsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListObjectsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListObjectsV2.go b/service/s3/api_op_ListObjectsV2.go index 6bdea446c29..10181e16de6 100644 --- a/service/s3/api_op_ListObjectsV2.go +++ b/service/s3/api_op_ListObjectsV2.go @@ -275,10 +275,21 @@ func newServiceMetadataMiddleware_opListObjectsV2(region string) *awsmiddleware. } } +// getListObjectsV2BucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getListObjectsV2BucketMember(input interface{}) (*string, bool) { + in := input.(*ListObjectsV2Input) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListObjectsV2UpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListObjectsV2BucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_ListParts.go b/service/s3/api_op_ListParts.go index 3fa0afcf5f2..22d2883f554 100644 --- a/service/s3/api_op_ListParts.go +++ b/service/s3/api_op_ListParts.go @@ -267,10 +267,20 @@ func newServiceMetadataMiddleware_opListParts(region string) *awsmiddleware.Regi } } +// getListPartsBucketMember returns a pointer to string denoting a provided bucket +// member valueand a boolean indicating if the input has a modeled bucket name, +func getListPartsBucketMember(input interface{}) (*string, bool) { + in := input.(*ListPartsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addListPartsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getListPartsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketAccelerateConfiguration.go b/service/s3/api_op_PutBucketAccelerateConfiguration.go index 355d1e61855..95f51b53e60 100644 --- a/service/s3/api_op_PutBucketAccelerateConfiguration.go +++ b/service/s3/api_op_PutBucketAccelerateConfiguration.go @@ -164,10 +164,21 @@ func newServiceMetadataMiddleware_opPutBucketAccelerateConfiguration(region stri } } +// getPutBucketAccelerateConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getPutBucketAccelerateConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketAccelerateConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketAccelerateConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketAccelerateConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketAcl.go b/service/s3/api_op_PutBucketAcl.go index 3a199cc0f30..7c586e63374 100644 --- a/service/s3/api_op_PutBucketAcl.go +++ b/service/s3/api_op_PutBucketAcl.go @@ -288,10 +288,21 @@ func newServiceMetadataMiddleware_opPutBucketAcl(region string) *awsmiddleware.R } } +// getPutBucketAclBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutBucketAclBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketAclInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketAclUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketAclBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketAnalyticsConfiguration.go b/service/s3/api_op_PutBucketAnalyticsConfiguration.go index a5ca4895b7d..cf77d568d2c 100644 --- a/service/s3/api_op_PutBucketAnalyticsConfiguration.go +++ b/service/s3/api_op_PutBucketAnalyticsConfiguration.go @@ -196,10 +196,21 @@ func newServiceMetadataMiddleware_opPutBucketAnalyticsConfiguration(region strin } } +// getPutBucketAnalyticsConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getPutBucketAnalyticsConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketAnalyticsConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketAnalyticsConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketAnalyticsConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketCors.go b/service/s3/api_op_PutBucketCors.go index 6bebec21775..63f6f21b9f4 100644 --- a/service/s3/api_op_PutBucketCors.go +++ b/service/s3/api_op_PutBucketCors.go @@ -181,10 +181,21 @@ func newServiceMetadataMiddleware_opPutBucketCors(region string) *awsmiddleware. } } +// getPutBucketCorsBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutBucketCorsBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketCorsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketCorsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketCorsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketEncryption.go b/service/s3/api_op_PutBucketEncryption.go index 7252063e175..5b43fe8ee0f 100644 --- a/service/s3/api_op_PutBucketEncryption.go +++ b/service/s3/api_op_PutBucketEncryption.go @@ -165,10 +165,21 @@ func newServiceMetadataMiddleware_opPutBucketEncryption(region string) *awsmiddl } } +// getPutBucketEncryptionBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutBucketEncryptionBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketEncryptionInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketEncryptionUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketEncryptionBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketInventoryConfiguration.go b/service/s3/api_op_PutBucketInventoryConfiguration.go index 7b72c05aa33..cf1297edcc7 100644 --- a/service/s3/api_op_PutBucketInventoryConfiguration.go +++ b/service/s3/api_op_PutBucketInventoryConfiguration.go @@ -196,10 +196,21 @@ func newServiceMetadataMiddleware_opPutBucketInventoryConfiguration(region strin } } +// getPutBucketInventoryConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getPutBucketInventoryConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketInventoryConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketInventoryConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketInventoryConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketLifecycleConfiguration.go b/service/s3/api_op_PutBucketLifecycleConfiguration.go index 1b001f4ad25..f886d3e2acd 100644 --- a/service/s3/api_op_PutBucketLifecycleConfiguration.go +++ b/service/s3/api_op_PutBucketLifecycleConfiguration.go @@ -194,10 +194,21 @@ func newServiceMetadataMiddleware_opPutBucketLifecycleConfiguration(region strin } } +// getPutBucketLifecycleConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getPutBucketLifecycleConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketLifecycleConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketLifecycleConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketLifecycleConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketLogging.go b/service/s3/api_op_PutBucketLogging.go index 3135343769e..5547f86a1be 100644 --- a/service/s3/api_op_PutBucketLogging.go +++ b/service/s3/api_op_PutBucketLogging.go @@ -179,10 +179,21 @@ func newServiceMetadataMiddleware_opPutBucketLogging(region string) *awsmiddlewa } } +// getPutBucketLoggingBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutBucketLoggingBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketLoggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketLoggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketLoggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketMetricsConfiguration.go b/service/s3/api_op_PutBucketMetricsConfiguration.go index d9a9f03211c..3d00005047c 100644 --- a/service/s3/api_op_PutBucketMetricsConfiguration.go +++ b/service/s3/api_op_PutBucketMetricsConfiguration.go @@ -171,10 +171,21 @@ func newServiceMetadataMiddleware_opPutBucketMetricsConfiguration(region string) } } +// getPutBucketMetricsConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getPutBucketMetricsConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketMetricsConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketMetricsConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketMetricsConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketNotificationConfiguration.go b/service/s3/api_op_PutBucketNotificationConfiguration.go index 54225dc33b5..3a7a09f3e23 100644 --- a/service/s3/api_op_PutBucketNotificationConfiguration.go +++ b/service/s3/api_op_PutBucketNotificationConfiguration.go @@ -163,10 +163,21 @@ func newServiceMetadataMiddleware_opPutBucketNotificationConfiguration(region st } } +// getPutBucketNotificationConfigurationBucketMember returns a pointer to string +// denoting a provided bucket member valueand a boolean indicating if the input has +// a modeled bucket name, +func getPutBucketNotificationConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketNotificationConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketNotificationConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketNotificationConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketOwnershipControls.go b/service/s3/api_op_PutBucketOwnershipControls.go index 6961c305a10..668c336b715 100644 --- a/service/s3/api_op_PutBucketOwnershipControls.go +++ b/service/s3/api_op_PutBucketOwnershipControls.go @@ -141,10 +141,21 @@ func newServiceMetadataMiddleware_opPutBucketOwnershipControls(region string) *a } } +// getPutBucketOwnershipControlsBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutBucketOwnershipControlsBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketOwnershipControlsInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketOwnershipControlsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketOwnershipControlsBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketPolicy.go b/service/s3/api_op_PutBucketPolicy.go index 2c4eedf5de0..71fca403d92 100644 --- a/service/s3/api_op_PutBucketPolicy.go +++ b/service/s3/api_op_PutBucketPolicy.go @@ -156,10 +156,21 @@ func newServiceMetadataMiddleware_opPutBucketPolicy(region string) *awsmiddlewar } } +// getPutBucketPolicyBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutBucketPolicyBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketPolicyInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketPolicyUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketPolicyBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketReplication.go b/service/s3/api_op_PutBucketReplication.go index a1f274ceaac..afb21db02a7 100644 --- a/service/s3/api_op_PutBucketReplication.go +++ b/service/s3/api_op_PutBucketReplication.go @@ -194,10 +194,21 @@ func newServiceMetadataMiddleware_opPutBucketReplication(region string) *awsmidd } } +// getPutBucketReplicationBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutBucketReplicationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketReplicationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketReplicationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketReplicationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketRequestPayment.go b/service/s3/api_op_PutBucketRequestPayment.go index b3ac343e7c2..bda9beab42b 100644 --- a/service/s3/api_op_PutBucketRequestPayment.go +++ b/service/s3/api_op_PutBucketRequestPayment.go @@ -149,10 +149,21 @@ func newServiceMetadataMiddleware_opPutBucketRequestPayment(region string) *awsm } } +// getPutBucketRequestPaymentBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutBucketRequestPaymentBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketRequestPaymentInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketRequestPaymentUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketRequestPaymentBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketTagging.go b/service/s3/api_op_PutBucketTagging.go index 692fa23a84f..7cffc206a47 100644 --- a/service/s3/api_op_PutBucketTagging.go +++ b/service/s3/api_op_PutBucketTagging.go @@ -193,10 +193,21 @@ func newServiceMetadataMiddleware_opPutBucketTagging(region string) *awsmiddlewa } } +// getPutBucketTaggingBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutBucketTaggingBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketTaggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketTaggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketVersioning.go b/service/s3/api_op_PutBucketVersioning.go index 6f227d5d8b8..f8e43a623f2 100644 --- a/service/s3/api_op_PutBucketVersioning.go +++ b/service/s3/api_op_PutBucketVersioning.go @@ -171,10 +171,21 @@ func newServiceMetadataMiddleware_opPutBucketVersioning(region string) *awsmiddl } } +// getPutBucketVersioningBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutBucketVersioningBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketVersioningInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketVersioningUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketVersioningBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutBucketWebsite.go b/service/s3/api_op_PutBucketWebsite.go index 3d6a60931d9..ad9ee60b067 100644 --- a/service/s3/api_op_PutBucketWebsite.go +++ b/service/s3/api_op_PutBucketWebsite.go @@ -207,10 +207,21 @@ func newServiceMetadataMiddleware_opPutBucketWebsite(region string) *awsmiddlewa } } +// getPutBucketWebsiteBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutBucketWebsiteBucketMember(input interface{}) (*string, bool) { + in := input.(*PutBucketWebsiteInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutBucketWebsiteUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutBucketWebsiteBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutObject.go b/service/s3/api_op_PutObject.go index fa464df8c85..a47fc6f4b38 100644 --- a/service/s3/api_op_PutObject.go +++ b/service/s3/api_op_PutObject.go @@ -401,10 +401,20 @@ func newServiceMetadataMiddleware_opPutObject(region string) *awsmiddleware.Regi } } +// getPutObjectBucketMember returns a pointer to string denoting a provided bucket +// member valueand a boolean indicating if the input has a modeled bucket name, +func getPutObjectBucketMember(input interface{}) (*string, bool) { + in := input.(*PutObjectInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutObjectUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutObjectBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutObjectAcl.go b/service/s3/api_op_PutObjectAcl.go index fdfffb8c04d..72d483644d5 100644 --- a/service/s3/api_op_PutObjectAcl.go +++ b/service/s3/api_op_PutObjectAcl.go @@ -330,10 +330,21 @@ func newServiceMetadataMiddleware_opPutObjectAcl(region string) *awsmiddleware.R } } +// getPutObjectAclBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutObjectAclBucketMember(input interface{}) (*string, bool) { + in := input.(*PutObjectAclInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutObjectAclUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutObjectAclBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutObjectLegalHold.go b/service/s3/api_op_PutObjectLegalHold.go index 827194bd8c9..bf0fb174098 100644 --- a/service/s3/api_op_PutObjectLegalHold.go +++ b/service/s3/api_op_PutObjectLegalHold.go @@ -166,10 +166,21 @@ func newServiceMetadataMiddleware_opPutObjectLegalHold(region string) *awsmiddle } } +// getPutObjectLegalHoldBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutObjectLegalHoldBucketMember(input interface{}) (*string, bool) { + in := input.(*PutObjectLegalHoldInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutObjectLegalHoldUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutObjectLegalHoldBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutObjectLockConfiguration.go b/service/s3/api_op_PutObjectLockConfiguration.go index 5e429095fe6..90959085335 100644 --- a/service/s3/api_op_PutObjectLockConfiguration.go +++ b/service/s3/api_op_PutObjectLockConfiguration.go @@ -154,10 +154,21 @@ func newServiceMetadataMiddleware_opPutObjectLockConfiguration(region string) *a } } +// getPutObjectLockConfigurationBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutObjectLockConfigurationBucketMember(input interface{}) (*string, bool) { + in := input.(*PutObjectLockConfigurationInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutObjectLockConfigurationUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutObjectLockConfigurationBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutObjectRetention.go b/service/s3/api_op_PutObjectRetention.go index abb9a8ee8e5..10b2e9446cb 100644 --- a/service/s3/api_op_PutObjectRetention.go +++ b/service/s3/api_op_PutObjectRetention.go @@ -170,10 +170,21 @@ func newServiceMetadataMiddleware_opPutObjectRetention(region string) *awsmiddle } } +// getPutObjectRetentionBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutObjectRetentionBucketMember(input interface{}) (*string, bool) { + in := input.(*PutObjectRetentionInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutObjectRetentionUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutObjectRetentionBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutObjectTagging.go b/service/s3/api_op_PutObjectTagging.go index e803211a52c..208fc269179 100644 --- a/service/s3/api_op_PutObjectTagging.go +++ b/service/s3/api_op_PutObjectTagging.go @@ -206,10 +206,21 @@ func newServiceMetadataMiddleware_opPutObjectTagging(region string) *awsmiddlewa } } +// getPutObjectTaggingBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getPutObjectTaggingBucketMember(input interface{}) (*string, bool) { + in := input.(*PutObjectTaggingInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutObjectTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutObjectTaggingBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_PutPublicAccessBlock.go b/service/s3/api_op_PutPublicAccessBlock.go index fb08a43287c..9146886303c 100644 --- a/service/s3/api_op_PutPublicAccessBlock.go +++ b/service/s3/api_op_PutPublicAccessBlock.go @@ -168,10 +168,21 @@ func newServiceMetadataMiddleware_opPutPublicAccessBlock(region string) *awsmidd } } +// getPutPublicAccessBlockBucketMember returns a pointer to string denoting a +// provided bucket member valueand a boolean indicating if the input has a modeled +// bucket name, +func getPutPublicAccessBlockBucketMember(input interface{}) (*string, bool) { + in := input.(*PutPublicAccessBlockInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addPutPublicAccessBlockUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getPutPublicAccessBlockBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_RestoreObject.go b/service/s3/api_op_RestoreObject.go index 1e7ae791492..58e72578b67 100644 --- a/service/s3/api_op_RestoreObject.go +++ b/service/s3/api_op_RestoreObject.go @@ -383,10 +383,21 @@ func newServiceMetadataMiddleware_opRestoreObject(region string) *awsmiddleware. } } +// getRestoreObjectBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getRestoreObjectBucketMember(input interface{}) (*string, bool) { + in := input.(*RestoreObjectInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addRestoreObjectUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getRestoreObjectBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_UploadPart.go b/service/s3/api_op_UploadPart.go index ddfff458925..f781b40c9b0 100644 --- a/service/s3/api_op_UploadPart.go +++ b/service/s3/api_op_UploadPart.go @@ -313,10 +313,20 @@ func newServiceMetadataMiddleware_opUploadPart(region string) *awsmiddleware.Reg } } +// getUploadPartBucketMember returns a pointer to string denoting a provided bucket +// member valueand a boolean indicating if the input has a modeled bucket name, +func getUploadPartBucketMember(input interface{}) (*string, bool) { + in := input.(*UploadPartInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addUploadPartUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getUploadPartBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3/api_op_UploadPartCopy.go b/service/s3/api_op_UploadPartCopy.go index d298e85213b..488b03c1b6e 100644 --- a/service/s3/api_op_UploadPartCopy.go +++ b/service/s3/api_op_UploadPartCopy.go @@ -399,10 +399,21 @@ func newServiceMetadataMiddleware_opUploadPartCopy(region string) *awsmiddleware } } +// getUploadPartCopyBucketMember returns a pointer to string denoting a provided +// bucket member valueand a boolean indicating if the input has a modeled bucket +// name, +func getUploadPartCopyBucketMember(input interface{}) (*string, bool) { + in := input.(*UploadPartCopyInput) + if in.Bucket == nil { + return nil, false + } + return in.Bucket, true +} func addUploadPartCopyUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3cust.UpdateEndpoint(stack, s3cust.UpdateEndpointOptions{ - Accessor: s3cust.UpdateEndpointParameterAccessor{GetBucketFromInput: getBucketFromInput, - SupportsAccelerate: supportAccelerate, + Accessor: s3cust.UpdateEndpointParameterAccessor{ + GetBucketFromInput: getUploadPartCopyBucketMember, + SupportsAccelerate: true, }, UsePathStyle: options.UsePathStyle, UseAccelerate: options.UseAccelerate, diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go index 2b51bf42940..4a43d826c83 100644 --- a/service/s3control/api_client.go +++ b/service/s3control/api_client.go @@ -240,17 +240,29 @@ func addMetadataRetrieverMiddleware(stack *middleware.Stack) error { return s3shared.AddMetadataRetrieverMiddleware(stack) } -// getOutpostIDFromInput returns a boolean indicating if the input has a modeled -// outpost-id, and a pointer to string denoting a provided outpost-id member value -func getOutpostIDFromInput(input interface{}) (*string, bool) { - switch i := input.(type) { - case *CreateBucketInput: - return i.OutpostId, true - case *ListRegionalBucketsInput: - return i.OutpostId, true - default: - return nil, false - } +// nopGetOutpostIDFromInput provides a nop accessor function to be used when +// endpoint customization behavior is not based on presence of outpost id member if +// any +func nopGetOutpostIDFromInput(input interface{}) (*string, bool) { + return nil, false +} + +// nopGetARNAccessor provides a nop get accessor function to be used when a certain +// operation does not support ARNs +func nopGetARNAccessor(input interface{}) (*string, bool) { + return nil, false +} + +// nopSetARNAccessor provides a nop set accessor function to be used when a certain +// operation does not support ARNs +func nopSetARNAccessor(input interface{}, v string) error { + return nil +} + +// nopBackfillAccountIDAccessor provides a nop accessor function to be used when a +// certain operation does not need to validate and backfill account id +func nopBackfillAccountIDAccessor(input interface{}, v string) error { + return nil } func addResponseErrorMiddleware(stack *middleware.Stack) error { diff --git a/service/s3control/api_op_CreateAccessPoint.go b/service/s3control/api_op_CreateAccessPoint.go index 45c160018a6..a48da7b7582 100644 --- a/service/s3control/api_op_CreateAccessPoint.go +++ b/service/s3control/api_op_CreateAccessPoint.go @@ -271,7 +271,7 @@ func addCreateAccessPointUpdateEndpoint(stack *middleware.Stack, options Options return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getCreateAccessPointARNMember, BackfillAccountID: backFillCreateAccessPointAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setCreateAccessPointARNMember, CopyInput: copyCreateAccessPointInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_CreateBucket.go b/service/s3control/api_op_CreateBucket.go index 76e4458ae5e..d1e47e2f030 100644 --- a/service/s3control/api_op_CreateBucket.go +++ b/service/s3control/api_op_CreateBucket.go @@ -224,15 +224,23 @@ func copyCreateBucketInputForUpdateEndpoint(params interface{}) (interface{}, er cpy := *input return &cpy, nil } -func backFillCreateBucketAccountID(input interface{}, v string) error { - return nil + +// getCreateBucketOutpostIDMember returns a pointer to string denoting a provided +// outpost-id member value and a boolean indicating if the input has a modeled +// outpost-id, +func getCreateBucketOutpostIDMember(input interface{}) (*string, bool) { + in := input.(*CreateBucketInput) + if in.OutpostId == nil { + return nil, false + } + return in.OutpostId, true } func addCreateBucketUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nil, - BackfillAccountID: nil, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: nil, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: getCreateBucketOutpostIDMember, + UpdateARNField: nopSetARNAccessor, CopyInput: copyCreateBucketInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_CreateJob.go b/service/s3control/api_op_CreateJob.go index 5924c0cf2aa..8b4b4a1dd90 100644 --- a/service/s3control/api_op_CreateJob.go +++ b/service/s3control/api_op_CreateJob.go @@ -280,12 +280,6 @@ func copyCreateJobInputForUpdateEndpoint(params interface{}) (interface{}, error cpy := *input return &cpy, nil } -func getCreateJobARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setCreateJobARNMember(input interface{}, v string) error { - return nil -} func backFillCreateJobAccountID(input interface{}, v string) error { in := input.(*CreateJobInput) if in.AccountId != nil { @@ -299,10 +293,10 @@ func backFillCreateJobAccountID(input interface{}, v string) error { } func addCreateJobUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getCreateJobARNMember, - BackfillAccountID: backFillCreateJobAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setCreateJobARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyCreateJobInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_DeleteAccessPoint.go b/service/s3control/api_op_DeleteAccessPoint.go index bc6d88a6219..74ae85b8422 100644 --- a/service/s3control/api_op_DeleteAccessPoint.go +++ b/service/s3control/api_op_DeleteAccessPoint.go @@ -227,7 +227,7 @@ func addDeleteAccessPointUpdateEndpoint(stack *middleware.Stack, options Options return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeleteAccessPointARNMember, BackfillAccountID: backFillDeleteAccessPointAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setDeleteAccessPointARNMember, CopyInput: copyDeleteAccessPointInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_DeleteAccessPointPolicy.go b/service/s3control/api_op_DeleteAccessPointPolicy.go index e67945b0ce4..7c1477524d1 100644 --- a/service/s3control/api_op_DeleteAccessPointPolicy.go +++ b/service/s3control/api_op_DeleteAccessPointPolicy.go @@ -223,7 +223,7 @@ func addDeleteAccessPointPolicyUpdateEndpoint(stack *middleware.Stack, options O return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeleteAccessPointPolicyARNMember, BackfillAccountID: backFillDeleteAccessPointPolicyAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setDeleteAccessPointPolicyARNMember, CopyInput: copyDeleteAccessPointPolicyInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_DeleteBucket.go b/service/s3control/api_op_DeleteBucket.go index bb8a591c8ca..1d9b4e92ce1 100644 --- a/service/s3control/api_op_DeleteBucket.go +++ b/service/s3control/api_op_DeleteBucket.go @@ -233,7 +233,7 @@ func addDeleteBucketUpdateEndpoint(stack *middleware.Stack, options Options) err return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeleteBucketARNMember, BackfillAccountID: backFillDeleteBucketAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setDeleteBucketARNMember, CopyInput: copyDeleteBucketInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go index e7554e8fc46..a6c393dc79e 100644 --- a/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_DeleteBucketLifecycleConfiguration.go @@ -238,7 +238,7 @@ func addDeleteBucketLifecycleConfigurationUpdateEndpoint(stack *middleware.Stack return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeleteBucketLifecycleConfigurationARNMember, BackfillAccountID: backFillDeleteBucketLifecycleConfigurationAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setDeleteBucketLifecycleConfigurationARNMember, CopyInput: copyDeleteBucketLifecycleConfigurationInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_DeleteBucketPolicy.go b/service/s3control/api_op_DeleteBucketPolicy.go index be5fbf89d28..ad42e361890 100644 --- a/service/s3control/api_op_DeleteBucketPolicy.go +++ b/service/s3control/api_op_DeleteBucketPolicy.go @@ -241,7 +241,7 @@ func addDeleteBucketPolicyUpdateEndpoint(stack *middleware.Stack, options Option return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeleteBucketPolicyARNMember, BackfillAccountID: backFillDeleteBucketPolicyAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setDeleteBucketPolicyARNMember, CopyInput: copyDeleteBucketPolicyInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_DeleteBucketTagging.go b/service/s3control/api_op_DeleteBucketTagging.go index eb4474b12e4..56cd4f62b95 100644 --- a/service/s3control/api_op_DeleteBucketTagging.go +++ b/service/s3control/api_op_DeleteBucketTagging.go @@ -231,7 +231,7 @@ func addDeleteBucketTaggingUpdateEndpoint(stack *middleware.Stack, options Optio return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeleteBucketTaggingARNMember, BackfillAccountID: backFillDeleteBucketTaggingAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setDeleteBucketTaggingARNMember, CopyInput: copyDeleteBucketTaggingInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_DeleteJobTagging.go b/service/s3control/api_op_DeleteJobTagging.go index 914ef1d5467..01aa37de34b 100644 --- a/service/s3control/api_op_DeleteJobTagging.go +++ b/service/s3control/api_op_DeleteJobTagging.go @@ -192,12 +192,6 @@ func copyDeleteJobTaggingInputForUpdateEndpoint(params interface{}) (interface{} cpy := *input return &cpy, nil } -func getDeleteJobTaggingARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setDeleteJobTaggingARNMember(input interface{}, v string) error { - return nil -} func backFillDeleteJobTaggingAccountID(input interface{}, v string) error { in := input.(*DeleteJobTaggingInput) if in.AccountId != nil { @@ -211,10 +205,10 @@ func backFillDeleteJobTaggingAccountID(input interface{}, v string) error { } func addDeleteJobTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeleteJobTaggingARNMember, - BackfillAccountID: backFillDeleteJobTaggingAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setDeleteJobTaggingARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyDeleteJobTaggingInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_DeletePublicAccessBlock.go b/service/s3control/api_op_DeletePublicAccessBlock.go index 3f00474281c..a66df25b495 100644 --- a/service/s3control/api_op_DeletePublicAccessBlock.go +++ b/service/s3control/api_op_DeletePublicAccessBlock.go @@ -181,12 +181,6 @@ func copyDeletePublicAccessBlockInputForUpdateEndpoint(params interface{}) (inte cpy := *input return &cpy, nil } -func getDeletePublicAccessBlockARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setDeletePublicAccessBlockARNMember(input interface{}, v string) error { - return nil -} func backFillDeletePublicAccessBlockAccountID(input interface{}, v string) error { in := input.(*DeletePublicAccessBlockInput) if in.AccountId != nil { @@ -200,10 +194,10 @@ func backFillDeletePublicAccessBlockAccountID(input interface{}, v string) error } func addDeletePublicAccessBlockUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDeletePublicAccessBlockARNMember, - BackfillAccountID: backFillDeletePublicAccessBlockAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setDeletePublicAccessBlockARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyDeletePublicAccessBlockInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_DescribeJob.go b/service/s3control/api_op_DescribeJob.go index 65cd0cd8741..2c6012bdec4 100644 --- a/service/s3control/api_op_DescribeJob.go +++ b/service/s3control/api_op_DescribeJob.go @@ -200,12 +200,6 @@ func copyDescribeJobInputForUpdateEndpoint(params interface{}) (interface{}, err cpy := *input return &cpy, nil } -func getDescribeJobARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setDescribeJobARNMember(input interface{}, v string) error { - return nil -} func backFillDescribeJobAccountID(input interface{}, v string) error { in := input.(*DescribeJobInput) if in.AccountId != nil { @@ -219,10 +213,10 @@ func backFillDescribeJobAccountID(input interface{}, v string) error { } func addDescribeJobUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getDescribeJobARNMember, - BackfillAccountID: backFillDescribeJobAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setDescribeJobARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyDescribeJobInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_GetAccessPoint.go b/service/s3control/api_op_GetAccessPoint.go index 698526e09ef..01397b57a48 100644 --- a/service/s3control/api_op_GetAccessPoint.go +++ b/service/s3control/api_op_GetAccessPoint.go @@ -260,7 +260,7 @@ func addGetAccessPointUpdateEndpoint(stack *middleware.Stack, options Options) e return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetAccessPointARNMember, BackfillAccountID: backFillGetAccessPointAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setGetAccessPointARNMember, CopyInput: copyGetAccessPointInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_GetAccessPointPolicy.go b/service/s3control/api_op_GetAccessPointPolicy.go index 11536689ddc..c51319453a0 100644 --- a/service/s3control/api_op_GetAccessPointPolicy.go +++ b/service/s3control/api_op_GetAccessPointPolicy.go @@ -220,7 +220,7 @@ func addGetAccessPointPolicyUpdateEndpoint(stack *middleware.Stack, options Opti return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetAccessPointPolicyARNMember, BackfillAccountID: backFillGetAccessPointPolicyAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setGetAccessPointPolicyARNMember, CopyInput: copyGetAccessPointPolicyInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_GetAccessPointPolicyStatus.go b/service/s3control/api_op_GetAccessPointPolicyStatus.go index cbdc2916447..01f75b43151 100644 --- a/service/s3control/api_op_GetAccessPointPolicyStatus.go +++ b/service/s3control/api_op_GetAccessPointPolicyStatus.go @@ -184,12 +184,6 @@ func copyGetAccessPointPolicyStatusInputForUpdateEndpoint(params interface{}) (i cpy := *input return &cpy, nil } -func getGetAccessPointPolicyStatusARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setGetAccessPointPolicyStatusARNMember(input interface{}, v string) error { - return nil -} func backFillGetAccessPointPolicyStatusAccountID(input interface{}, v string) error { in := input.(*GetAccessPointPolicyStatusInput) if in.AccountId != nil { @@ -203,10 +197,10 @@ func backFillGetAccessPointPolicyStatusAccountID(input interface{}, v string) er } func addGetAccessPointPolicyStatusUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetAccessPointPolicyStatusARNMember, - BackfillAccountID: backFillGetAccessPointPolicyStatusAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setGetAccessPointPolicyStatusARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyGetAccessPointPolicyStatusInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_GetBucket.go b/service/s3control/api_op_GetBucket.go index 09b380485c1..ed9785630d5 100644 --- a/service/s3control/api_op_GetBucket.go +++ b/service/s3control/api_op_GetBucket.go @@ -232,7 +232,7 @@ func addGetBucketUpdateEndpoint(stack *middleware.Stack, options Options) error return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetBucketARNMember, BackfillAccountID: backFillGetBucketAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setGetBucketARNMember, CopyInput: copyGetBucketInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_GetBucketLifecycleConfiguration.go b/service/s3control/api_op_GetBucketLifecycleConfiguration.go index 7ce82ff69c8..8bfb0030d58 100644 --- a/service/s3control/api_op_GetBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_GetBucketLifecycleConfiguration.go @@ -258,7 +258,7 @@ func addGetBucketLifecycleConfigurationUpdateEndpoint(stack *middleware.Stack, o return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetBucketLifecycleConfigurationARNMember, BackfillAccountID: backFillGetBucketLifecycleConfigurationAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setGetBucketLifecycleConfigurationARNMember, CopyInput: copyGetBucketLifecycleConfigurationInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_GetBucketPolicy.go b/service/s3control/api_op_GetBucketPolicy.go index e9c5e42fa26..09f62a9122e 100644 --- a/service/s3control/api_op_GetBucketPolicy.go +++ b/service/s3control/api_op_GetBucketPolicy.go @@ -247,7 +247,7 @@ func addGetBucketPolicyUpdateEndpoint(stack *middleware.Stack, options Options) return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetBucketPolicyARNMember, BackfillAccountID: backFillGetBucketPolicyAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setGetBucketPolicyARNMember, CopyInput: copyGetBucketPolicyInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_GetBucketTagging.go b/service/s3control/api_op_GetBucketTagging.go index 2cdab00e6de..e7f98ca4475 100644 --- a/service/s3control/api_op_GetBucketTagging.go +++ b/service/s3control/api_op_GetBucketTagging.go @@ -246,7 +246,7 @@ func addGetBucketTaggingUpdateEndpoint(stack *middleware.Stack, options Options) return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetBucketTaggingARNMember, BackfillAccountID: backFillGetBucketTaggingAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setGetBucketTaggingARNMember, CopyInput: copyGetBucketTaggingInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_GetJobTagging.go b/service/s3control/api_op_GetJobTagging.go index 64c06ec8cd2..834249646dd 100644 --- a/service/s3control/api_op_GetJobTagging.go +++ b/service/s3control/api_op_GetJobTagging.go @@ -196,12 +196,6 @@ func copyGetJobTaggingInputForUpdateEndpoint(params interface{}) (interface{}, e cpy := *input return &cpy, nil } -func getGetJobTaggingARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setGetJobTaggingARNMember(input interface{}, v string) error { - return nil -} func backFillGetJobTaggingAccountID(input interface{}, v string) error { in := input.(*GetJobTaggingInput) if in.AccountId != nil { @@ -215,10 +209,10 @@ func backFillGetJobTaggingAccountID(input interface{}, v string) error { } func addGetJobTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetJobTaggingARNMember, - BackfillAccountID: backFillGetJobTaggingAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setGetJobTaggingARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyGetJobTaggingInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_GetPublicAccessBlock.go b/service/s3control/api_op_GetPublicAccessBlock.go index 562e2dbfd51..2b69b846e55 100644 --- a/service/s3control/api_op_GetPublicAccessBlock.go +++ b/service/s3control/api_op_GetPublicAccessBlock.go @@ -186,12 +186,6 @@ func copyGetPublicAccessBlockInputForUpdateEndpoint(params interface{}) (interfa cpy := *input return &cpy, nil } -func getGetPublicAccessBlockARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setGetPublicAccessBlockARNMember(input interface{}, v string) error { - return nil -} func backFillGetPublicAccessBlockAccountID(input interface{}, v string) error { in := input.(*GetPublicAccessBlockInput) if in.AccountId != nil { @@ -205,10 +199,10 @@ func backFillGetPublicAccessBlockAccountID(input interface{}, v string) error { } func addGetPublicAccessBlockUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getGetPublicAccessBlockARNMember, - BackfillAccountID: backFillGetPublicAccessBlockAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setGetPublicAccessBlockARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyGetPublicAccessBlockInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_ListAccessPoints.go b/service/s3control/api_op_ListAccessPoints.go index 9e5e6da98bf..ef320d6b40f 100644 --- a/service/s3control/api_op_ListAccessPoints.go +++ b/service/s3control/api_op_ListAccessPoints.go @@ -251,7 +251,7 @@ func addListAccessPointsUpdateEndpoint(stack *middleware.Stack, options Options) return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getListAccessPointsARNMember, BackfillAccountID: backFillListAccessPointsAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setListAccessPointsARNMember, CopyInput: copyListAccessPointsInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_ListJobs.go b/service/s3control/api_op_ListJobs.go index 455176d29e5..2eb52e8db8e 100644 --- a/service/s3control/api_op_ListJobs.go +++ b/service/s3control/api_op_ListJobs.go @@ -215,12 +215,6 @@ func copyListJobsInputForUpdateEndpoint(params interface{}) (interface{}, error) cpy := *input return &cpy, nil } -func getListJobsARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setListJobsARNMember(input interface{}, v string) error { - return nil -} func backFillListJobsAccountID(input interface{}, v string) error { in := input.(*ListJobsInput) if in.AccountId != nil { @@ -234,10 +228,10 @@ func backFillListJobsAccountID(input interface{}, v string) error { } func addListJobsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getListJobsARNMember, - BackfillAccountID: backFillListJobsAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setListJobsARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyListJobsInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_ListRegionalBuckets.go b/service/s3control/api_op_ListRegionalBuckets.go index 89ca9c9ac14..2dd2e12854a 100644 --- a/service/s3control/api_op_ListRegionalBuckets.go +++ b/service/s3control/api_op_ListRegionalBuckets.go @@ -196,6 +196,17 @@ func copyListRegionalBucketsInputForUpdateEndpoint(params interface{}) (interfac cpy := *input return &cpy, nil } + +// getListRegionalBucketsOutpostIDMember returns a pointer to string denoting a +// provided outpost-id member value and a boolean indicating if the input has a +// modeled outpost-id, +func getListRegionalBucketsOutpostIDMember(input interface{}) (*string, bool) { + in := input.(*ListRegionalBucketsInput) + if in.OutpostId == nil { + return nil, false + } + return in.OutpostId, true +} func backFillListRegionalBucketsAccountID(input interface{}, v string) error { in := input.(*ListRegionalBucketsInput) if in.AccountId != nil { @@ -209,10 +220,10 @@ func backFillListRegionalBucketsAccountID(input interface{}, v string) error { } func addListRegionalBucketsUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nil, - BackfillAccountID: nil, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: nil, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: getListRegionalBucketsOutpostIDMember, + UpdateARNField: nopSetARNAccessor, CopyInput: copyListRegionalBucketsInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_PutAccessPointPolicy.go b/service/s3control/api_op_PutAccessPointPolicy.go index a45a61469e1..c401c02ed04 100644 --- a/service/s3control/api_op_PutAccessPointPolicy.go +++ b/service/s3control/api_op_PutAccessPointPolicy.go @@ -235,7 +235,7 @@ func addPutAccessPointPolicyUpdateEndpoint(stack *middleware.Stack, options Opti return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getPutAccessPointPolicyARNMember, BackfillAccountID: backFillPutAccessPointPolicyAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setPutAccessPointPolicyARNMember, CopyInput: copyPutAccessPointPolicyInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_PutBucketLifecycleConfiguration.go b/service/s3control/api_op_PutBucketLifecycleConfiguration.go index e25651e614d..136f3c0e77c 100644 --- a/service/s3control/api_op_PutBucketLifecycleConfiguration.go +++ b/service/s3control/api_op_PutBucketLifecycleConfiguration.go @@ -233,7 +233,7 @@ func addPutBucketLifecycleConfigurationUpdateEndpoint(stack *middleware.Stack, o return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getPutBucketLifecycleConfigurationARNMember, BackfillAccountID: backFillPutBucketLifecycleConfigurationAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setPutBucketLifecycleConfigurationARNMember, CopyInput: copyPutBucketLifecycleConfigurationInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_PutBucketPolicy.go b/service/s3control/api_op_PutBucketPolicy.go index 4ed6e42467d..2ab93af85c9 100644 --- a/service/s3control/api_op_PutBucketPolicy.go +++ b/service/s3control/api_op_PutBucketPolicy.go @@ -252,7 +252,7 @@ func addPutBucketPolicyUpdateEndpoint(stack *middleware.Stack, options Options) return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getPutBucketPolicyARNMember, BackfillAccountID: backFillPutBucketPolicyAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setPutBucketPolicyARNMember, CopyInput: copyPutBucketPolicyInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_PutBucketTagging.go b/service/s3control/api_op_PutBucketTagging.go index 262c33f5f37..adca2a78b3b 100644 --- a/service/s3control/api_op_PutBucketTagging.go +++ b/service/s3control/api_op_PutBucketTagging.go @@ -288,7 +288,7 @@ func addPutBucketTaggingUpdateEndpoint(stack *middleware.Stack, options Options) return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getPutBucketTaggingARNMember, BackfillAccountID: backFillPutBucketTaggingAccountID, - GetOutpostIDInput: getOutpostIDFromInput, + GetOutpostIDInput: nopGetOutpostIDFromInput, UpdateARNField: setPutBucketTaggingARNMember, CopyInput: copyPutBucketTaggingInputForUpdateEndpoint, }, diff --git a/service/s3control/api_op_PutJobTagging.go b/service/s3control/api_op_PutJobTagging.go index 6eb7801ed3e..66a1275e2df 100644 --- a/service/s3control/api_op_PutJobTagging.go +++ b/service/s3control/api_op_PutJobTagging.go @@ -239,12 +239,6 @@ func copyPutJobTaggingInputForUpdateEndpoint(params interface{}) (interface{}, e cpy := *input return &cpy, nil } -func getPutJobTaggingARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setPutJobTaggingARNMember(input interface{}, v string) error { - return nil -} func backFillPutJobTaggingAccountID(input interface{}, v string) error { in := input.(*PutJobTaggingInput) if in.AccountId != nil { @@ -258,10 +252,10 @@ func backFillPutJobTaggingAccountID(input interface{}, v string) error { } func addPutJobTaggingUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getPutJobTaggingARNMember, - BackfillAccountID: backFillPutJobTaggingAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setPutJobTaggingARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyPutJobTaggingInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_PutPublicAccessBlock.go b/service/s3control/api_op_PutPublicAccessBlock.go index 7b519acbb7e..5ff7bb09509 100644 --- a/service/s3control/api_op_PutPublicAccessBlock.go +++ b/service/s3control/api_op_PutPublicAccessBlock.go @@ -188,12 +188,6 @@ func copyPutPublicAccessBlockInputForUpdateEndpoint(params interface{}) (interfa cpy := *input return &cpy, nil } -func getPutPublicAccessBlockARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setPutPublicAccessBlockARNMember(input interface{}, v string) error { - return nil -} func backFillPutPublicAccessBlockAccountID(input interface{}, v string) error { in := input.(*PutPublicAccessBlockInput) if in.AccountId != nil { @@ -207,10 +201,10 @@ func backFillPutPublicAccessBlockAccountID(input interface{}, v string) error { } func addPutPublicAccessBlockUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getPutPublicAccessBlockARNMember, - BackfillAccountID: backFillPutPublicAccessBlockAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setPutPublicAccessBlockARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyPutPublicAccessBlockInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_UpdateJobPriority.go b/service/s3control/api_op_UpdateJobPriority.go index b41091ae103..5a8c6aee356 100644 --- a/service/s3control/api_op_UpdateJobPriority.go +++ b/service/s3control/api_op_UpdateJobPriority.go @@ -210,12 +210,6 @@ func copyUpdateJobPriorityInputForUpdateEndpoint(params interface{}) (interface{ cpy := *input return &cpy, nil } -func getUpdateJobPriorityARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setUpdateJobPriorityARNMember(input interface{}, v string) error { - return nil -} func backFillUpdateJobPriorityAccountID(input interface{}, v string) error { in := input.(*UpdateJobPriorityInput) if in.AccountId != nil { @@ -229,10 +223,10 @@ func backFillUpdateJobPriorityAccountID(input interface{}, v string) error { } func addUpdateJobPriorityUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getUpdateJobPriorityARNMember, - BackfillAccountID: backFillUpdateJobPriorityAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setUpdateJobPriorityARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyUpdateJobPriorityInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/api_op_UpdateJobStatus.go b/service/s3control/api_op_UpdateJobStatus.go index 45a8404dcd8..5fca8df8dc6 100644 --- a/service/s3control/api_op_UpdateJobStatus.go +++ b/service/s3control/api_op_UpdateJobStatus.go @@ -215,12 +215,6 @@ func copyUpdateJobStatusInputForUpdateEndpoint(params interface{}) (interface{}, cpy := *input return &cpy, nil } -func getUpdateJobStatusARNMember(input interface{}) (*string, bool) { - return nil, false -} -func setUpdateJobStatusARNMember(input interface{}, v string) error { - return nil -} func backFillUpdateJobStatusAccountID(input interface{}, v string) error { in := input.(*UpdateJobStatusInput) if in.AccountId != nil { @@ -234,10 +228,10 @@ func backFillUpdateJobStatusAccountID(input interface{}, v string) error { } func addUpdateJobStatusUpdateEndpoint(stack *middleware.Stack, options Options) error { return s3controlcust.UpdateEndpoint(stack, s3controlcust.UpdateEndpointOptions{ - Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: getUpdateJobStatusARNMember, - BackfillAccountID: backFillUpdateJobStatusAccountID, - GetOutpostIDInput: getOutpostIDFromInput, - UpdateARNField: setUpdateJobStatusARNMember, + Accessor: s3controlcust.UpdateEndpointParameterAccessor{GetARNInput: nopGetARNAccessor, + BackfillAccountID: nopBackfillAccountIDAccessor, + GetOutpostIDInput: nopGetOutpostIDFromInput, + UpdateARNField: nopSetARNAccessor, CopyInput: copyUpdateJobStatusInputForUpdateEndpoint, }, EndpointResolver: options.EndpointResolver, diff --git a/service/s3control/go.sum b/service/s3control/go.sum index ae15bbd55b5..d62e77529fa 100644 --- a/service/s3control/go.sum +++ b/service/s3control/go.sum @@ -1,3 +1,12 @@ +github.com/aws/aws-sdk-go-v2 v0.28.1-0.20201027160747-2592e9547fe4/go.mod h1:P9h1Cf+uOpElAT533QXKOzrpFaOlm8JMorThJNUfQ6Q= +github.com/aws/aws-sdk-go-v2 v0.29.0 h1:V/KKvuMO2hwHRg2SXJc5aasBHhD1AWbS6KMWg/Ueq1w= +github.com/aws/aws-sdk-go-v2 v0.29.0/go.mod h1:4d1/Ee0vCwCF7BfG1hCT3zu82493cRy5+VZ8JHvMPf0= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.1-0.20201027184009-8eb8fc303e7c h1:Cm++f8Gc+n+R7LRF2/uYSxSRw+dIS3lepE7qCHsZzYE= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.1-0.20201027184009-8eb8fc303e7c/go.mod h1:/45/g9thJEPyLQ5x6wj5tlXz+i6uLWLlJkHABYdYFH0= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v0.3.1 h1:5dV7pN0xCrnecvbn7+qkK1XbsYwSqbDoSCzVeaW2LJE= +github.com/awslabs/smithy-go v0.2.1/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= +github.com/awslabs/smithy-go v0.2.2-0.20201026231331-345290040c23/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= +github.com/awslabs/smithy-go v0.3.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/awslabs/smithy-go v0.3.1-0.20201104233911-38864709e183/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= github.com/awslabs/smithy-go v0.3.1-0.20201108010311-62c2a93810b4 h1:Aj5dOF+lDoEhU92no7YZF0IokuWGjiNrcm/DGIG3iII= github.com/awslabs/smithy-go v0.3.1-0.20201108010311-62c2a93810b4/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= @@ -10,5 +19,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=