aws-sdk-s3 1.114.0 → 1.125.0

data/lib/aws-sdk-s3/client_api.rb

@@ -595,7 +595,7 @@ module Aws::S3
     AbortMultipartUploadOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     AbortMultipartUploadOutput.struct_class = Types::AbortMultipartUploadOutput
 
-    AbortMultipartUploadRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    AbortMultipartUploadRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     AbortMultipartUploadRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     AbortMultipartUploadRequest.add_member(:upload_id, Shapes::ShapeRef.new(shape: MultipartUploadId, required: true, location: "querystring", location_name: "uploadId"))
     AbortMultipartUploadRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
@@ -724,7 +724,7 @@ module Aws::S3
     CompleteMultipartUploadOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     CompleteMultipartUploadOutput.struct_class = Types::CompleteMultipartUploadOutput
 
-    CompleteMultipartUploadRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    CompleteMultipartUploadRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     CompleteMultipartUploadRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     CompleteMultipartUploadRequest.add_member(:multipart_upload, Shapes::ShapeRef.new(shape: CompletedMultipartUpload, location_name: "CompleteMultipartUpload", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     CompleteMultipartUploadRequest.add_member(:upload_id, Shapes::ShapeRef.new(shape: MultipartUploadId, required: true, location: "querystring", location_name: "uploadId"))
@@ -776,7 +776,7 @@ module Aws::S3
     CopyObjectOutput[:payload_member] = CopyObjectOutput.member(:copy_object_result)
 
     CopyObjectRequest.add_member(:acl, Shapes::ShapeRef.new(shape: ObjectCannedACL, location: "header", location_name: "x-amz-acl"))
-    CopyObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    CopyObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     CopyObjectRequest.add_member(:cache_control, Shapes::ShapeRef.new(shape: CacheControl, location: "header", location_name: "Cache-Control"))
     CopyObjectRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-checksum-algorithm"))
     CopyObjectRequest.add_member(:content_disposition, Shapes::ShapeRef.new(shape: ContentDisposition, location: "header", location_name: "Content-Disposition"))
@@ -841,7 +841,7 @@ module Aws::S3
     CreateBucketOutput.struct_class = Types::CreateBucketOutput
 
     CreateBucketRequest.add_member(:acl, Shapes::ShapeRef.new(shape: BucketCannedACL, location: "header", location_name: "x-amz-acl"))
-    CreateBucketRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    CreateBucketRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     CreateBucketRequest.add_member(:create_bucket_configuration, Shapes::ShapeRef.new(shape: CreateBucketConfiguration, location_name: "CreateBucketConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     CreateBucketRequest.add_member(:grant_full_control, Shapes::ShapeRef.new(shape: GrantFullControl, location: "header", location_name: "x-amz-grant-full-control"))
     CreateBucketRequest.add_member(:grant_read, Shapes::ShapeRef.new(shape: GrantRead, location: "header", location_name: "x-amz-grant-read"))
@@ -870,7 +870,7 @@ module Aws::S3
     CreateMultipartUploadOutput.struct_class = Types::CreateMultipartUploadOutput
 
     CreateMultipartUploadRequest.add_member(:acl, Shapes::ShapeRef.new(shape: ObjectCannedACL, location: "header", location_name: "x-amz-acl"))
-    CreateMultipartUploadRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    CreateMultipartUploadRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     CreateMultipartUploadRequest.add_member(:cache_control, Shapes::ShapeRef.new(shape: CacheControl, location: "header", location_name: "Cache-Control"))
     CreateMultipartUploadRequest.add_member(:content_disposition, Shapes::ShapeRef.new(shape: ContentDisposition, location: "header", location_name: "Content-Disposition"))
     CreateMultipartUploadRequest.add_member(:content_encoding, Shapes::ShapeRef.new(shape: ContentEncoding, location: "header", location_name: "Content-Encoding"))
@@ -910,58 +910,58 @@ module Aws::S3
     Delete.add_member(:quiet, Shapes::ShapeRef.new(shape: Quiet, location_name: "Quiet"))
     Delete.struct_class = Types::Delete
 
-    DeleteBucketAnalyticsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketAnalyticsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketAnalyticsConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: AnalyticsId, required: true, location: "querystring", location_name: "id"))
     DeleteBucketAnalyticsConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketAnalyticsConfigurationRequest.struct_class = Types::DeleteBucketAnalyticsConfigurationRequest
 
-    DeleteBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketCorsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketCorsRequest.struct_class = Types::DeleteBucketCorsRequest
 
-    DeleteBucketEncryptionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketEncryptionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketEncryptionRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketEncryptionRequest.struct_class = Types::DeleteBucketEncryptionRequest
 
-    DeleteBucketIntelligentTieringConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketIntelligentTieringConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketIntelligentTieringConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: IntelligentTieringId, required: true, location: "querystring", location_name: "id"))
     DeleteBucketIntelligentTieringConfigurationRequest.struct_class = Types::DeleteBucketIntelligentTieringConfigurationRequest
 
-    DeleteBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketInventoryConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: InventoryId, required: true, location: "querystring", location_name: "id"))
     DeleteBucketInventoryConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketInventoryConfigurationRequest.struct_class = Types::DeleteBucketInventoryConfigurationRequest
 
-    DeleteBucketLifecycleRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketLifecycleRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketLifecycleRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketLifecycleRequest.struct_class = Types::DeleteBucketLifecycleRequest
 
-    DeleteBucketMetricsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketMetricsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketMetricsConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: MetricsId, required: true, location: "querystring", location_name: "id"))
     DeleteBucketMetricsConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketMetricsConfigurationRequest.struct_class = Types::DeleteBucketMetricsConfigurationRequest
 
-    DeleteBucketOwnershipControlsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketOwnershipControlsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketOwnershipControlsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketOwnershipControlsRequest.struct_class = Types::DeleteBucketOwnershipControlsRequest
 
-    DeleteBucketPolicyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketPolicyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketPolicyRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketPolicyRequest.struct_class = Types::DeleteBucketPolicyRequest
 
-    DeleteBucketReplicationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketReplicationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketReplicationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketReplicationRequest.struct_class = Types::DeleteBucketReplicationRequest
 
-    DeleteBucketRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketRequest.struct_class = Types::DeleteBucketRequest
 
-    DeleteBucketTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketTaggingRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketTaggingRequest.struct_class = Types::DeleteBucketTaggingRequest
 
-    DeleteBucketWebsiteRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketWebsiteRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteBucketWebsiteRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeleteBucketWebsiteRequest.struct_class = Types::DeleteBucketWebsiteRequest
 
@@ -982,7 +982,7 @@ module Aws::S3
     DeleteObjectOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     DeleteObjectOutput.struct_class = Types::DeleteObjectOutput
 
-    DeleteObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteObjectRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     DeleteObjectRequest.add_member(:mfa, Shapes::ShapeRef.new(shape: MFA, location: "header", location_name: "x-amz-mfa"))
     DeleteObjectRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
@@ -994,7 +994,7 @@ module Aws::S3
     DeleteObjectTaggingOutput.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "header", location_name: "x-amz-version-id"))
     DeleteObjectTaggingOutput.struct_class = Types::DeleteObjectTaggingOutput
 
-    DeleteObjectTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteObjectTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteObjectTaggingRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     DeleteObjectTaggingRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     DeleteObjectTaggingRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
@@ -1005,7 +1005,7 @@ module Aws::S3
     DeleteObjectsOutput.add_member(:errors, Shapes::ShapeRef.new(shape: Errors, location_name: "Error"))
     DeleteObjectsOutput.struct_class = Types::DeleteObjectsOutput
 
-    DeleteObjectsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteObjectsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeleteObjectsRequest.add_member(:delete, Shapes::ShapeRef.new(shape: Delete, required: true, location_name: "Delete", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     DeleteObjectsRequest.add_member(:mfa, Shapes::ShapeRef.new(shape: MFA, location: "header", location_name: "x-amz-mfa"))
     DeleteObjectsRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
@@ -1016,7 +1016,7 @@ module Aws::S3
     DeleteObjectsRequest[:payload] = :delete
     DeleteObjectsRequest[:payload_member] = DeleteObjectsRequest.member(:delete)
 
-    DeletePublicAccessBlockRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeletePublicAccessBlockRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     DeletePublicAccessBlockRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     DeletePublicAccessBlockRequest.struct_class = Types::DeletePublicAccessBlockRequest
 
@@ -1076,7 +1076,7 @@ module Aws::S3
     GetBucketAccelerateConfigurationOutput.add_member(:status, Shapes::ShapeRef.new(shape: BucketAccelerateStatus, location_name: "Status"))
     GetBucketAccelerateConfigurationOutput.struct_class = Types::GetBucketAccelerateConfigurationOutput
 
-    GetBucketAccelerateConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketAccelerateConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketAccelerateConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketAccelerateConfigurationRequest.struct_class = Types::GetBucketAccelerateConfigurationRequest
 
@@ -1084,7 +1084,7 @@ module Aws::S3
     GetBucketAclOutput.add_member(:grants, Shapes::ShapeRef.new(shape: Grants, location_name: "AccessControlList"))
     GetBucketAclOutput.struct_class = Types::GetBucketAclOutput
 
-    GetBucketAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketAclRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketAclRequest.struct_class = Types::GetBucketAclRequest
 
@@ -1093,7 +1093,7 @@ module Aws::S3
     GetBucketAnalyticsConfigurationOutput[:payload] = :analytics_configuration
     GetBucketAnalyticsConfigurationOutput[:payload_member] = GetBucketAnalyticsConfigurationOutput.member(:analytics_configuration)
 
-    GetBucketAnalyticsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketAnalyticsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketAnalyticsConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: AnalyticsId, required: true, location: "querystring", location_name: "id"))
     GetBucketAnalyticsConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketAnalyticsConfigurationRequest.struct_class = Types::GetBucketAnalyticsConfigurationRequest
@@ -1101,7 +1101,7 @@ module Aws::S3
     GetBucketCorsOutput.add_member(:cors_rules, Shapes::ShapeRef.new(shape: CORSRules, location_name: "CORSRule"))
     GetBucketCorsOutput.struct_class = Types::GetBucketCorsOutput
 
-    GetBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketCorsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketCorsRequest.struct_class = Types::GetBucketCorsRequest
 
@@ -1110,7 +1110,7 @@ module Aws::S3
     GetBucketEncryptionOutput[:payload] = :server_side_encryption_configuration
     GetBucketEncryptionOutput[:payload_member] = GetBucketEncryptionOutput.member(:server_side_encryption_configuration)
 
-    GetBucketEncryptionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketEncryptionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketEncryptionRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketEncryptionRequest.struct_class = Types::GetBucketEncryptionRequest
 
@@ -1119,7 +1119,7 @@ module Aws::S3
     GetBucketIntelligentTieringConfigurationOutput[:payload] = :intelligent_tiering_configuration
     GetBucketIntelligentTieringConfigurationOutput[:payload_member] = GetBucketIntelligentTieringConfigurationOutput.member(:intelligent_tiering_configuration)
 
-    GetBucketIntelligentTieringConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketIntelligentTieringConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketIntelligentTieringConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: IntelligentTieringId, required: true, location: "querystring", location_name: "id"))
     GetBucketIntelligentTieringConfigurationRequest.struct_class = Types::GetBucketIntelligentTieringConfigurationRequest
 
@@ -1128,7 +1128,7 @@ module Aws::S3
     GetBucketInventoryConfigurationOutput[:payload] = :inventory_configuration
     GetBucketInventoryConfigurationOutput[:payload_member] = GetBucketInventoryConfigurationOutput.member(:inventory_configuration)
 
-    GetBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketInventoryConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: InventoryId, required: true, location: "querystring", location_name: "id"))
     GetBucketInventoryConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketInventoryConfigurationRequest.struct_class = Types::GetBucketInventoryConfigurationRequest
@@ -1136,28 +1136,28 @@ module Aws::S3
     GetBucketLifecycleConfigurationOutput.add_member(:rules, Shapes::ShapeRef.new(shape: LifecycleRules, location_name: "Rule"))
     GetBucketLifecycleConfigurationOutput.struct_class = Types::GetBucketLifecycleConfigurationOutput
 
-    GetBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketLifecycleConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketLifecycleConfigurationRequest.struct_class = Types::GetBucketLifecycleConfigurationRequest
 
     GetBucketLifecycleOutput.add_member(:rules, Shapes::ShapeRef.new(shape: Rules, location_name: "Rule"))
     GetBucketLifecycleOutput.struct_class = Types::GetBucketLifecycleOutput
 
-    GetBucketLifecycleRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketLifecycleRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketLifecycleRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketLifecycleRequest.struct_class = Types::GetBucketLifecycleRequest
 
     GetBucketLocationOutput.add_member(:location_constraint, Shapes::ShapeRef.new(shape: BucketLocationConstraint, location_name: "LocationConstraint"))
     GetBucketLocationOutput.struct_class = Types::GetBucketLocationOutput
 
-    GetBucketLocationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketLocationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketLocationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketLocationRequest.struct_class = Types::GetBucketLocationRequest
 
     GetBucketLoggingOutput.add_member(:logging_enabled, Shapes::ShapeRef.new(shape: LoggingEnabled, location_name: "LoggingEnabled"))
     GetBucketLoggingOutput.struct_class = Types::GetBucketLoggingOutput
 
-    GetBucketLoggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketLoggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketLoggingRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketLoggingRequest.struct_class = Types::GetBucketLoggingRequest
 
@@ -1166,12 +1166,12 @@ module Aws::S3
     GetBucketMetricsConfigurationOutput[:payload] = :metrics_configuration
     GetBucketMetricsConfigurationOutput[:payload_member] = GetBucketMetricsConfigurationOutput.member(:metrics_configuration)
 
-    GetBucketMetricsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketMetricsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketMetricsConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: MetricsId, required: true, location: "querystring", location_name: "id"))
     GetBucketMetricsConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketMetricsConfigurationRequest.struct_class = Types::GetBucketMetricsConfigurationRequest
 
-    GetBucketNotificationConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketNotificationConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketNotificationConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketNotificationConfigurationRequest.struct_class = Types::GetBucketNotificationConfigurationRequest
 
@@ -1180,7 +1180,7 @@ module Aws::S3
     GetBucketOwnershipControlsOutput[:payload] = :ownership_controls
     GetBucketOwnershipControlsOutput[:payload_member] = GetBucketOwnershipControlsOutput.member(:ownership_controls)
 
-    GetBucketOwnershipControlsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketOwnershipControlsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketOwnershipControlsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketOwnershipControlsRequest.struct_class = Types::GetBucketOwnershipControlsRequest
 
@@ -1189,7 +1189,7 @@ module Aws::S3
     GetBucketPolicyOutput[:payload] = :policy
     GetBucketPolicyOutput[:payload_member] = GetBucketPolicyOutput.member(:policy)
 
-    GetBucketPolicyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketPolicyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketPolicyRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketPolicyRequest.struct_class = Types::GetBucketPolicyRequest
 
@@ -1198,7 +1198,7 @@ module Aws::S3
     GetBucketPolicyStatusOutput[:payload] = :policy_status
     GetBucketPolicyStatusOutput[:payload_member] = GetBucketPolicyStatusOutput.member(:policy_status)
 
-    GetBucketPolicyStatusRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketPolicyStatusRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketPolicyStatusRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketPolicyStatusRequest.struct_class = Types::GetBucketPolicyStatusRequest
 
@@ -1207,21 +1207,21 @@ module Aws::S3
     GetBucketReplicationOutput[:payload] = :replication_configuration
     GetBucketReplicationOutput[:payload_member] = GetBucketReplicationOutput.member(:replication_configuration)
 
-    GetBucketReplicationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketReplicationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketReplicationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketReplicationRequest.struct_class = Types::GetBucketReplicationRequest
 
     GetBucketRequestPaymentOutput.add_member(:payer, Shapes::ShapeRef.new(shape: Payer, location_name: "Payer"))
     GetBucketRequestPaymentOutput.struct_class = Types::GetBucketRequestPaymentOutput
 
-    GetBucketRequestPaymentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketRequestPaymentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketRequestPaymentRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketRequestPaymentRequest.struct_class = Types::GetBucketRequestPaymentRequest
 
     GetBucketTaggingOutput.add_member(:tag_set, Shapes::ShapeRef.new(shape: TagSet, required: true, location_name: "TagSet"))
     GetBucketTaggingOutput.struct_class = Types::GetBucketTaggingOutput
 
-    GetBucketTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketTaggingRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketTaggingRequest.struct_class = Types::GetBucketTaggingRequest
 
@@ -1229,7 +1229,7 @@ module Aws::S3
     GetBucketVersioningOutput.add_member(:mfa_delete, Shapes::ShapeRef.new(shape: MFADeleteStatus, location_name: "MfaDelete"))
     GetBucketVersioningOutput.struct_class = Types::GetBucketVersioningOutput
 
-    GetBucketVersioningRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketVersioningRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketVersioningRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketVersioningRequest.struct_class = Types::GetBucketVersioningRequest
 
@@ -1239,7 +1239,7 @@ module Aws::S3
     GetBucketWebsiteOutput.add_member(:routing_rules, Shapes::ShapeRef.new(shape: RoutingRules, location_name: "RoutingRules"))
     GetBucketWebsiteOutput.struct_class = Types::GetBucketWebsiteOutput
 
-    GetBucketWebsiteRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetBucketWebsiteRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetBucketWebsiteRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetBucketWebsiteRequest.struct_class = Types::GetBucketWebsiteRequest
 
@@ -1248,7 +1248,7 @@ module Aws::S3
     GetObjectAclOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     GetObjectAclOutput.struct_class = Types::GetObjectAclOutput
 
-    GetObjectAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectAclRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     GetObjectAclRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     GetObjectAclRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
@@ -1274,7 +1274,7 @@ module Aws::S3
     GetObjectAttributesParts.add_member(:parts, Shapes::ShapeRef.new(shape: PartsList, location_name: "Part"))
     GetObjectAttributesParts.struct_class = Types::GetObjectAttributesParts
 
-    GetObjectAttributesRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectAttributesRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectAttributesRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     GetObjectAttributesRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     GetObjectAttributesRequest.add_member(:max_parts, Shapes::ShapeRef.new(shape: MaxParts, location: "header", location_name: "x-amz-max-parts"))
@@ -1292,7 +1292,7 @@ module Aws::S3
     GetObjectLegalHoldOutput[:payload] = :legal_hold
     GetObjectLegalHoldOutput[:payload_member] = GetObjectLegalHoldOutput.member(:legal_hold)
 
-    GetObjectLegalHoldRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectLegalHoldRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectLegalHoldRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     GetObjectLegalHoldRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     GetObjectLegalHoldRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
@@ -1304,7 +1304,7 @@ module Aws::S3
     GetObjectLockConfigurationOutput[:payload] = :object_lock_configuration
     GetObjectLockConfigurationOutput[:payload_member] = GetObjectLockConfigurationOutput.member(:object_lock_configuration)
 
-    GetObjectLockConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectLockConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectLockConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetObjectLockConfigurationRequest.struct_class = Types::GetObjectLockConfigurationRequest
 
@@ -1349,7 +1349,7 @@ module Aws::S3
     GetObjectOutput[:payload] = :body
     GetObjectOutput[:payload_member] = GetObjectOutput.member(:body)
 
-    GetObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectRequest.add_member(:if_match, Shapes::ShapeRef.new(shape: IfMatch, location: "header", location_name: "If-Match"))
     GetObjectRequest.add_member(:if_modified_since, Shapes::ShapeRef.new(shape: IfModifiedSince, location: "header", location_name: "If-Modified-Since"))
     GetObjectRequest.add_member(:if_none_match, Shapes::ShapeRef.new(shape: IfNoneMatch, location: "header", location_name: "If-None-Match"))
@@ -1377,7 +1377,7 @@ module Aws::S3
     GetObjectRetentionOutput[:payload] = :retention
     GetObjectRetentionOutput[:payload_member] = GetObjectRetentionOutput.member(:retention)
 
-    GetObjectRetentionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectRetentionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectRetentionRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     GetObjectRetentionRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     GetObjectRetentionRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
@@ -1388,7 +1388,7 @@ module Aws::S3
     GetObjectTaggingOutput.add_member(:tag_set, Shapes::ShapeRef.new(shape: TagSet, required: true, location_name: "TagSet"))
     GetObjectTaggingOutput.struct_class = Types::GetObjectTaggingOutput
 
-    GetObjectTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectTaggingRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     GetObjectTaggingRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     GetObjectTaggingRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
@@ -1401,7 +1401,7 @@ module Aws::S3
     GetObjectTorrentOutput[:payload] = :body
     GetObjectTorrentOutput[:payload_member] = GetObjectTorrentOutput.member(:body)
 
-    GetObjectTorrentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetObjectTorrentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetObjectTorrentRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     GetObjectTorrentRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     GetObjectTorrentRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
@@ -1412,7 +1412,7 @@ module Aws::S3
     GetPublicAccessBlockOutput[:payload] = :public_access_block_configuration
     GetPublicAccessBlockOutput[:payload_member] = GetPublicAccessBlockOutput.member(:public_access_block_configuration)
 
-    GetPublicAccessBlockRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    GetPublicAccessBlockRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     GetPublicAccessBlockRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     GetPublicAccessBlockRequest.struct_class = Types::GetPublicAccessBlockRequest
 
@@ -1432,7 +1432,7 @@ module Aws::S3
 
     Grants.member = Shapes::ShapeRef.new(shape: Grant, location_name: "Grant")
 
-    HeadBucketRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    HeadBucketRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     HeadBucketRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     HeadBucketRequest.struct_class = Types::HeadBucketRequest
 
@@ -1473,7 +1473,7 @@ module Aws::S3
     HeadObjectOutput.add_member(:object_lock_legal_hold_status, Shapes::ShapeRef.new(shape: ObjectLockLegalHoldStatus, location: "header", location_name: "x-amz-object-lock-legal-hold"))
     HeadObjectOutput.struct_class = Types::HeadObjectOutput
 
-    HeadObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    HeadObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     HeadObjectRequest.add_member(:if_match, Shapes::ShapeRef.new(shape: IfMatch, location: "header", location_name: "If-Match"))
     HeadObjectRequest.add_member(:if_modified_since, Shapes::ShapeRef.new(shape: IfModifiedSince, location: "header", location_name: "If-Modified-Since"))
     HeadObjectRequest.add_member(:if_none_match, Shapes::ShapeRef.new(shape: IfNoneMatch, location: "header", location_name: "If-None-Match"))
@@ -1611,7 +1611,7 @@ module Aws::S3
     ListBucketAnalyticsConfigurationsOutput.add_member(:analytics_configuration_list, Shapes::ShapeRef.new(shape: AnalyticsConfigurationList, location_name: "AnalyticsConfiguration"))
     ListBucketAnalyticsConfigurationsOutput.struct_class = Types::ListBucketAnalyticsConfigurationsOutput
 
-    ListBucketAnalyticsConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListBucketAnalyticsConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListBucketAnalyticsConfigurationsRequest.add_member(:continuation_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "continuation-token"))
     ListBucketAnalyticsConfigurationsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     ListBucketAnalyticsConfigurationsRequest.struct_class = Types::ListBucketAnalyticsConfigurationsRequest
@@ -1622,7 +1622,7 @@ module Aws::S3
     ListBucketIntelligentTieringConfigurationsOutput.add_member(:intelligent_tiering_configuration_list, Shapes::ShapeRef.new(shape: IntelligentTieringConfigurationList, location_name: "IntelligentTieringConfiguration"))
     ListBucketIntelligentTieringConfigurationsOutput.struct_class = Types::ListBucketIntelligentTieringConfigurationsOutput
 
-    ListBucketIntelligentTieringConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListBucketIntelligentTieringConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListBucketIntelligentTieringConfigurationsRequest.add_member(:continuation_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "continuation-token"))
     ListBucketIntelligentTieringConfigurationsRequest.struct_class = Types::ListBucketIntelligentTieringConfigurationsRequest
 
@@ -1632,7 +1632,7 @@ module Aws::S3
     ListBucketInventoryConfigurationsOutput.add_member(:next_continuation_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextContinuationToken"))
     ListBucketInventoryConfigurationsOutput.struct_class = Types::ListBucketInventoryConfigurationsOutput
 
-    ListBucketInventoryConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListBucketInventoryConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListBucketInventoryConfigurationsRequest.add_member(:continuation_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "continuation-token"))
     ListBucketInventoryConfigurationsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     ListBucketInventoryConfigurationsRequest.struct_class = Types::ListBucketInventoryConfigurationsRequest
@@ -1643,7 +1643,7 @@ module Aws::S3
     ListBucketMetricsConfigurationsOutput.add_member(:metrics_configuration_list, Shapes::ShapeRef.new(shape: MetricsConfigurationList, location_name: "MetricsConfiguration"))
     ListBucketMetricsConfigurationsOutput.struct_class = Types::ListBucketMetricsConfigurationsOutput
 
-    ListBucketMetricsConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListBucketMetricsConfigurationsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListBucketMetricsConfigurationsRequest.add_member(:continuation_token, Shapes::ShapeRef.new(shape: Token, location: "querystring", location_name: "continuation-token"))
     ListBucketMetricsConfigurationsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     ListBucketMetricsConfigurationsRequest.struct_class = Types::ListBucketMetricsConfigurationsRequest
@@ -1666,7 +1666,7 @@ module Aws::S3
     ListMultipartUploadsOutput.add_member(:encoding_type, Shapes::ShapeRef.new(shape: EncodingType, location_name: "EncodingType"))
     ListMultipartUploadsOutput.struct_class = Types::ListMultipartUploadsOutput
 
-    ListMultipartUploadsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListMultipartUploadsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListMultipartUploadsRequest.add_member(:delimiter, Shapes::ShapeRef.new(shape: Delimiter, location: "querystring", location_name: "delimiter"))
     ListMultipartUploadsRequest.add_member(:encoding_type, Shapes::ShapeRef.new(shape: EncodingType, location: "querystring", location_name: "encoding-type"))
     ListMultipartUploadsRequest.add_member(:key_marker, Shapes::ShapeRef.new(shape: KeyMarker, location: "querystring", location_name: "key-marker"))
@@ -1691,7 +1691,7 @@ module Aws::S3
     ListObjectVersionsOutput.add_member(:encoding_type, Shapes::ShapeRef.new(shape: EncodingType, location_name: "EncodingType"))
     ListObjectVersionsOutput.struct_class = Types::ListObjectVersionsOutput
 
-    ListObjectVersionsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListObjectVersionsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListObjectVersionsRequest.add_member(:delimiter, Shapes::ShapeRef.new(shape: Delimiter, location: "querystring", location_name: "delimiter"))
     ListObjectVersionsRequest.add_member(:encoding_type, Shapes::ShapeRef.new(shape: EncodingType, location: "querystring", location_name: "encoding-type"))
     ListObjectVersionsRequest.add_member(:key_marker, Shapes::ShapeRef.new(shape: KeyMarker, location: "querystring", location_name: "key-marker"))
@@ -1713,7 +1713,7 @@ module Aws::S3
     ListObjectsOutput.add_member(:encoding_type, Shapes::ShapeRef.new(shape: EncodingType, location_name: "EncodingType"))
     ListObjectsOutput.struct_class = Types::ListObjectsOutput
 
-    ListObjectsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListObjectsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListObjectsRequest.add_member(:delimiter, Shapes::ShapeRef.new(shape: Delimiter, location: "querystring", location_name: "delimiter"))
     ListObjectsRequest.add_member(:encoding_type, Shapes::ShapeRef.new(shape: EncodingType, location: "querystring", location_name: "encoding-type"))
     ListObjectsRequest.add_member(:marker, Shapes::ShapeRef.new(shape: Marker, location: "querystring", location_name: "marker"))
@@ -1737,7 +1737,7 @@ module Aws::S3
     ListObjectsV2Output.add_member(:start_after, Shapes::ShapeRef.new(shape: StartAfter, location_name: "StartAfter"))
     ListObjectsV2Output.struct_class = Types::ListObjectsV2Output
 
-    ListObjectsV2Request.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListObjectsV2Request.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListObjectsV2Request.add_member(:delimiter, Shapes::ShapeRef.new(shape: Delimiter, location: "querystring", location_name: "delimiter"))
     ListObjectsV2Request.add_member(:encoding_type, Shapes::ShapeRef.new(shape: EncodingType, location: "querystring", location_name: "encoding-type"))
     ListObjectsV2Request.add_member(:max_keys, Shapes::ShapeRef.new(shape: MaxKeys, location: "querystring", location_name: "max-keys"))
@@ -1766,7 +1766,7 @@ module Aws::S3
     ListPartsOutput.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location_name: "ChecksumAlgorithm"))
     ListPartsOutput.struct_class = Types::ListPartsOutput
 
-    ListPartsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    ListPartsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     ListPartsRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     ListPartsRequest.add_member(:max_parts, Shapes::ShapeRef.new(shape: MaxParts, location: "querystring", location_name: "max-parts"))
     ListPartsRequest.add_member(:part_number_marker, Shapes::ShapeRef.new(shape: PartNumberMarker, location: "querystring", location_name: "part-number-marker"))
@@ -1963,7 +1963,7 @@ module Aws::S3
     PublicAccessBlockConfiguration.add_member(:restrict_public_buckets, Shapes::ShapeRef.new(shape: Setting, location_name: "RestrictPublicBuckets"))
     PublicAccessBlockConfiguration.struct_class = Types::PublicAccessBlockConfiguration
 
-    PutBucketAccelerateConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketAccelerateConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketAccelerateConfigurationRequest.add_member(:accelerate_configuration, Shapes::ShapeRef.new(shape: AccelerateConfiguration, required: true, location_name: "AccelerateConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketAccelerateConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     PutBucketAccelerateConfigurationRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
@@ -1973,7 +1973,7 @@ module Aws::S3
 
     PutBucketAclRequest.add_member(:acl, Shapes::ShapeRef.new(shape: BucketCannedACL, location: "header", location_name: "x-amz-acl"))
     PutBucketAclRequest.add_member(:access_control_policy, Shapes::ShapeRef.new(shape: AccessControlPolicy, location_name: "AccessControlPolicy", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
-    PutBucketAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketAclRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketAclRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketAclRequest.add_member(:grant_full_control, Shapes::ShapeRef.new(shape: GrantFullControl, location: "header", location_name: "x-amz-grant-full-control"))
@@ -1986,7 +1986,7 @@ module Aws::S3
     PutBucketAclRequest[:payload] = :access_control_policy
     PutBucketAclRequest[:payload_member] = PutBucketAclRequest.member(:access_control_policy)
 
-    PutBucketAnalyticsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketAnalyticsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketAnalyticsConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: AnalyticsId, required: true, location: "querystring", location_name: "id"))
     PutBucketAnalyticsConfigurationRequest.add_member(:analytics_configuration, Shapes::ShapeRef.new(shape: AnalyticsConfiguration, required: true, location_name: "AnalyticsConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketAnalyticsConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
@@ -1994,7 +1994,7 @@ module Aws::S3
     PutBucketAnalyticsConfigurationRequest[:payload] = :analytics_configuration
     PutBucketAnalyticsConfigurationRequest[:payload_member] = PutBucketAnalyticsConfigurationRequest.member(:analytics_configuration)
 
-    PutBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketCorsRequest.add_member(:cors_configuration, Shapes::ShapeRef.new(shape: CORSConfiguration, required: true, location_name: "CORSConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketCorsRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketCorsRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
@@ -2003,7 +2003,7 @@ module Aws::S3
     PutBucketCorsRequest[:payload] = :cors_configuration
     PutBucketCorsRequest[:payload_member] = PutBucketCorsRequest.member(:cors_configuration)
 
-    PutBucketEncryptionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketEncryptionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketEncryptionRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketEncryptionRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketEncryptionRequest.add_member(:server_side_encryption_configuration, Shapes::ShapeRef.new(shape: ServerSideEncryptionConfiguration, required: true, location_name: "ServerSideEncryptionConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2012,14 +2012,14 @@ module Aws::S3
     PutBucketEncryptionRequest[:payload] = :server_side_encryption_configuration
     PutBucketEncryptionRequest[:payload_member] = PutBucketEncryptionRequest.member(:server_side_encryption_configuration)
 
-    PutBucketIntelligentTieringConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketIntelligentTieringConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketIntelligentTieringConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: IntelligentTieringId, required: true, location: "querystring", location_name: "id"))
     PutBucketIntelligentTieringConfigurationRequest.add_member(:intelligent_tiering_configuration, Shapes::ShapeRef.new(shape: IntelligentTieringConfiguration, required: true, location_name: "IntelligentTieringConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketIntelligentTieringConfigurationRequest.struct_class = Types::PutBucketIntelligentTieringConfigurationRequest
     PutBucketIntelligentTieringConfigurationRequest[:payload] = :intelligent_tiering_configuration
     PutBucketIntelligentTieringConfigurationRequest[:payload_member] = PutBucketIntelligentTieringConfigurationRequest.member(:intelligent_tiering_configuration)
 
-    PutBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketInventoryConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: InventoryId, required: true, location: "querystring", location_name: "id"))
     PutBucketInventoryConfigurationRequest.add_member(:inventory_configuration, Shapes::ShapeRef.new(shape: InventoryConfiguration, required: true, location_name: "InventoryConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketInventoryConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
@@ -2027,7 +2027,7 @@ module Aws::S3
     PutBucketInventoryConfigurationRequest[:payload] = :inventory_configuration
     PutBucketInventoryConfigurationRequest[:payload_member] = PutBucketInventoryConfigurationRequest.member(:inventory_configuration)
 
-    PutBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketLifecycleConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketLifecycleConfigurationRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketLifecycleConfigurationRequest.add_member(:lifecycle_configuration, Shapes::ShapeRef.new(shape: BucketLifecycleConfiguration, location_name: "LifecycleConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketLifecycleConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
@@ -2035,7 +2035,7 @@ module Aws::S3
     PutBucketLifecycleConfigurationRequest[:payload] = :lifecycle_configuration
     PutBucketLifecycleConfigurationRequest[:payload_member] = PutBucketLifecycleConfigurationRequest.member(:lifecycle_configuration)
 
-    PutBucketLifecycleRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketLifecycleRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketLifecycleRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketLifecycleRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketLifecycleRequest.add_member(:lifecycle_configuration, Shapes::ShapeRef.new(shape: LifecycleConfiguration, location_name: "LifecycleConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2044,7 +2044,7 @@ module Aws::S3
     PutBucketLifecycleRequest[:payload] = :lifecycle_configuration
     PutBucketLifecycleRequest[:payload_member] = PutBucketLifecycleRequest.member(:lifecycle_configuration)
 
-    PutBucketLoggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketLoggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketLoggingRequest.add_member(:bucket_logging_status, Shapes::ShapeRef.new(shape: BucketLoggingStatus, required: true, location_name: "BucketLoggingStatus", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketLoggingRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketLoggingRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
@@ -2053,7 +2053,7 @@ module Aws::S3
     PutBucketLoggingRequest[:payload] = :bucket_logging_status
     PutBucketLoggingRequest[:payload_member] = PutBucketLoggingRequest.member(:bucket_logging_status)
 
-    PutBucketMetricsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketMetricsConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketMetricsConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: MetricsId, required: true, location: "querystring", location_name: "id"))
     PutBucketMetricsConfigurationRequest.add_member(:metrics_configuration, Shapes::ShapeRef.new(shape: MetricsConfiguration, required: true, location_name: "MetricsConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketMetricsConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
@@ -2061,7 +2061,7 @@ module Aws::S3
     PutBucketMetricsConfigurationRequest[:payload] = :metrics_configuration
     PutBucketMetricsConfigurationRequest[:payload_member] = PutBucketMetricsConfigurationRequest.member(:metrics_configuration)
 
-    PutBucketNotificationConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketNotificationConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketNotificationConfigurationRequest.add_member(:notification_configuration, Shapes::ShapeRef.new(shape: NotificationConfiguration, required: true, location_name: "NotificationConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutBucketNotificationConfigurationRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     PutBucketNotificationConfigurationRequest.add_member(:skip_destination_validation, Shapes::ShapeRef.new(shape: SkipValidation, location: "header", location_name: "x-amz-skip-destination-validation"))
@@ -2069,7 +2069,7 @@ module Aws::S3
     PutBucketNotificationConfigurationRequest[:payload] = :notification_configuration
     PutBucketNotificationConfigurationRequest[:payload_member] = PutBucketNotificationConfigurationRequest.member(:notification_configuration)
 
-    PutBucketNotificationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketNotificationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketNotificationRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketNotificationRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketNotificationRequest.add_member(:notification_configuration, Shapes::ShapeRef.new(shape: NotificationConfigurationDeprecated, required: true, location_name: "NotificationConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2078,7 +2078,7 @@ module Aws::S3
     PutBucketNotificationRequest[:payload] = :notification_configuration
     PutBucketNotificationRequest[:payload_member] = PutBucketNotificationRequest.member(:notification_configuration)
 
-    PutBucketOwnershipControlsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketOwnershipControlsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketOwnershipControlsRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketOwnershipControlsRequest.add_member(:expected_bucket_owner, Shapes::ShapeRef.new(shape: AccountId, location: "header", location_name: "x-amz-expected-bucket-owner"))
     PutBucketOwnershipControlsRequest.add_member(:ownership_controls, Shapes::ShapeRef.new(shape: OwnershipControls, required: true, location_name: "OwnershipControls", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2086,7 +2086,7 @@ module Aws::S3
     PutBucketOwnershipControlsRequest[:payload] = :ownership_controls
     PutBucketOwnershipControlsRequest[:payload_member] = PutBucketOwnershipControlsRequest.member(:ownership_controls)
 
-    PutBucketPolicyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketPolicyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketPolicyRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketPolicyRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketPolicyRequest.add_member(:confirm_remove_self_bucket_access, Shapes::ShapeRef.new(shape: ConfirmRemoveSelfBucketAccess, location: "header", location_name: "x-amz-confirm-remove-self-bucket-access"))
@@ -2096,7 +2096,7 @@ module Aws::S3
     PutBucketPolicyRequest[:payload] = :policy
     PutBucketPolicyRequest[:payload_member] = PutBucketPolicyRequest.member(:policy)
 
-    PutBucketReplicationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketReplicationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketReplicationRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketReplicationRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketReplicationRequest.add_member(:replication_configuration, Shapes::ShapeRef.new(shape: ReplicationConfiguration, required: true, location_name: "ReplicationConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2106,7 +2106,7 @@ module Aws::S3
     PutBucketReplicationRequest[:payload] = :replication_configuration
     PutBucketReplicationRequest[:payload_member] = PutBucketReplicationRequest.member(:replication_configuration)
 
-    PutBucketRequestPaymentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketRequestPaymentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketRequestPaymentRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketRequestPaymentRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketRequestPaymentRequest.add_member(:request_payment_configuration, Shapes::ShapeRef.new(shape: RequestPaymentConfiguration, required: true, location_name: "RequestPaymentConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2115,7 +2115,7 @@ module Aws::S3
     PutBucketRequestPaymentRequest[:payload] = :request_payment_configuration
     PutBucketRequestPaymentRequest[:payload_member] = PutBucketRequestPaymentRequest.member(:request_payment_configuration)
 
-    PutBucketTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketTaggingRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketTaggingRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketTaggingRequest.add_member(:tagging, Shapes::ShapeRef.new(shape: Tagging, required: true, location_name: "Tagging", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2124,7 +2124,7 @@ module Aws::S3
     PutBucketTaggingRequest[:payload] = :tagging
     PutBucketTaggingRequest[:payload_member] = PutBucketTaggingRequest.member(:tagging)
 
-    PutBucketVersioningRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketVersioningRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketVersioningRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketVersioningRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketVersioningRequest.add_member(:mfa, Shapes::ShapeRef.new(shape: MFA, location: "header", location_name: "x-amz-mfa"))
@@ -2134,7 +2134,7 @@ module Aws::S3
     PutBucketVersioningRequest[:payload] = :versioning_configuration
     PutBucketVersioningRequest[:payload_member] = PutBucketVersioningRequest.member(:versioning_configuration)
 
-    PutBucketWebsiteRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutBucketWebsiteRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutBucketWebsiteRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutBucketWebsiteRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutBucketWebsiteRequest.add_member(:website_configuration, Shapes::ShapeRef.new(shape: WebsiteConfiguration, required: true, location_name: "WebsiteConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2148,7 +2148,7 @@ module Aws::S3
 
     PutObjectAclRequest.add_member(:acl, Shapes::ShapeRef.new(shape: ObjectCannedACL, location: "header", location_name: "x-amz-acl"))
     PutObjectAclRequest.add_member(:access_control_policy, Shapes::ShapeRef.new(shape: AccessControlPolicy, location_name: "AccessControlPolicy", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
-    PutObjectAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutObjectAclRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutObjectAclRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutObjectAclRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutObjectAclRequest.add_member(:grant_full_control, Shapes::ShapeRef.new(shape: GrantFullControl, location: "header", location_name: "x-amz-grant-full-control"))
@@ -2167,7 +2167,7 @@ module Aws::S3
     PutObjectLegalHoldOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     PutObjectLegalHoldOutput.struct_class = Types::PutObjectLegalHoldOutput
 
-    PutObjectLegalHoldRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutObjectLegalHoldRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutObjectLegalHoldRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     PutObjectLegalHoldRequest.add_member(:legal_hold, Shapes::ShapeRef.new(shape: ObjectLockLegalHold, location_name: "LegalHold", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutObjectLegalHoldRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
@@ -2182,7 +2182,7 @@ module Aws::S3
     PutObjectLockConfigurationOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     PutObjectLockConfigurationOutput.struct_class = Types::PutObjectLockConfigurationOutput
 
-    PutObjectLockConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutObjectLockConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutObjectLockConfigurationRequest.add_member(:object_lock_configuration, Shapes::ShapeRef.new(shape: ObjectLockConfiguration, location_name: "ObjectLockConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutObjectLockConfigurationRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     PutObjectLockConfigurationRequest.add_member(:token, Shapes::ShapeRef.new(shape: ObjectLockToken, location: "header", location_name: "x-amz-bucket-object-lock-token"))
@@ -2211,7 +2211,7 @@ module Aws::S3
 
     PutObjectRequest.add_member(:acl, Shapes::ShapeRef.new(shape: ObjectCannedACL, location: "header", location_name: "x-amz-acl"))
     PutObjectRequest.add_member(:body, Shapes::ShapeRef.new(shape: Body, location_name: "Body", metadata: {"streaming"=>true}))
-    PutObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutObjectRequest.add_member(:cache_control, Shapes::ShapeRef.new(shape: CacheControl, location: "header", location_name: "Cache-Control"))
     PutObjectRequest.add_member(:content_disposition, Shapes::ShapeRef.new(shape: ContentDisposition, location: "header", location_name: "Content-Disposition"))
     PutObjectRequest.add_member(:content_encoding, Shapes::ShapeRef.new(shape: ContentEncoding, location: "header", location_name: "Content-Encoding"))
@@ -2253,7 +2253,7 @@ module Aws::S3
     PutObjectRetentionOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     PutObjectRetentionOutput.struct_class = Types::PutObjectRetentionOutput
 
-    PutObjectRetentionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutObjectRetentionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutObjectRetentionRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     PutObjectRetentionRequest.add_member(:retention, Shapes::ShapeRef.new(shape: ObjectLockRetention, location_name: "Retention", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
     PutObjectRetentionRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
@@ -2269,7 +2269,7 @@ module Aws::S3
     PutObjectTaggingOutput.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "header", location_name: "x-amz-version-id"))
     PutObjectTaggingOutput.struct_class = Types::PutObjectTaggingOutput
 
-    PutObjectTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutObjectTaggingRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutObjectTaggingRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     PutObjectTaggingRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     PutObjectTaggingRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
@@ -2281,7 +2281,7 @@ module Aws::S3
     PutObjectTaggingRequest[:payload] = :tagging
     PutObjectTaggingRequest[:payload_member] = PutObjectTaggingRequest.member(:tagging)
 
-    PutPublicAccessBlockRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    PutPublicAccessBlockRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     PutPublicAccessBlockRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     PutPublicAccessBlockRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
     PutPublicAccessBlockRequest.add_member(:public_access_block_configuration, Shapes::ShapeRef.new(shape: PublicAccessBlockConfiguration, required: true, location_name: "PublicAccessBlockConfiguration", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2364,7 +2364,7 @@ module Aws::S3
     RestoreObjectOutput.add_member(:restore_output_path, Shapes::ShapeRef.new(shape: RestoreOutputPath, location: "header", location_name: "x-amz-restore-output-path"))
     RestoreObjectOutput.struct_class = Types::RestoreObjectOutput
 
-    RestoreObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    RestoreObjectRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     RestoreObjectRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     RestoreObjectRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
     RestoreObjectRequest.add_member(:restore_request, Shapes::ShapeRef.new(shape: RestoreRequest, location_name: "RestoreRequest", metadata: {"xmlNamespace"=>{"uri"=>"http://s3.amazonaws.com/doc/2006-03-01/"}}))
@@ -2436,7 +2436,7 @@ module Aws::S3
     SelectObjectContentOutput[:payload] = :payload
     SelectObjectContentOutput[:payload_member] = SelectObjectContentOutput.member(:payload)
 
-    SelectObjectContentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    SelectObjectContentRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     SelectObjectContentRequest.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, required: true, location: "uri", location_name: "Key"))
     SelectObjectContentRequest.add_member(:sse_customer_algorithm, Shapes::ShapeRef.new(shape: SSECustomerAlgorithm, location: "header", location_name: "x-amz-server-side-encryption-customer-algorithm"))
     SelectObjectContentRequest.add_member(:sse_customer_key, Shapes::ShapeRef.new(shape: SSECustomerKey, location: "header", location_name: "x-amz-server-side-encryption-customer-key"))
@@ -2545,7 +2545,7 @@ module Aws::S3
     UploadPartCopyOutput[:payload] = :copy_part_result
     UploadPartCopyOutput[:payload_member] = UploadPartCopyOutput.member(:copy_part_result)
 
-    UploadPartCopyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    UploadPartCopyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     UploadPartCopyRequest.add_member(:copy_source, Shapes::ShapeRef.new(shape: CopySource, required: true, location: "header", location_name: "x-amz-copy-source"))
     UploadPartCopyRequest.add_member(:copy_source_if_match, Shapes::ShapeRef.new(shape: CopySourceIfMatch, location: "header", location_name: "x-amz-copy-source-if-match"))
     UploadPartCopyRequest.add_member(:copy_source_if_modified_since, Shapes::ShapeRef.new(shape: CopySourceIfModifiedSince, location: "header", location_name: "x-amz-copy-source-if-modified-since"))
@@ -2580,7 +2580,7 @@ module Aws::S3
     UploadPartOutput.struct_class = Types::UploadPartOutput
 
     UploadPartRequest.add_member(:body, Shapes::ShapeRef.new(shape: Body, location_name: "Body", metadata: {"streaming"=>true}))
-    UploadPartRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    UploadPartRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket", metadata: {"contextParam"=>{"name"=>"Bucket"}}))
     UploadPartRequest.add_member(:content_length, Shapes::ShapeRef.new(shape: ContentLength, location: "header", location_name: "Content-Length"))
     UploadPartRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
     UploadPartRequest.add_member(:checksum_algorithm, Shapes::ShapeRef.new(shape: ChecksumAlgorithm, location: "header", location_name: "x-amz-sdk-checksum-algorithm"))
@@ -2677,7 +2677,7 @@ module Aws::S3
       api.add_operation(:abort_multipart_upload, Seahorse::Model::Operation.new.tap do |o|
         o.name = "AbortMultipartUpload"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.input = Shapes::ShapeRef.new(shape: AbortMultipartUploadRequest)
         o.output = Shapes::ShapeRef.new(shape: AbortMultipartUploadOutput)
         o.errors << Shapes::ShapeRef.new(shape: NoSuchUpload)
@@ -2686,7 +2686,7 @@ module Aws::S3
       api.add_operation(:complete_multipart_upload, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CompleteMultipartUpload"
         o.http_method = "POST"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.input = Shapes::ShapeRef.new(shape: CompleteMultipartUploadRequest)
         o.output = Shapes::ShapeRef.new(shape: CompleteMultipartUploadOutput)
       end)
@@ -2694,7 +2694,7 @@ module Aws::S3
       api.add_operation(:copy_object, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CopyObject"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.input = Shapes::ShapeRef.new(shape: CopyObjectRequest)
         o.output = Shapes::ShapeRef.new(shape: CopyObjectOutput)
         o.errors << Shapes::ShapeRef.new(shape: ObjectNotInActiveTierError)
@@ -2703,7 +2703,7 @@ module Aws::S3
       api.add_operation(:create_bucket, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateBucket"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}"
+        o.http_request_uri = "/"
         o.input = Shapes::ShapeRef.new(shape: CreateBucketRequest)
         o.output = Shapes::ShapeRef.new(shape: CreateBucketOutput)
         o.errors << Shapes::ShapeRef.new(shape: BucketAlreadyExists)
@@ -2713,7 +2713,7 @@ module Aws::S3
       api.add_operation(:create_multipart_upload, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateMultipartUpload"
         o.http_method = "POST"
-        o.http_request_uri = "/{Bucket}/{Key+}?uploads"
+        o.http_request_uri = "/{Key+}?uploads"
         o.input = Shapes::ShapeRef.new(shape: CreateMultipartUploadRequest)
         o.output = Shapes::ShapeRef.new(shape: CreateMultipartUploadOutput)
       end)
@@ -2721,7 +2721,7 @@ module Aws::S3
       api.add_operation(:delete_bucket, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucket"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}"
+        o.http_request_uri = "/"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2729,7 +2729,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_analytics_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketAnalyticsConfiguration"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?analytics"
+        o.http_request_uri = "/?analytics"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketAnalyticsConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2737,7 +2737,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_cors, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketCors"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?cors"
+        o.http_request_uri = "/?cors"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketCorsRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2745,7 +2745,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_encryption, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketEncryption"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?encryption"
+        o.http_request_uri = "/?encryption"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketEncryptionRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2753,7 +2753,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_intelligent_tiering_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketIntelligentTieringConfiguration"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?intelligent-tiering"
+        o.http_request_uri = "/?intelligent-tiering"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketIntelligentTieringConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2761,7 +2761,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_inventory_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketInventoryConfiguration"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?inventory"
+        o.http_request_uri = "/?inventory"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketInventoryConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2769,7 +2769,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_lifecycle, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketLifecycle"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?lifecycle"
+        o.http_request_uri = "/?lifecycle"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketLifecycleRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2777,7 +2777,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_metrics_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketMetricsConfiguration"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?metrics"
+        o.http_request_uri = "/?metrics"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketMetricsConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2785,7 +2785,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_ownership_controls, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketOwnershipControls"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?ownershipControls"
+        o.http_request_uri = "/?ownershipControls"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketOwnershipControlsRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2793,7 +2793,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_policy, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketPolicy"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?policy"
+        o.http_request_uri = "/?policy"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketPolicyRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2801,7 +2801,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_replication, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketReplication"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?replication"
+        o.http_request_uri = "/?replication"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketReplicationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2809,7 +2809,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketTagging"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?tagging"
+        o.http_request_uri = "/?tagging"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketTaggingRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2817,7 +2817,7 @@ module Aws::S3
       api.add_operation(:delete_bucket_website, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketWebsite"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?website"
+        o.http_request_uri = "/?website"
         o.input = Shapes::ShapeRef.new(shape: DeleteBucketWebsiteRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2825,7 +2825,7 @@ module Aws::S3
       api.add_operation(:delete_object, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteObject"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.input = Shapes::ShapeRef.new(shape: DeleteObjectRequest)
         o.output = Shapes::ShapeRef.new(shape: DeleteObjectOutput)
       end)
@@ -2833,7 +2833,7 @@ module Aws::S3
       api.add_operation(:delete_object_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteObjectTagging"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}/{Key+}?tagging"
+        o.http_request_uri = "/{Key+}?tagging"
         o.input = Shapes::ShapeRef.new(shape: DeleteObjectTaggingRequest)
         o.output = Shapes::ShapeRef.new(shape: DeleteObjectTaggingOutput)
       end)
@@ -2841,7 +2841,7 @@ module Aws::S3
       api.add_operation(:delete_objects, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteObjects"
         o.http_method = "POST"
-        o.http_request_uri = "/{Bucket}?delete"
+        o.http_request_uri = "/?delete"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -2857,7 +2857,7 @@ module Aws::S3
       api.add_operation(:delete_public_access_block, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeletePublicAccessBlock"
         o.http_method = "DELETE"
-        o.http_request_uri = "/{Bucket}?publicAccessBlock"
+        o.http_request_uri = "/?publicAccessBlock"
         o.input = Shapes::ShapeRef.new(shape: DeletePublicAccessBlockRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -2865,7 +2865,7 @@ module Aws::S3
       api.add_operation(:get_bucket_accelerate_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketAccelerateConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?accelerate"
+        o.http_request_uri = "/?accelerate"
         o.input = Shapes::ShapeRef.new(shape: GetBucketAccelerateConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketAccelerateConfigurationOutput)
       end)
@@ -2873,7 +2873,7 @@ module Aws::S3
       api.add_operation(:get_bucket_acl, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketAcl"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?acl"
+        o.http_request_uri = "/?acl"
         o.input = Shapes::ShapeRef.new(shape: GetBucketAclRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketAclOutput)
       end)
@@ -2881,7 +2881,7 @@ module Aws::S3
       api.add_operation(:get_bucket_analytics_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketAnalyticsConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?analytics"
+        o.http_request_uri = "/?analytics"
         o.input = Shapes::ShapeRef.new(shape: GetBucketAnalyticsConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketAnalyticsConfigurationOutput)
       end)
@@ -2889,7 +2889,7 @@ module Aws::S3
       api.add_operation(:get_bucket_cors, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketCors"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?cors"
+        o.http_request_uri = "/?cors"
         o.input = Shapes::ShapeRef.new(shape: GetBucketCorsRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketCorsOutput)
       end)
@@ -2897,7 +2897,7 @@ module Aws::S3
       api.add_operation(:get_bucket_encryption, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketEncryption"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?encryption"
+        o.http_request_uri = "/?encryption"
         o.input = Shapes::ShapeRef.new(shape: GetBucketEncryptionRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketEncryptionOutput)
       end)
@@ -2905,7 +2905,7 @@ module Aws::S3
       api.add_operation(:get_bucket_intelligent_tiering_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketIntelligentTieringConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?intelligent-tiering"
+        o.http_request_uri = "/?intelligent-tiering"
         o.input = Shapes::ShapeRef.new(shape: GetBucketIntelligentTieringConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketIntelligentTieringConfigurationOutput)
       end)
@@ -2913,7 +2913,7 @@ module Aws::S3
       api.add_operation(:get_bucket_inventory_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketInventoryConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?inventory"
+        o.http_request_uri = "/?inventory"
         o.input = Shapes::ShapeRef.new(shape: GetBucketInventoryConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketInventoryConfigurationOutput)
       end)
@@ -2921,7 +2921,7 @@ module Aws::S3
       api.add_operation(:get_bucket_lifecycle, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketLifecycle"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?lifecycle"
+        o.http_request_uri = "/?lifecycle"
         o.deprecated = true
         o.input = Shapes::ShapeRef.new(shape: GetBucketLifecycleRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketLifecycleOutput)
@@ -2930,7 +2930,7 @@ module Aws::S3
       api.add_operation(:get_bucket_lifecycle_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketLifecycleConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?lifecycle"
+        o.http_request_uri = "/?lifecycle"
         o.input = Shapes::ShapeRef.new(shape: GetBucketLifecycleConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketLifecycleConfigurationOutput)
       end)
@@ -2938,7 +2938,7 @@ module Aws::S3
       api.add_operation(:get_bucket_location, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketLocation"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?location"
+        o.http_request_uri = "/?location"
         o.input = Shapes::ShapeRef.new(shape: GetBucketLocationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketLocationOutput)
       end)
@@ -2946,7 +2946,7 @@ module Aws::S3
       api.add_operation(:get_bucket_logging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketLogging"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?logging"
+        o.http_request_uri = "/?logging"
         o.input = Shapes::ShapeRef.new(shape: GetBucketLoggingRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketLoggingOutput)
       end)
@@ -2954,7 +2954,7 @@ module Aws::S3
       api.add_operation(:get_bucket_metrics_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketMetricsConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?metrics"
+        o.http_request_uri = "/?metrics"
         o.input = Shapes::ShapeRef.new(shape: GetBucketMetricsConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketMetricsConfigurationOutput)
       end)
@@ -2962,7 +2962,7 @@ module Aws::S3
       api.add_operation(:get_bucket_notification, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketNotification"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?notification"
+        o.http_request_uri = "/?notification"
         o.deprecated = true
         o.input = Shapes::ShapeRef.new(shape: GetBucketNotificationConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: NotificationConfigurationDeprecated)
@@ -2971,7 +2971,7 @@ module Aws::S3
       api.add_operation(:get_bucket_notification_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketNotificationConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?notification"
+        o.http_request_uri = "/?notification"
         o.input = Shapes::ShapeRef.new(shape: GetBucketNotificationConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: NotificationConfiguration)
       end)
@@ -2979,7 +2979,7 @@ module Aws::S3
       api.add_operation(:get_bucket_ownership_controls, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketOwnershipControls"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?ownershipControls"
+        o.http_request_uri = "/?ownershipControls"
         o.input = Shapes::ShapeRef.new(shape: GetBucketOwnershipControlsRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketOwnershipControlsOutput)
       end)
@@ -2987,7 +2987,7 @@ module Aws::S3
       api.add_operation(:get_bucket_policy, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketPolicy"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?policy"
+        o.http_request_uri = "/?policy"
         o.input = Shapes::ShapeRef.new(shape: GetBucketPolicyRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketPolicyOutput)
       end)
@@ -2995,7 +2995,7 @@ module Aws::S3
       api.add_operation(:get_bucket_policy_status, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketPolicyStatus"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?policyStatus"
+        o.http_request_uri = "/?policyStatus"
         o.input = Shapes::ShapeRef.new(shape: GetBucketPolicyStatusRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketPolicyStatusOutput)
       end)
@@ -3003,7 +3003,7 @@ module Aws::S3
       api.add_operation(:get_bucket_replication, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketReplication"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?replication"
+        o.http_request_uri = "/?replication"
         o.input = Shapes::ShapeRef.new(shape: GetBucketReplicationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketReplicationOutput)
       end)
@@ -3011,7 +3011,7 @@ module Aws::S3
       api.add_operation(:get_bucket_request_payment, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketRequestPayment"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?requestPayment"
+        o.http_request_uri = "/?requestPayment"
         o.input = Shapes::ShapeRef.new(shape: GetBucketRequestPaymentRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketRequestPaymentOutput)
       end)
@@ -3019,7 +3019,7 @@ module Aws::S3
       api.add_operation(:get_bucket_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketTagging"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?tagging"
+        o.http_request_uri = "/?tagging"
         o.input = Shapes::ShapeRef.new(shape: GetBucketTaggingRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketTaggingOutput)
       end)
@@ -3027,7 +3027,7 @@ module Aws::S3
       api.add_operation(:get_bucket_versioning, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketVersioning"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?versioning"
+        o.http_request_uri = "/?versioning"
         o.input = Shapes::ShapeRef.new(shape: GetBucketVersioningRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketVersioningOutput)
       end)
@@ -3035,7 +3035,7 @@ module Aws::S3
       api.add_operation(:get_bucket_website, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketWebsite"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?website"
+        o.http_request_uri = "/?website"
         o.input = Shapes::ShapeRef.new(shape: GetBucketWebsiteRequest)
         o.output = Shapes::ShapeRef.new(shape: GetBucketWebsiteOutput)
       end)
@@ -3043,7 +3043,7 @@ module Aws::S3
       api.add_operation(:get_object, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObject"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.http_checksum = {
           "requestValidationModeMember" => "checksum_mode",
           "responseAlgorithms" => ["CRC32", "CRC32C", "SHA256", "SHA1"],
@@ -3061,7 +3061,7 @@ module Aws::S3
       api.add_operation(:get_object_acl, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectAcl"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}?acl"
+        o.http_request_uri = "/{Key+}?acl"
         o.input = Shapes::ShapeRef.new(shape: GetObjectAclRequest)
         o.output = Shapes::ShapeRef.new(shape: GetObjectAclOutput)
         o.errors << Shapes::ShapeRef.new(shape: NoSuchKey)
@@ -3070,7 +3070,7 @@ module Aws::S3
       api.add_operation(:get_object_attributes, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectAttributes"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}?attributes"
+        o.http_request_uri = "/{Key+}?attributes"
         o.input = Shapes::ShapeRef.new(shape: GetObjectAttributesRequest)
         o.output = Shapes::ShapeRef.new(shape: GetObjectAttributesOutput)
         o.errors << Shapes::ShapeRef.new(shape: NoSuchKey)
@@ -3079,7 +3079,7 @@ module Aws::S3
       api.add_operation(:get_object_legal_hold, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectLegalHold"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}?legal-hold"
+        o.http_request_uri = "/{Key+}?legal-hold"
         o.input = Shapes::ShapeRef.new(shape: GetObjectLegalHoldRequest)
         o.output = Shapes::ShapeRef.new(shape: GetObjectLegalHoldOutput)
       end)
@@ -3087,7 +3087,7 @@ module Aws::S3
       api.add_operation(:get_object_lock_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectLockConfiguration"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?object-lock"
+        o.http_request_uri = "/?object-lock"
         o.input = Shapes::ShapeRef.new(shape: GetObjectLockConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: GetObjectLockConfigurationOutput)
       end)
@@ -3095,7 +3095,7 @@ module Aws::S3
       api.add_operation(:get_object_retention, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectRetention"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}?retention"
+        o.http_request_uri = "/{Key+}?retention"
         o.input = Shapes::ShapeRef.new(shape: GetObjectRetentionRequest)
         o.output = Shapes::ShapeRef.new(shape: GetObjectRetentionOutput)
       end)
@@ -3103,7 +3103,7 @@ module Aws::S3
       api.add_operation(:get_object_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectTagging"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}?tagging"
+        o.http_request_uri = "/{Key+}?tagging"
         o.input = Shapes::ShapeRef.new(shape: GetObjectTaggingRequest)
         o.output = Shapes::ShapeRef.new(shape: GetObjectTaggingOutput)
       end)
@@ -3111,7 +3111,7 @@ module Aws::S3
       api.add_operation(:get_object_torrent, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectTorrent"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}?torrent"
+        o.http_request_uri = "/{Key+}?torrent"
         o.input = Shapes::ShapeRef.new(shape: GetObjectTorrentRequest)
         o.output = Shapes::ShapeRef.new(shape: GetObjectTorrentOutput)
       end)
@@ -3119,7 +3119,7 @@ module Aws::S3
       api.add_operation(:get_public_access_block, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetPublicAccessBlock"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?publicAccessBlock"
+        o.http_request_uri = "/?publicAccessBlock"
         o.input = Shapes::ShapeRef.new(shape: GetPublicAccessBlockRequest)
         o.output = Shapes::ShapeRef.new(shape: GetPublicAccessBlockOutput)
       end)
@@ -3127,7 +3127,7 @@ module Aws::S3
       api.add_operation(:head_bucket, Seahorse::Model::Operation.new.tap do |o|
         o.name = "HeadBucket"
         o.http_method = "HEAD"
-        o.http_request_uri = "/{Bucket}"
+        o.http_request_uri = "/"
         o.input = Shapes::ShapeRef.new(shape: HeadBucketRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
         o.errors << Shapes::ShapeRef.new(shape: NoSuchBucket)
@@ -3136,7 +3136,7 @@ module Aws::S3
       api.add_operation(:head_object, Seahorse::Model::Operation.new.tap do |o|
         o.name = "HeadObject"
         o.http_method = "HEAD"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.input = Shapes::ShapeRef.new(shape: HeadObjectRequest)
         o.output = Shapes::ShapeRef.new(shape: HeadObjectOutput)
         o.errors << Shapes::ShapeRef.new(shape: NoSuchKey)
@@ -3145,7 +3145,7 @@ module Aws::S3
       api.add_operation(:list_bucket_analytics_configurations, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListBucketAnalyticsConfigurations"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?analytics"
+        o.http_request_uri = "/?analytics"
         o.input = Shapes::ShapeRef.new(shape: ListBucketAnalyticsConfigurationsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListBucketAnalyticsConfigurationsOutput)
       end)
@@ -3153,7 +3153,7 @@ module Aws::S3
       api.add_operation(:list_bucket_intelligent_tiering_configurations, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListBucketIntelligentTieringConfigurations"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?intelligent-tiering"
+        o.http_request_uri = "/?intelligent-tiering"
         o.input = Shapes::ShapeRef.new(shape: ListBucketIntelligentTieringConfigurationsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListBucketIntelligentTieringConfigurationsOutput)
       end)
@@ -3161,7 +3161,7 @@ module Aws::S3
       api.add_operation(:list_bucket_inventory_configurations, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListBucketInventoryConfigurations"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?inventory"
+        o.http_request_uri = "/?inventory"
         o.input = Shapes::ShapeRef.new(shape: ListBucketInventoryConfigurationsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListBucketInventoryConfigurationsOutput)
       end)
@@ -3169,7 +3169,7 @@ module Aws::S3
       api.add_operation(:list_bucket_metrics_configurations, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListBucketMetricsConfigurations"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?metrics"
+        o.http_request_uri = "/?metrics"
         o.input = Shapes::ShapeRef.new(shape: ListBucketMetricsConfigurationsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListBucketMetricsConfigurationsOutput)
       end)
@@ -3185,7 +3185,7 @@ module Aws::S3
       api.add_operation(:list_multipart_uploads, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListMultipartUploads"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?uploads"
+        o.http_request_uri = "/?uploads"
         o.input = Shapes::ShapeRef.new(shape: ListMultipartUploadsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListMultipartUploadsOutput)
         o[:pager] = Aws::Pager.new(
@@ -3201,7 +3201,7 @@ module Aws::S3
       api.add_operation(:list_object_versions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListObjectVersions"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?versions"
+        o.http_request_uri = "/?versions"
         o.input = Shapes::ShapeRef.new(shape: ListObjectVersionsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListObjectVersionsOutput)
         o[:pager] = Aws::Pager.new(
@@ -3217,7 +3217,7 @@ module Aws::S3
       api.add_operation(:list_objects, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListObjects"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}"
+        o.http_request_uri = "/"
         o.input = Shapes::ShapeRef.new(shape: ListObjectsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListObjectsOutput)
         o.errors << Shapes::ShapeRef.new(shape: NoSuchBucket)
@@ -3233,7 +3233,7 @@ module Aws::S3
       api.add_operation(:list_objects_v2, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListObjectsV2"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}?list-type=2"
+        o.http_request_uri = "/?list-type=2"
         o.input = Shapes::ShapeRef.new(shape: ListObjectsV2Request)
         o.output = Shapes::ShapeRef.new(shape: ListObjectsV2Output)
         o.errors << Shapes::ShapeRef.new(shape: NoSuchBucket)
@@ -3248,7 +3248,7 @@ module Aws::S3
       api.add_operation(:list_parts, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ListParts"
         o.http_method = "GET"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.input = Shapes::ShapeRef.new(shape: ListPartsRequest)
         o.output = Shapes::ShapeRef.new(shape: ListPartsOutput)
         o[:pager] = Aws::Pager.new(
@@ -3263,7 +3263,7 @@ module Aws::S3
       api.add_operation(:put_bucket_accelerate_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketAccelerateConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?accelerate"
+        o.http_request_uri = "/?accelerate"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => false,
@@ -3279,7 +3279,7 @@ module Aws::S3
       api.add_operation(:put_bucket_acl, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketAcl"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?acl"
+        o.http_request_uri = "/?acl"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3295,7 +3295,7 @@ module Aws::S3
       api.add_operation(:put_bucket_analytics_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketAnalyticsConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?analytics"
+        o.http_request_uri = "/?analytics"
         o.input = Shapes::ShapeRef.new(shape: PutBucketAnalyticsConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -3303,7 +3303,7 @@ module Aws::S3
       api.add_operation(:put_bucket_cors, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketCors"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?cors"
+        o.http_request_uri = "/?cors"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3319,7 +3319,7 @@ module Aws::S3
       api.add_operation(:put_bucket_encryption, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketEncryption"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?encryption"
+        o.http_request_uri = "/?encryption"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3335,7 +3335,7 @@ module Aws::S3
       api.add_operation(:put_bucket_intelligent_tiering_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketIntelligentTieringConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?intelligent-tiering"
+        o.http_request_uri = "/?intelligent-tiering"
         o.input = Shapes::ShapeRef.new(shape: PutBucketIntelligentTieringConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -3343,7 +3343,7 @@ module Aws::S3
       api.add_operation(:put_bucket_inventory_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketInventoryConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?inventory"
+        o.http_request_uri = "/?inventory"
         o.input = Shapes::ShapeRef.new(shape: PutBucketInventoryConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -3351,7 +3351,7 @@ module Aws::S3
       api.add_operation(:put_bucket_lifecycle, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketLifecycle"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?lifecycle"
+        o.http_request_uri = "/?lifecycle"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3368,7 +3368,7 @@ module Aws::S3
       api.add_operation(:put_bucket_lifecycle_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketLifecycleConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?lifecycle"
+        o.http_request_uri = "/?lifecycle"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3384,7 +3384,7 @@ module Aws::S3
       api.add_operation(:put_bucket_logging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketLogging"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?logging"
+        o.http_request_uri = "/?logging"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3400,7 +3400,7 @@ module Aws::S3
       api.add_operation(:put_bucket_metrics_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketMetricsConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?metrics"
+        o.http_request_uri = "/?metrics"
         o.input = Shapes::ShapeRef.new(shape: PutBucketMetricsConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -3408,7 +3408,7 @@ module Aws::S3
       api.add_operation(:put_bucket_notification, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketNotification"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?notification"
+        o.http_request_uri = "/?notification"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3425,7 +3425,7 @@ module Aws::S3
       api.add_operation(:put_bucket_notification_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketNotificationConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?notification"
+        o.http_request_uri = "/?notification"
         o.input = Shapes::ShapeRef.new(shape: PutBucketNotificationConfigurationRequest)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
@@ -3433,7 +3433,7 @@ module Aws::S3
       api.add_operation(:put_bucket_ownership_controls, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketOwnershipControls"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?ownershipControls"
+        o.http_request_uri = "/?ownershipControls"
         o.http_checksum = {
           "requestChecksumRequired" => true,
         }
@@ -3444,7 +3444,7 @@ module Aws::S3
       api.add_operation(:put_bucket_policy, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketPolicy"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?policy"
+        o.http_request_uri = "/?policy"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3460,7 +3460,7 @@ module Aws::S3
       api.add_operation(:put_bucket_replication, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketReplication"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?replication"
+        o.http_request_uri = "/?replication"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3476,7 +3476,7 @@ module Aws::S3
       api.add_operation(:put_bucket_request_payment, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketRequestPayment"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?requestPayment"
+        o.http_request_uri = "/?requestPayment"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3492,7 +3492,7 @@ module Aws::S3
       api.add_operation(:put_bucket_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketTagging"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?tagging"
+        o.http_request_uri = "/?tagging"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3508,7 +3508,7 @@ module Aws::S3
       api.add_operation(:put_bucket_versioning, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketVersioning"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?versioning"
+        o.http_request_uri = "/?versioning"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3524,7 +3524,7 @@ module Aws::S3
       api.add_operation(:put_bucket_website, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketWebsite"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?website"
+        o.http_request_uri = "/?website"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3540,7 +3540,7 @@ module Aws::S3
       api.add_operation(:put_object, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutObject"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => false,
@@ -3556,7 +3556,7 @@ module Aws::S3
       api.add_operation(:put_object_acl, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutObjectAcl"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}?acl"
+        o.http_request_uri = "/{Key+}?acl"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3573,7 +3573,7 @@ module Aws::S3
       api.add_operation(:put_object_legal_hold, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutObjectLegalHold"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}?legal-hold"
+        o.http_request_uri = "/{Key+}?legal-hold"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3589,7 +3589,7 @@ module Aws::S3
       api.add_operation(:put_object_lock_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutObjectLockConfiguration"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?object-lock"
+        o.http_request_uri = "/?object-lock"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3605,7 +3605,7 @@ module Aws::S3
       api.add_operation(:put_object_retention, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutObjectRetention"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}?retention"
+        o.http_request_uri = "/{Key+}?retention"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3621,7 +3621,7 @@ module Aws::S3
       api.add_operation(:put_object_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutObjectTagging"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}?tagging"
+        o.http_request_uri = "/{Key+}?tagging"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3637,7 +3637,7 @@ module Aws::S3
       api.add_operation(:put_public_access_block, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutPublicAccessBlock"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}?publicAccessBlock"
+        o.http_request_uri = "/?publicAccessBlock"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => true,
@@ -3653,7 +3653,7 @@ module Aws::S3
       api.add_operation(:restore_object, Seahorse::Model::Operation.new.tap do |o|
         o.name = "RestoreObject"
         o.http_method = "POST"
-        o.http_request_uri = "/{Bucket}/{Key+}?restore"
+        o.http_request_uri = "/{Key+}?restore"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => false,
@@ -3670,7 +3670,7 @@ module Aws::S3
       api.add_operation(:select_object_content, Seahorse::Model::Operation.new.tap do |o|
         o.name = "SelectObjectContent"
         o.http_method = "POST"
-        o.http_request_uri = "/{Bucket}/{Key+}?select&select-type=2"
+        o.http_request_uri = "/{Key+}?select&select-type=2"
         o.input = Shapes::ShapeRef.new(shape: SelectObjectContentRequest,
           location_name: "SelectObjectContentRequest",
           metadata: {
@@ -3683,7 +3683,7 @@ module Aws::S3
       api.add_operation(:upload_part, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UploadPart"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.http_checksum = {
           "requestAlgorithmMember" => "checksum_algorithm",
           "requestChecksumRequired" => false,
@@ -3699,7 +3699,7 @@ module Aws::S3
       api.add_operation(:upload_part_copy, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UploadPartCopy"
         o.http_method = "PUT"
-        o.http_request_uri = "/{Bucket}/{Key+}"
+        o.http_request_uri = "/{Key+}"
         o.input = Shapes::ShapeRef.new(shape: UploadPartCopyRequest)
         o.output = Shapes::ShapeRef.new(shape: UploadPartCopyOutput)
       end)