aws-sdk-s3 1.24.1 → 1.36.1

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

@@ -49,6 +49,7 @@ module Aws::S3
     BucketName = Shapes::StringShape.new(name: 'BucketName')
     BucketVersioningStatus = Shapes::StringShape.new(name: 'BucketVersioningStatus')
     Buckets = Shapes::ListShape.new(name: 'Buckets')
+    BypassGovernanceRetention = Shapes::BooleanShape.new(name: 'BypassGovernanceRetention')
     BytesProcessed = Shapes::IntegerShape.new(name: 'BytesProcessed')
     BytesReturned = Shapes::IntegerShape.new(name: 'BytesReturned')
     BytesScanned = Shapes::IntegerShape.new(name: 'BytesScanned')
@@ -104,6 +105,7 @@ module Aws::S3
     Date = Shapes::TimestampShape.new(name: 'Date', timestampFormat: "iso8601")
     Days = Shapes::IntegerShape.new(name: 'Days')
     DaysAfterInitiation = Shapes::IntegerShape.new(name: 'DaysAfterInitiation')
+    DefaultRetention = Shapes::StructureShape.new(name: 'DefaultRetention')
     Delete = Shapes::StructureShape.new(name: 'Delete')
     DeleteBucketAnalyticsConfigurationRequest = Shapes::StructureShape.new(name: 'DeleteBucketAnalyticsConfigurationRequest')
     DeleteBucketCorsRequest = Shapes::StructureShape.new(name: 'DeleteBucketCorsRequest')
@@ -202,8 +204,14 @@ module Aws::S3
     GetBucketWebsiteRequest = Shapes::StructureShape.new(name: 'GetBucketWebsiteRequest')
     GetObjectAclOutput = Shapes::StructureShape.new(name: 'GetObjectAclOutput')
     GetObjectAclRequest = Shapes::StructureShape.new(name: 'GetObjectAclRequest')
+    GetObjectLegalHoldOutput = Shapes::StructureShape.new(name: 'GetObjectLegalHoldOutput')
+    GetObjectLegalHoldRequest = Shapes::StructureShape.new(name: 'GetObjectLegalHoldRequest')
+    GetObjectLockConfigurationOutput = Shapes::StructureShape.new(name: 'GetObjectLockConfigurationOutput')
+    GetObjectLockConfigurationRequest = Shapes::StructureShape.new(name: 'GetObjectLockConfigurationRequest')
     GetObjectOutput = Shapes::StructureShape.new(name: 'GetObjectOutput')
     GetObjectRequest = Shapes::StructureShape.new(name: 'GetObjectRequest')
+    GetObjectRetentionOutput = Shapes::StructureShape.new(name: 'GetObjectRetentionOutput')
+    GetObjectRetentionRequest = Shapes::StructureShape.new(name: 'GetObjectRetentionRequest')
     GetObjectTaggingOutput = Shapes::StructureShape.new(name: 'GetObjectTaggingOutput')
     GetObjectTaggingRequest = Shapes::StructureShape.new(name: 'GetObjectTaggingRequest')
     GetObjectTorrentOutput = Shapes::StructureShape.new(name: 'GetObjectTorrentOutput')
@@ -334,6 +342,17 @@ module Aws::S3
     ObjectIdentifierList = Shapes::ListShape.new(name: 'ObjectIdentifierList', flattened: true)
     ObjectKey = Shapes::StringShape.new(name: 'ObjectKey')
     ObjectList = Shapes::ListShape.new(name: 'ObjectList', flattened: true)
+    ObjectLockConfiguration = Shapes::StructureShape.new(name: 'ObjectLockConfiguration')
+    ObjectLockEnabled = Shapes::StringShape.new(name: 'ObjectLockEnabled')
+    ObjectLockEnabledForBucket = Shapes::BooleanShape.new(name: 'ObjectLockEnabledForBucket')
+    ObjectLockLegalHold = Shapes::StructureShape.new(name: 'ObjectLockLegalHold')
+    ObjectLockLegalHoldStatus = Shapes::StringShape.new(name: 'ObjectLockLegalHoldStatus')
+    ObjectLockMode = Shapes::StringShape.new(name: 'ObjectLockMode')
+    ObjectLockRetainUntilDate = Shapes::TimestampShape.new(name: 'ObjectLockRetainUntilDate', timestampFormat: "iso8601")
+    ObjectLockRetention = Shapes::StructureShape.new(name: 'ObjectLockRetention')
+    ObjectLockRetentionMode = Shapes::StringShape.new(name: 'ObjectLockRetentionMode')
+    ObjectLockRule = Shapes::StructureShape.new(name: 'ObjectLockRule')
+    ObjectLockToken = Shapes::StringShape.new(name: 'ObjectLockToken')
     ObjectNotInActiveTierError = Shapes::StructureShape.new(name: 'ObjectNotInActiveTierError')
     ObjectStorageClass = Shapes::StringShape.new(name: 'ObjectStorageClass')
     ObjectVersion = Shapes::StructureShape.new(name: 'ObjectVersion')
@@ -380,8 +399,14 @@ module Aws::S3
     PutBucketWebsiteRequest = Shapes::StructureShape.new(name: 'PutBucketWebsiteRequest')
     PutObjectAclOutput = Shapes::StructureShape.new(name: 'PutObjectAclOutput')
     PutObjectAclRequest = Shapes::StructureShape.new(name: 'PutObjectAclRequest')
+    PutObjectLegalHoldOutput = Shapes::StructureShape.new(name: 'PutObjectLegalHoldOutput')
+    PutObjectLegalHoldRequest = Shapes::StructureShape.new(name: 'PutObjectLegalHoldRequest')
+    PutObjectLockConfigurationOutput = Shapes::StructureShape.new(name: 'PutObjectLockConfigurationOutput')
+    PutObjectLockConfigurationRequest = Shapes::StructureShape.new(name: 'PutObjectLockConfigurationRequest')
     PutObjectOutput = Shapes::StructureShape.new(name: 'PutObjectOutput')
     PutObjectRequest = Shapes::StructureShape.new(name: 'PutObjectRequest')
+    PutObjectRetentionOutput = Shapes::StructureShape.new(name: 'PutObjectRetentionOutput')
+    PutObjectRetentionRequest = Shapes::StructureShape.new(name: 'PutObjectRetentionRequest')
     PutObjectTaggingOutput = Shapes::StructureShape.new(name: 'PutObjectTaggingOutput')
     PutObjectTaggingRequest = Shapes::StructureShape.new(name: 'PutObjectTaggingRequest')
     PutPublicAccessBlockRequest = Shapes::StructureShape.new(name: 'PutPublicAccessBlockRequest')
@@ -491,6 +516,7 @@ module Aws::S3
     VersioningConfiguration = Shapes::StructureShape.new(name: 'VersioningConfiguration')
     WebsiteConfiguration = Shapes::StructureShape.new(name: 'WebsiteConfiguration')
     WebsiteRedirectLocation = Shapes::StringShape.new(name: 'WebsiteRedirectLocation')
+    Years = Shapes::IntegerShape.new(name: 'Years')
 
     AbortIncompleteMultipartUpload.add_member(:days_after_initiation, Shapes::ShapeRef.new(shape: DaysAfterInitiation, location_name: "DaysAfterInitiation"))
     AbortIncompleteMultipartUpload.struct_class = Types::AbortIncompleteMultipartUpload
@@ -678,6 +704,9 @@ module Aws::S3
     CopyObjectRequest.add_member(:copy_source_sse_customer_key_md5, Shapes::ShapeRef.new(shape: CopySourceSSECustomerKeyMD5, location: "header", location_name: "x-amz-copy-source-server-side-encryption-customer-key-MD5"))
     CopyObjectRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     CopyObjectRequest.add_member(:tagging, Shapes::ShapeRef.new(shape: TaggingHeader, location: "header", location_name: "x-amz-tagging"))
+    CopyObjectRequest.add_member(:object_lock_mode, Shapes::ShapeRef.new(shape: ObjectLockMode, location: "header", location_name: "x-amz-object-lock-mode"))
+    CopyObjectRequest.add_member(:object_lock_retain_until_date, Shapes::ShapeRef.new(shape: ObjectLockRetainUntilDate, location: "header", location_name: "x-amz-object-lock-retain-until-date"))
+    CopyObjectRequest.add_member(:object_lock_legal_hold_status, Shapes::ShapeRef.new(shape: ObjectLockLegalHoldStatus, location: "header", location_name: "x-amz-object-lock-legal-hold"))
     CopyObjectRequest.struct_class = Types::CopyObjectRequest
 
     CopyObjectResult.add_member(:etag, Shapes::ShapeRef.new(shape: ETag, location_name: "ETag"))
@@ -702,6 +731,7 @@ module Aws::S3
     CreateBucketRequest.add_member(:grant_read_acp, Shapes::ShapeRef.new(shape: GrantReadACP, location: "header", location_name: "x-amz-grant-read-acp"))
     CreateBucketRequest.add_member(:grant_write, Shapes::ShapeRef.new(shape: GrantWrite, location: "header", location_name: "x-amz-grant-write"))
     CreateBucketRequest.add_member(:grant_write_acp, Shapes::ShapeRef.new(shape: GrantWriteACP, location: "header", location_name: "x-amz-grant-write-acp"))
+    CreateBucketRequest.add_member(:object_lock_enabled_for_bucket, Shapes::ShapeRef.new(shape: ObjectLockEnabledForBucket, location: "header", location_name: "x-amz-bucket-object-lock-enabled"))
     CreateBucketRequest.struct_class = Types::CreateBucketRequest
     CreateBucketRequest[:payload] = :create_bucket_configuration
     CreateBucketRequest[:payload_member] = CreateBucketRequest.member(:create_bucket_configuration)
@@ -741,8 +771,16 @@ module Aws::S3
     CreateMultipartUploadRequest.add_member(:ssekms_key_id, Shapes::ShapeRef.new(shape: SSEKMSKeyId, location: "header", location_name: "x-amz-server-side-encryption-aws-kms-key-id"))
     CreateMultipartUploadRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     CreateMultipartUploadRequest.add_member(:tagging, Shapes::ShapeRef.new(shape: TaggingHeader, location: "header", location_name: "x-amz-tagging"))
+    CreateMultipartUploadRequest.add_member(:object_lock_mode, Shapes::ShapeRef.new(shape: ObjectLockMode, location: "header", location_name: "x-amz-object-lock-mode"))
+    CreateMultipartUploadRequest.add_member(:object_lock_retain_until_date, Shapes::ShapeRef.new(shape: ObjectLockRetainUntilDate, location: "header", location_name: "x-amz-object-lock-retain-until-date"))
+    CreateMultipartUploadRequest.add_member(:object_lock_legal_hold_status, Shapes::ShapeRef.new(shape: ObjectLockLegalHoldStatus, location: "header", location_name: "x-amz-object-lock-legal-hold"))
     CreateMultipartUploadRequest.struct_class = Types::CreateMultipartUploadRequest
 
+    DefaultRetention.add_member(:mode, Shapes::ShapeRef.new(shape: ObjectLockRetentionMode, location_name: "Mode"))
+    DefaultRetention.add_member(:days, Shapes::ShapeRef.new(shape: Days, location_name: "Days"))
+    DefaultRetention.add_member(:years, Shapes::ShapeRef.new(shape: Years, location_name: "Years"))
+    DefaultRetention.struct_class = Types::DefaultRetention
+
     Delete.add_member(:objects, Shapes::ShapeRef.new(shape: ObjectIdentifierList, required: true, location_name: "Object"))
     Delete.add_member(:quiet, Shapes::ShapeRef.new(shape: Quiet, location_name: "Quiet"))
     Delete.struct_class = Types::Delete
@@ -805,6 +843,7 @@ module Aws::S3
     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"))
     DeleteObjectRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
+    DeleteObjectRequest.add_member(:bypass_governance_retention, Shapes::ShapeRef.new(shape: BypassGovernanceRetention, location: "header", location_name: "x-amz-bypass-governance-retention"))
     DeleteObjectRequest.struct_class = Types::DeleteObjectRequest
 
     DeleteObjectTaggingOutput.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "header", location_name: "x-amz-version-id"))
@@ -824,6 +863,7 @@ module Aws::S3
     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"))
+    DeleteObjectsRequest.add_member(:bypass_governance_retention, Shapes::ShapeRef.new(shape: BypassGovernanceRetention, location: "header", location_name: "x-amz-bypass-governance-retention"))
     DeleteObjectsRequest.struct_class = Types::DeleteObjectsRequest
     DeleteObjectsRequest[:payload] = :delete
     DeleteObjectsRequest[:payload_member] = DeleteObjectsRequest.member(:delete)
@@ -1021,6 +1061,25 @@ module Aws::S3
     GetObjectAclRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     GetObjectAclRequest.struct_class = Types::GetObjectAclRequest
 
+    GetObjectLegalHoldOutput.add_member(:legal_hold, Shapes::ShapeRef.new(shape: ObjectLockLegalHold, location_name: "LegalHold"))
+    GetObjectLegalHoldOutput.struct_class = Types::GetObjectLegalHoldOutput
+    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(: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"))
+    GetObjectLegalHoldRequest.struct_class = Types::GetObjectLegalHoldRequest
+
+    GetObjectLockConfigurationOutput.add_member(:object_lock_configuration, Shapes::ShapeRef.new(shape: ObjectLockConfiguration, location_name: "ObjectLockConfiguration"))
+    GetObjectLockConfigurationOutput.struct_class = Types::GetObjectLockConfigurationOutput
+    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.struct_class = Types::GetObjectLockConfigurationRequest
+
     GetObjectOutput.add_member(:body, Shapes::ShapeRef.new(shape: Body, location_name: "Body", metadata: {"streaming"=>true}))
     GetObjectOutput.add_member(:delete_marker, Shapes::ShapeRef.new(shape: DeleteMarker, location: "header", location_name: "x-amz-delete-marker"))
     GetObjectOutput.add_member(:accept_ranges, Shapes::ShapeRef.new(shape: AcceptRanges, location: "header", location_name: "accept-ranges"))
@@ -1050,6 +1109,9 @@ module Aws::S3
     GetObjectOutput.add_member(:replication_status, Shapes::ShapeRef.new(shape: ReplicationStatus, location: "header", location_name: "x-amz-replication-status"))
     GetObjectOutput.add_member(:parts_count, Shapes::ShapeRef.new(shape: PartsCount, location: "header", location_name: "x-amz-mp-parts-count"))
     GetObjectOutput.add_member(:tag_count, Shapes::ShapeRef.new(shape: TagCount, location: "header", location_name: "x-amz-tagging-count"))
+    GetObjectOutput.add_member(:object_lock_mode, Shapes::ShapeRef.new(shape: ObjectLockMode, location: "header", location_name: "x-amz-object-lock-mode"))
+    GetObjectOutput.add_member(:object_lock_retain_until_date, Shapes::ShapeRef.new(shape: ObjectLockRetainUntilDate, location: "header", location_name: "x-amz-object-lock-retain-until-date"))
+    GetObjectOutput.add_member(:object_lock_legal_hold_status, Shapes::ShapeRef.new(shape: ObjectLockLegalHoldStatus, location: "header", location_name: "x-amz-object-lock-legal-hold"))
     GetObjectOutput.struct_class = Types::GetObjectOutput
     GetObjectOutput[:payload] = :body
     GetObjectOutput[:payload_member] = GetObjectOutput.member(:body)
@@ -1075,6 +1137,17 @@ module Aws::S3
     GetObjectRequest.add_member(:part_number, Shapes::ShapeRef.new(shape: PartNumber, location: "querystring", location_name: "partNumber"))
     GetObjectRequest.struct_class = Types::GetObjectRequest
 
+    GetObjectRetentionOutput.add_member(:retention, Shapes::ShapeRef.new(shape: ObjectLockRetention, location_name: "Retention"))
+    GetObjectRetentionOutput.struct_class = Types::GetObjectRetentionOutput
+    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(: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"))
+    GetObjectRetentionRequest.struct_class = Types::GetObjectRetentionRequest
+
     GetObjectTaggingOutput.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "header", location_name: "x-amz-version-id"))
     GetObjectTaggingOutput.add_member(:tag_set, Shapes::ShapeRef.new(shape: TagSet, required: true, location_name: "TagSet"))
     GetObjectTaggingOutput.struct_class = Types::GetObjectTaggingOutput
@@ -1148,6 +1221,9 @@ module Aws::S3
     HeadObjectOutput.add_member(:request_charged, Shapes::ShapeRef.new(shape: RequestCharged, location: "header", location_name: "x-amz-request-charged"))
     HeadObjectOutput.add_member(:replication_status, Shapes::ShapeRef.new(shape: ReplicationStatus, location: "header", location_name: "x-amz-replication-status"))
     HeadObjectOutput.add_member(:parts_count, Shapes::ShapeRef.new(shape: PartsCount, location: "header", location_name: "x-amz-mp-parts-count"))
+    HeadObjectOutput.add_member(:object_lock_mode, Shapes::ShapeRef.new(shape: ObjectLockMode, location: "header", location_name: "x-amz-object-lock-mode"))
+    HeadObjectOutput.add_member(:object_lock_retain_until_date, Shapes::ShapeRef.new(shape: ObjectLockRetainUntilDate, location: "header", location_name: "x-amz-object-lock-retain-until-date"))
+    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"))
@@ -1481,6 +1557,20 @@ module Aws::S3
 
     ObjectList.member = Shapes::ShapeRef.new(shape: Object)
 
+    ObjectLockConfiguration.add_member(:object_lock_enabled, Shapes::ShapeRef.new(shape: ObjectLockEnabled, location_name: "ObjectLockEnabled"))
+    ObjectLockConfiguration.add_member(:rule, Shapes::ShapeRef.new(shape: ObjectLockRule, location_name: "Rule"))
+    ObjectLockConfiguration.struct_class = Types::ObjectLockConfiguration
+
+    ObjectLockLegalHold.add_member(:status, Shapes::ShapeRef.new(shape: ObjectLockLegalHoldStatus, location_name: "Status"))
+    ObjectLockLegalHold.struct_class = Types::ObjectLockLegalHold
+
+    ObjectLockRetention.add_member(:mode, Shapes::ShapeRef.new(shape: ObjectLockRetentionMode, location_name: "Mode"))
+    ObjectLockRetention.add_member(:retain_until_date, Shapes::ShapeRef.new(shape: Date, location_name: "RetainUntilDate"))
+    ObjectLockRetention.struct_class = Types::ObjectLockRetention
+
+    ObjectLockRule.add_member(:default_retention, Shapes::ShapeRef.new(shape: DefaultRetention, location_name: "DefaultRetention"))
+    ObjectLockRule.struct_class = Types::ObjectLockRule
+
     ObjectVersion.add_member(:etag, Shapes::ShapeRef.new(shape: ETag, location_name: "ETag"))
     ObjectVersion.add_member(:size, Shapes::ShapeRef.new(shape: Size, location_name: "Size"))
     ObjectVersion.add_member(:storage_class, Shapes::ShapeRef.new(shape: ObjectVersionStorageClass, location_name: "StorageClass"))
@@ -1681,6 +1771,31 @@ module Aws::S3
     PutObjectAclRequest[:payload] = :access_control_policy
     PutObjectAclRequest[:payload_member] = PutObjectAclRequest.member(:access_control_policy)
 
+    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(: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"))
+    PutObjectLegalHoldRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
+    PutObjectLegalHoldRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
+    PutObjectLegalHoldRequest.struct_class = Types::PutObjectLegalHoldRequest
+    PutObjectLegalHoldRequest[:payload] = :legal_hold
+    PutObjectLegalHoldRequest[:payload_member] = PutObjectLegalHoldRequest.member(:legal_hold)
+
+    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(: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"))
+    PutObjectLockConfigurationRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
+    PutObjectLockConfigurationRequest.struct_class = Types::PutObjectLockConfigurationRequest
+    PutObjectLockConfigurationRequest[:payload] = :object_lock_configuration
+    PutObjectLockConfigurationRequest[:payload_member] = PutObjectLockConfigurationRequest.member(:object_lock_configuration)
+
     PutObjectOutput.add_member(:expiration, Shapes::ShapeRef.new(shape: Expiration, location: "header", location_name: "x-amz-expiration"))
     PutObjectOutput.add_member(:etag, Shapes::ShapeRef.new(shape: ETag, location: "header", location_name: "ETag"))
     PutObjectOutput.add_member(:server_side_encryption, Shapes::ShapeRef.new(shape: ServerSideEncryption, location: "header", location_name: "x-amz-server-side-encryption"))
@@ -1717,10 +1832,27 @@ module Aws::S3
     PutObjectRequest.add_member(:ssekms_key_id, Shapes::ShapeRef.new(shape: SSEKMSKeyId, location: "header", location_name: "x-amz-server-side-encryption-aws-kms-key-id"))
     PutObjectRequest.add_member(:request_payer, Shapes::ShapeRef.new(shape: RequestPayer, location: "header", location_name: "x-amz-request-payer"))
     PutObjectRequest.add_member(:tagging, Shapes::ShapeRef.new(shape: TaggingHeader, location: "header", location_name: "x-amz-tagging"))
+    PutObjectRequest.add_member(:object_lock_mode, Shapes::ShapeRef.new(shape: ObjectLockMode, location: "header", location_name: "x-amz-object-lock-mode"))
+    PutObjectRequest.add_member(:object_lock_retain_until_date, Shapes::ShapeRef.new(shape: ObjectLockRetainUntilDate, location: "header", location_name: "x-amz-object-lock-retain-until-date"))
+    PutObjectRequest.add_member(:object_lock_legal_hold_status, Shapes::ShapeRef.new(shape: ObjectLockLegalHoldStatus, location: "header", location_name: "x-amz-object-lock-legal-hold"))
     PutObjectRequest.struct_class = Types::PutObjectRequest
     PutObjectRequest[:payload] = :body
     PutObjectRequest[:payload_member] = PutObjectRequest.member(:body)
 
+    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(: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"))
+    PutObjectRetentionRequest.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "querystring", location_name: "versionId"))
+    PutObjectRetentionRequest.add_member(:bypass_governance_retention, Shapes::ShapeRef.new(shape: BypassGovernanceRetention, location: "header", location_name: "x-amz-bypass-governance-retention"))
+    PutObjectRetentionRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
+    PutObjectRetentionRequest.struct_class = Types::PutObjectRetentionRequest
+    PutObjectRetentionRequest[:payload] = :retention
+    PutObjectRetentionRequest[:payload_member] = PutObjectRetentionRequest.member(:retention)
+
     PutObjectTaggingOutput.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location: "header", location_name: "x-amz-version-id"))
     PutObjectTaggingOutput.struct_class = Types::PutObjectTaggingOutput
 
@@ -2383,6 +2515,30 @@ module Aws::S3
         o.errors << Shapes::ShapeRef.new(shape: NoSuchKey)
       end)
 
+      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.input = Shapes::ShapeRef.new(shape: GetObjectLegalHoldRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetObjectLegalHoldOutput)
+      end)
+
+      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.input = Shapes::ShapeRef.new(shape: GetObjectLockConfigurationRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetObjectLockConfigurationOutput)
+      end)
+
+      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.input = Shapes::ShapeRef.new(shape: GetObjectRetentionRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetObjectRetentionOutput)
+      end)
+
       api.add_operation(:get_object_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetObjectTagging"
         o.http_method = "GET"
@@ -2698,6 +2854,30 @@ module Aws::S3
         o.errors << Shapes::ShapeRef.new(shape: NoSuchKey)
       end)
 
+      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.input = Shapes::ShapeRef.new(shape: PutObjectLegalHoldRequest)
+        o.output = Shapes::ShapeRef.new(shape: PutObjectLegalHoldOutput)
+      end)
+
+      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.input = Shapes::ShapeRef.new(shape: PutObjectLockConfigurationRequest)
+        o.output = Shapes::ShapeRef.new(shape: PutObjectLockConfigurationOutput)
+      end)
+
+      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.input = Shapes::ShapeRef.new(shape: PutObjectRetentionRequest)
+        o.output = Shapes::ShapeRef.new(shape: PutObjectRetentionOutput)
+      end)
+
       api.add_operation(:put_object_tagging, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutObjectTagging"
         o.http_method = "PUT"

data/lib/aws-sdk-s3/encryption/client.rb

@@ -179,7 +179,7 @@ module Aws
 
         extend Deprecations
 
-        # Creates a new encryption client. You must provide on of the following
+        # Creates a new encryption client. You must provide one of the following
         # options:
         #
         # * `:encryption_key`

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

@@ -37,12 +37,18 @@ module Aws::S3
         @event_emitter.on(:error, Proc.new)
       end
 
+      def on_initial_response_event(&block)
+        @event_emitter.on(:initial_response, Proc.new)
+      end
+
       def on_event(&block)
         on_records_event(&block)
         on_stats_event(&block)
         on_progress_event(&block)
         on_cont_event(&block)
         on_end_event(&block)
+        on_error_event(&block)
+        on_initial_response_event(&block)
       end
 
       # @api private

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

@@ -141,6 +141,8 @@ module Aws
                   if Tempfile === body
                     body.close
                     body.unlink
+                  elsif StringIO === body
+                    body.string.clear
                   end
                 end
               end

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

@@ -70,6 +70,7 @@ module Aws::S3
       data[:storage_class]
     end
 
+    
     # @return [Types::Owner]
     def owner
       data[:owner]

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

@@ -235,7 +235,7 @@ module Aws::S3
     #   must use the form bytes=first-last, where the first and last are the
     #   zero-based byte offsets to copy. For example, bytes=0-9 indicates that
     #   you want to copy the first ten bytes of the source. You can copy a
-    #   range only if the source object is greater than 5 GB.
+    #   range only if the source object is greater than 5 MB.
     # @option options [String] :sse_customer_algorithm
     #   Specifies the algorithm to use to when encrypting the object (e.g.,
     #   AES256).

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

@@ -46,6 +46,7 @@ module Aws::S3
       data[:delete_marker]
     end
 
+    
     # @return [String]
     def accept_ranges
       data[:accept_ranges]
@@ -190,6 +191,7 @@ module Aws::S3
       data[:ssekms_key_id]
     end
 
+    
     # @return [String]
     def storage_class
       data[:storage_class]
@@ -202,6 +204,7 @@ module Aws::S3
       data[:request_charged]
     end
 
+    
     # @return [String]
     def replication_status
       data[:replication_status]
@@ -213,6 +216,24 @@ module Aws::S3
       data[:parts_count]
     end
 
+    # The Object Lock mode currently in place for this object.
+    # @return [String]
+    def object_lock_mode
+      data[:object_lock_mode]
+    end
+
+    # The date and time when this object's Object Lock will expire.
+    # @return [Time]
+    def object_lock_retain_until_date
+      data[:object_lock_retain_until_date]
+    end
+
+    # The Legal Hold status for the specified object.
+    # @return [String]
+    def object_lock_legal_hold_status
+      data[:object_lock_legal_hold_status]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -425,7 +446,7 @@ module Aws::S3
     #     metadata_directive: "COPY", # accepts COPY, REPLACE
     #     tagging_directive: "COPY", # accepts COPY, REPLACE
     #     server_side_encryption: "AES256", # accepts AES256, aws:kms
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -436,6 +457,9 @@ module Aws::S3
     #     copy_source_sse_customer_key_md5: "CopySourceSSECustomerKeyMD5",
     #     request_payer: "requester", # accepts requester
     #     tagging: "TaggingHeader",
+    #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
+    #     object_lock_retain_until_date: Time.now,
+    #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
     #   })
     # @param [Hash] options ({})
     # @option options [String] :acl
@@ -533,6 +557,13 @@ module Aws::S3
     #   The tag-set for the object destination object this value must be used
     #   in conjunction with the TaggingDirective. The tag-set must be encoded
     #   as URL Query parameters
+    # @option options [String] :object_lock_mode
+    #   The Object Lock mode that you want to apply to the copied object.
+    # @option options [Time,DateTime,Date,Integer,String] :object_lock_retain_until_date
+    #   The date and time when you want the copied object's Object Lock to
+    #   expire.
+    # @option options [String] :object_lock_legal_hold_status
+    #   Specifies whether you want to apply a Legal Hold to the copied object.
     # @return [Types::CopyObjectOutput]
     def copy_from(options = {})
       options = options.merge(
@@ -549,6 +580,7 @@ module Aws::S3
     #     mfa: "MFA",
     #     version_id: "ObjectVersionId",
     #     request_payer: "requester", # accepts requester
+    #     bypass_governance_retention: false,
     #   })
     # @param [Hash] options ({})
     # @option options [String] :mfa
@@ -562,6 +594,9 @@ module Aws::S3
     #   requests. Documentation on downloading objects from requester pays
     #   buckets can be found at
     #   http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
+    # @option options [Boolean] :bypass_governance_retention
+    #   Indicates whether S3 Object Lock should bypass Governance-mode
+    #   restrictions to process this operation.
     # @return [Types::DeleteObjectOutput]
     def delete(options = {})
       options = options.merge(
@@ -676,7 +711,7 @@ module Aws::S3
     #       "MetadataKey" => "MetadataValue",
     #     },
     #     server_side_encryption: "AES256", # accepts AES256, aws:kms
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -684,6 +719,9 @@ module Aws::S3
     #     ssekms_key_id: "SSEKMSKeyId",
     #     request_payer: "requester", # accepts requester
     #     tagging: "TaggingHeader",
+    #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
+    #     object_lock_retain_until_date: Time.now,
+    #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
     #   })
     # @param [Hash] options ({})
     # @option options [String] :acl
@@ -750,6 +788,14 @@ module Aws::S3
     # @option options [String] :tagging
     #   The tag-set for the object. The tag-set must be encoded as URL Query
     #   parameters
+    # @option options [String] :object_lock_mode
+    #   Specifies the Object Lock mode that you want to apply to the uploaded
+    #   object.
+    # @option options [Time,DateTime,Date,Integer,String] :object_lock_retain_until_date
+    #   Specifies the date and time when you want the Object Lock to expire.
+    # @option options [String] :object_lock_legal_hold_status
+    #   Specifies whether you want to apply a Legal Hold to the uploaded
+    #   object.
     # @return [MultipartUpload]
     def initiate_multipart_upload(options = {})
       options = options.merge(
@@ -786,7 +832,7 @@ module Aws::S3
     #       "MetadataKey" => "MetadataValue",
     #     },
     #     server_side_encryption: "AES256", # accepts AES256, aws:kms
-    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
+    #     storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE
     #     website_redirect_location: "WebsiteRedirectLocation",
     #     sse_customer_algorithm: "SSECustomerAlgorithm",
     #     sse_customer_key: "SSECustomerKey",
@@ -794,6 +840,9 @@ module Aws::S3
     #     ssekms_key_id: "SSEKMSKeyId",
     #     request_payer: "requester", # accepts requester
     #     tagging: "TaggingHeader",
+    #     object_lock_mode: "GOVERNANCE", # accepts GOVERNANCE, COMPLIANCE
+    #     object_lock_retain_until_date: Time.now,
+    #     object_lock_legal_hold_status: "ON", # accepts ON, OFF
     #   })
     # @param [Hash] options ({})
     # @option options [String] :acl
@@ -814,7 +863,8 @@ module Aws::S3
     #   Size of the body in bytes. This parameter is useful when the size of
     #   the body cannot be determined automatically.
     # @option options [String] :content_md5
-    #   The base64-encoded 128-bit MD5 digest of the part data.
+    #   The base64-encoded 128-bit MD5 digest of the part data. This parameter
+    #   is auto-populated when using the command from the CLI
     # @option options [String] :content_type
     #   A standard MIME type describing the format of the object data.
     # @option options [Time,DateTime,Date,Integer,String] :expires
@@ -867,6 +917,12 @@ module Aws::S3
     # @option options [String] :tagging
     #   The tag-set for the object. The tag-set must be encoded as URL Query
     #   parameters. (For example, "Key1=Value1")
+    # @option options [String] :object_lock_mode
+    #   The Object Lock mode that you want to apply to this object.
+    # @option options [Time,DateTime,Date,Integer,String] :object_lock_retain_until_date
+    #   The date and time when you want this object's Object Lock to expire.
+    # @option options [String] :object_lock_legal_hold_status
+    #   The Legal Hold status that you want to apply to the specified object.
     # @return [Types::PutObjectOutput]
     def put(options = {})
       options = options.merge(
@@ -958,7 +1014,7 @@ module Aws::S3
     #               value: "MetadataValue",
     #             },
     #           ],
-    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA
+    #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE
     #         },
     #       },
     #     },
@@ -1093,6 +1149,7 @@ module Aws::S3
       #   object.batch_delete!({
       #     mfa: "MFA",
       #     request_payer: "requester", # accepts requester
+      #     bypass_governance_retention: false,
       #   })
       # @param options ({})
       # @option options [String] :mfa
@@ -1104,6 +1161,10 @@ module Aws::S3
       #   requests. Documentation on downloading objects from requester pays
       #   buckets can be found at
       #   http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
+      # @option options [Boolean] :bypass_governance_retention
+      #   Specifies whether you want to delete this object even if it has a
+      #   Governance-type Object Lock in place. You must have sufficient
+      #   permissions to perform this operation.
       # @return [void]
       def batch_delete!(options = {})
         batch_enum.each do |batch|

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

@@ -38,6 +38,7 @@ module Aws::S3
       @object_key
     end
 
+    
     # @return [Types::Owner]
     def owner
       data[:owner]