aws-sdk-s3 1.5.0 → 1.6.0

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

@@ -19,6 +19,7 @@ module Aws::S3
     AccelerateConfiguration = Shapes::StructureShape.new(name: 'AccelerateConfiguration')
     AcceptRanges = Shapes::StringShape.new(name: 'AcceptRanges')
     AccessControlPolicy = Shapes::StructureShape.new(name: 'AccessControlPolicy')
+    AccessControlTranslation = Shapes::StructureShape.new(name: 'AccessControlTranslation')
     AccountId = Shapes::StringShape.new(name: 'AccountId')
     AllowedHeader = Shapes::StringShape.new(name: 'AllowedHeader')
     AllowedHeaders = Shapes::ListShape.new(name: 'AllowedHeaders', flattened: true)
@@ -63,6 +64,7 @@ module Aws::S3
     CompletedPart = Shapes::StructureShape.new(name: 'CompletedPart')
     CompletedPartList = Shapes::ListShape.new(name: 'CompletedPartList', flattened: true)
     Condition = Shapes::StructureShape.new(name: 'Condition')
+    ConfirmRemoveSelfBucketAccess = Shapes::BooleanShape.new(name: 'ConfirmRemoveSelfBucketAccess')
     ContentDisposition = Shapes::StringShape.new(name: 'ContentDisposition')
     ContentEncoding = Shapes::StringShape.new(name: 'ContentEncoding')
     ContentLanguage = Shapes::StringShape.new(name: 'ContentLanguage')
@@ -96,6 +98,7 @@ module Aws::S3
     Delete = Shapes::StructureShape.new(name: 'Delete')
     DeleteBucketAnalyticsConfigurationRequest = Shapes::StructureShape.new(name: 'DeleteBucketAnalyticsConfigurationRequest')
     DeleteBucketCorsRequest = Shapes::StructureShape.new(name: 'DeleteBucketCorsRequest')
+    DeleteBucketEncryptionRequest = Shapes::StructureShape.new(name: 'DeleteBucketEncryptionRequest')
     DeleteBucketInventoryConfigurationRequest = Shapes::StructureShape.new(name: 'DeleteBucketInventoryConfigurationRequest')
     DeleteBucketLifecycleRequest = Shapes::StructureShape.new(name: 'DeleteBucketLifecycleRequest')
     DeleteBucketMetricsConfigurationRequest = Shapes::StructureShape.new(name: 'DeleteBucketMetricsConfigurationRequest')
@@ -122,6 +125,7 @@ module Aws::S3
     ETag = Shapes::StringShape.new(name: 'ETag')
     EmailAddress = Shapes::StringShape.new(name: 'EmailAddress')
     EncodingType = Shapes::StringShape.new(name: 'EncodingType')
+    EncryptionConfiguration = Shapes::StructureShape.new(name: 'EncryptionConfiguration')
     Error = Shapes::StructureShape.new(name: 'Error')
     ErrorDocument = Shapes::StructureShape.new(name: 'ErrorDocument')
     Errors = Shapes::ListShape.new(name: 'Errors', flattened: true)
@@ -147,6 +151,8 @@ module Aws::S3
     GetBucketAnalyticsConfigurationRequest = Shapes::StructureShape.new(name: 'GetBucketAnalyticsConfigurationRequest')
     GetBucketCorsOutput = Shapes::StructureShape.new(name: 'GetBucketCorsOutput')
     GetBucketCorsRequest = Shapes::StructureShape.new(name: 'GetBucketCorsRequest')
+    GetBucketEncryptionOutput = Shapes::StructureShape.new(name: 'GetBucketEncryptionOutput')
+    GetBucketEncryptionRequest = Shapes::StructureShape.new(name: 'GetBucketEncryptionRequest')
     GetBucketInventoryConfigurationOutput = Shapes::StructureShape.new(name: 'GetBucketInventoryConfigurationOutput')
     GetBucketInventoryConfigurationRequest = Shapes::StructureShape.new(name: 'GetBucketInventoryConfigurationRequest')
     GetBucketLifecycleConfigurationOutput = Shapes::StructureShape.new(name: 'GetBucketLifecycleConfigurationOutput')
@@ -206,6 +212,7 @@ module Aws::S3
     InventoryConfiguration = Shapes::StructureShape.new(name: 'InventoryConfiguration')
     InventoryConfigurationList = Shapes::ListShape.new(name: 'InventoryConfigurationList', flattened: true)
     InventoryDestination = Shapes::StructureShape.new(name: 'InventoryDestination')
+    InventoryEncryption = Shapes::StructureShape.new(name: 'InventoryEncryption')
     InventoryFilter = Shapes::StructureShape.new(name: 'InventoryFilter')
     InventoryFormat = Shapes::StringShape.new(name: 'InventoryFormat')
     InventoryFrequency = Shapes::StringShape.new(name: 'InventoryFrequency')
@@ -302,6 +309,7 @@ module Aws::S3
     ObjectVersionList = Shapes::ListShape.new(name: 'ObjectVersionList', flattened: true)
     ObjectVersionStorageClass = Shapes::StringShape.new(name: 'ObjectVersionStorageClass')
     Owner = Shapes::StructureShape.new(name: 'Owner')
+    OwnerOverride = Shapes::StringShape.new(name: 'OwnerOverride')
     Part = Shapes::StructureShape.new(name: 'Part')
     PartNumber = Shapes::IntegerShape.new(name: 'PartNumber')
     PartNumberMarker = Shapes::IntegerShape.new(name: 'PartNumberMarker')
@@ -316,6 +324,7 @@ module Aws::S3
     PutBucketAclRequest = Shapes::StructureShape.new(name: 'PutBucketAclRequest')
     PutBucketAnalyticsConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketAnalyticsConfigurationRequest')
     PutBucketCorsRequest = Shapes::StructureShape.new(name: 'PutBucketCorsRequest')
+    PutBucketEncryptionRequest = Shapes::StructureShape.new(name: 'PutBucketEncryptionRequest')
     PutBucketInventoryConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketInventoryConfigurationRequest')
     PutBucketLifecycleConfigurationRequest = Shapes::StructureShape.new(name: 'PutBucketLifecycleConfigurationRequest')
     PutBucketLifecycleRequest = Shapes::StructureShape.new(name: 'PutBucketLifecycleRequest')
@@ -345,6 +354,7 @@ module Aws::S3
     RedirectAllRequestsTo = Shapes::StructureShape.new(name: 'RedirectAllRequestsTo')
     ReplaceKeyPrefixWith = Shapes::StringShape.new(name: 'ReplaceKeyPrefixWith')
     ReplaceKeyWith = Shapes::StringShape.new(name: 'ReplaceKeyWith')
+    ReplicaKmsKeyID = Shapes::StringShape.new(name: 'ReplicaKmsKeyID')
     ReplicationConfiguration = Shapes::StructureShape.new(name: 'ReplicationConfiguration')
     ReplicationRule = Shapes::StructureShape.new(name: 'ReplicationRule')
     ReplicationRuleStatus = Shapes::StringShape.new(name: 'ReplicationRuleStatus')
@@ -372,9 +382,18 @@ module Aws::S3
     SSECustomerAlgorithm = Shapes::StringShape.new(name: 'SSECustomerAlgorithm')
     SSECustomerKey = Shapes::StringShape.new(name: 'SSECustomerKey')
     SSECustomerKeyMD5 = Shapes::StringShape.new(name: 'SSECustomerKeyMD5')
+    SSEKMS = Shapes::StructureShape.new(name: 'SSEKMS')
     SSEKMSKeyId = Shapes::StringShape.new(name: 'SSEKMSKeyId')
+    SSES3 = Shapes::StructureShape.new(name: 'SSES3')
     ServerSideEncryption = Shapes::StringShape.new(name: 'ServerSideEncryption')
+    ServerSideEncryptionByDefault = Shapes::StructureShape.new(name: 'ServerSideEncryptionByDefault')
+    ServerSideEncryptionConfiguration = Shapes::StructureShape.new(name: 'ServerSideEncryptionConfiguration')
+    ServerSideEncryptionRule = Shapes::StructureShape.new(name: 'ServerSideEncryptionRule')
+    ServerSideEncryptionRules = Shapes::ListShape.new(name: 'ServerSideEncryptionRules', flattened: true)
     Size = Shapes::IntegerShape.new(name: 'Size')
+    SourceSelectionCriteria = Shapes::StructureShape.new(name: 'SourceSelectionCriteria')
+    SseKmsEncryptedObjects = Shapes::StructureShape.new(name: 'SseKmsEncryptedObjects')
+    SseKmsEncryptedObjectsStatus = Shapes::StringShape.new(name: 'SseKmsEncryptedObjectsStatus')
     StartAfter = Shapes::StringShape.new(name: 'StartAfter')
     StorageClass = Shapes::StringShape.new(name: 'StorageClass')
     StorageClassAnalysis = Shapes::StructureShape.new(name: 'StorageClassAnalysis')
@@ -432,6 +451,9 @@ module Aws::S3
     AccessControlPolicy.add_member(:owner, Shapes::ShapeRef.new(shape: Owner, location_name: "Owner"))
     AccessControlPolicy.struct_class = Types::AccessControlPolicy
 
+    AccessControlTranslation.add_member(:owner, Shapes::ShapeRef.new(shape: OwnerOverride, required: true, location_name: "Owner"))
+    AccessControlTranslation.struct_class = Types::AccessControlTranslation
+
     AllowedHeaders.member = Shapes::ShapeRef.new(shape: AllowedHeader)
 
     AllowedMethods.member = Shapes::ShapeRef.new(shape: AllowedMethod)
@@ -654,6 +676,9 @@ module Aws::S3
     DeleteBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
     DeleteBucketCorsRequest.struct_class = Types::DeleteBucketCorsRequest
 
+    DeleteBucketEncryptionRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
+    DeleteBucketEncryptionRequest.struct_class = Types::DeleteBucketEncryptionRequest
+
     DeleteBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
     DeleteBucketInventoryConfigurationRequest.add_member(:id, Shapes::ShapeRef.new(shape: InventoryId, required: true, location: "querystring", location_name: "id"))
     DeleteBucketInventoryConfigurationRequest.struct_class = Types::DeleteBucketInventoryConfigurationRequest
@@ -731,9 +756,15 @@ module Aws::S3
     DeletedObjects.member = Shapes::ShapeRef.new(shape: DeletedObject)
 
     Destination.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location_name: "Bucket"))
+    Destination.add_member(:account, Shapes::ShapeRef.new(shape: AccountId, location_name: "Account"))
     Destination.add_member(:storage_class, Shapes::ShapeRef.new(shape: StorageClass, location_name: "StorageClass"))
+    Destination.add_member(:access_control_translation, Shapes::ShapeRef.new(shape: AccessControlTranslation, location_name: "AccessControlTranslation"))
+    Destination.add_member(:encryption_configuration, Shapes::ShapeRef.new(shape: EncryptionConfiguration, location_name: "EncryptionConfiguration"))
     Destination.struct_class = Types::Destination
 
+    EncryptionConfiguration.add_member(:replica_kms_key_id, Shapes::ShapeRef.new(shape: ReplicaKmsKeyID, location_name: "ReplicaKmsKeyID"))
+    EncryptionConfiguration.struct_class = Types::EncryptionConfiguration
+
     Error.add_member(:key, Shapes::ShapeRef.new(shape: ObjectKey, location_name: "Key"))
     Error.add_member(:version_id, Shapes::ShapeRef.new(shape: ObjectVersionId, location_name: "VersionId"))
     Error.add_member(:code, Shapes::ShapeRef.new(shape: Code, location_name: "Code"))
@@ -783,6 +814,14 @@ module Aws::S3
     GetBucketCorsRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
     GetBucketCorsRequest.struct_class = Types::GetBucketCorsRequest
 
+    GetBucketEncryptionOutput.add_member(:server_side_encryption_configuration, Shapes::ShapeRef.new(shape: ServerSideEncryptionConfiguration, location_name: "ServerSideEncryptionConfiguration"))
+    GetBucketEncryptionOutput.struct_class = Types::GetBucketEncryptionOutput
+    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.struct_class = Types::GetBucketEncryptionRequest
+
     GetBucketInventoryConfigurationOutput.add_member(:inventory_configuration, Shapes::ShapeRef.new(shape: InventoryConfiguration, location_name: "InventoryConfiguration"))
     GetBucketInventoryConfigurationOutput.struct_class = Types::GetBucketInventoryConfigurationOutput
     GetBucketInventoryConfigurationOutput[:payload] = :inventory_configuration
@@ -1040,6 +1079,10 @@ module Aws::S3
     InventoryDestination.add_member(:s3_bucket_destination, Shapes::ShapeRef.new(shape: InventoryS3BucketDestination, required: true, location_name: "S3BucketDestination"))
     InventoryDestination.struct_class = Types::InventoryDestination
 
+    InventoryEncryption.add_member(:sses3, Shapes::ShapeRef.new(shape: SSES3, location_name: "SSE-S3"))
+    InventoryEncryption.add_member(:ssekms, Shapes::ShapeRef.new(shape: SSEKMS, location_name: "SSE-KMS"))
+    InventoryEncryption.struct_class = Types::InventoryEncryption
+
     InventoryFilter.add_member(:prefix, Shapes::ShapeRef.new(shape: Prefix, required: true, location_name: "Prefix"))
     InventoryFilter.struct_class = Types::InventoryFilter
 
@@ -1049,6 +1092,7 @@ module Aws::S3
     InventoryS3BucketDestination.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location_name: "Bucket"))
     InventoryS3BucketDestination.add_member(:format, Shapes::ShapeRef.new(shape: InventoryFormat, required: true, location_name: "Format"))
     InventoryS3BucketDestination.add_member(:prefix, Shapes::ShapeRef.new(shape: Prefix, location_name: "Prefix"))
+    InventoryS3BucketDestination.add_member(:encryption, Shapes::ShapeRef.new(shape: InventoryEncryption, location_name: "Encryption"))
     InventoryS3BucketDestination.struct_class = Types::InventoryS3BucketDestination
 
     InventorySchedule.add_member(:frequency, Shapes::ShapeRef.new(shape: InventoryFrequency, required: true, location_name: "Frequency"))
@@ -1371,6 +1415,13 @@ 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(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
+    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/"}}))
+    PutBucketEncryptionRequest.struct_class = Types::PutBucketEncryptionRequest
+    PutBucketEncryptionRequest[:payload] = :server_side_encryption_configuration
+    PutBucketEncryptionRequest[:payload_member] = PutBucketEncryptionRequest.member(:server_side_encryption_configuration)
+
     PutBucketInventoryConfigurationRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_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/"}}))
@@ -1420,6 +1471,7 @@ module Aws::S3
 
     PutBucketPolicyRequest.add_member(:bucket, Shapes::ShapeRef.new(shape: BucketName, required: true, location: "uri", location_name: "Bucket"))
     PutBucketPolicyRequest.add_member(:content_md5, Shapes::ShapeRef.new(shape: ContentMD5, location: "header", location_name: "Content-MD5"))
+    PutBucketPolicyRequest.add_member(:confirm_remove_self_bucket_access, Shapes::ShapeRef.new(shape: ConfirmRemoveSelfBucketAccess, location: "header", location_name: "x-amz-confirm-remove-self-bucket-access"))
     PutBucketPolicyRequest.add_member(:policy, Shapes::ShapeRef.new(shape: Policy, required: true, location_name: "Policy"))
     PutBucketPolicyRequest.struct_class = Types::PutBucketPolicyRequest
     PutBucketPolicyRequest[:payload] = :policy
@@ -1564,6 +1616,7 @@ module Aws::S3
     ReplicationRule.add_member(:id, Shapes::ShapeRef.new(shape: ID, location_name: "ID"))
     ReplicationRule.add_member(:prefix, Shapes::ShapeRef.new(shape: Prefix, required: true, location_name: "Prefix"))
     ReplicationRule.add_member(:status, Shapes::ShapeRef.new(shape: ReplicationRuleStatus, required: true, location_name: "Status"))
+    ReplicationRule.add_member(:source_selection_criteria, Shapes::ShapeRef.new(shape: SourceSelectionCriteria, location_name: "SourceSelectionCriteria"))
     ReplicationRule.add_member(:destination, Shapes::ShapeRef.new(shape: Destination, required: true, location_name: "Destination"))
     ReplicationRule.struct_class = Types::ReplicationRule
 
@@ -1609,6 +1662,29 @@ module Aws::S3
     S3KeyFilter.add_member(:filter_rules, Shapes::ShapeRef.new(shape: FilterRuleList, location_name: "FilterRule"))
     S3KeyFilter.struct_class = Types::S3KeyFilter
 
+    SSEKMS.add_member(:key_id, Shapes::ShapeRef.new(shape: SSEKMSKeyId, required: true, location_name: "KeyId"))
+    SSEKMS.struct_class = Types::SSEKMS
+
+    SSES3.struct_class = Types::SSES3
+
+    ServerSideEncryptionByDefault.add_member(:sse_algorithm, Shapes::ShapeRef.new(shape: ServerSideEncryption, required: true, location_name: "SSEAlgorithm"))
+    ServerSideEncryptionByDefault.add_member(:kms_master_key_id, Shapes::ShapeRef.new(shape: SSEKMSKeyId, location_name: "KMSMasterKeyID"))
+    ServerSideEncryptionByDefault.struct_class = Types::ServerSideEncryptionByDefault
+
+    ServerSideEncryptionConfiguration.add_member(:rules, Shapes::ShapeRef.new(shape: ServerSideEncryptionRules, required: true, location_name: "Rule"))
+    ServerSideEncryptionConfiguration.struct_class = Types::ServerSideEncryptionConfiguration
+
+    ServerSideEncryptionRule.add_member(:apply_server_side_encryption_by_default, Shapes::ShapeRef.new(shape: ServerSideEncryptionByDefault, location_name: "ApplyServerSideEncryptionByDefault"))
+    ServerSideEncryptionRule.struct_class = Types::ServerSideEncryptionRule
+
+    ServerSideEncryptionRules.member = Shapes::ShapeRef.new(shape: ServerSideEncryptionRule)
+
+    SourceSelectionCriteria.add_member(:sse_kms_encrypted_objects, Shapes::ShapeRef.new(shape: SseKmsEncryptedObjects, location_name: "SseKmsEncryptedObjects"))
+    SourceSelectionCriteria.struct_class = Types::SourceSelectionCriteria
+
+    SseKmsEncryptedObjects.add_member(:status, Shapes::ShapeRef.new(shape: SseKmsEncryptedObjectsStatus, required: true, location_name: "Status"))
+    SseKmsEncryptedObjects.struct_class = Types::SseKmsEncryptedObjects
+
     StorageClassAnalysis.add_member(:data_export, Shapes::ShapeRef.new(shape: StorageClassAnalysisDataExport, location_name: "DataExport"))
     StorageClassAnalysis.struct_class = Types::StorageClassAnalysis
 
@@ -1796,6 +1872,14 @@ module Aws::S3
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      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.input = Shapes::ShapeRef.new(shape: DeleteBucketEncryptionRequest)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+      end)
+
       api.add_operation(:delete_bucket_inventory_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteBucketInventoryConfiguration"
         o.http_method = "DELETE"
@@ -1908,6 +1992,14 @@ module Aws::S3
         o.output = Shapes::ShapeRef.new(shape: GetBucketCorsOutput)
       end)
 
+      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.input = Shapes::ShapeRef.new(shape: GetBucketEncryptionRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetBucketEncryptionOutput)
+      end)
+
       api.add_operation(:get_bucket_inventory_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetBucketInventoryConfiguration"
         o.http_method = "GET"
@@ -2216,6 +2308,14 @@ module Aws::S3
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      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.input = Shapes::ShapeRef.new(shape: PutBucketEncryptionRequest)
+        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+      end)
+
       api.add_operation(:put_bucket_inventory_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PutBucketInventoryConfiguration"
         o.http_method = "PUT"

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

@@ -135,6 +135,26 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Container for information regarding the access control for replicas.
+    #
+    # @note When making an API call, you may pass AccessControlTranslation
+    #   data as a hash:
+    #
+    #       {
+    #         owner: "Destination", # required, accepts Destination
+    #       }
+    #
+    # @!attribute [rw] owner
+    #   The override value for the owner of the replica object.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AccessControlTranslation AWS API Documentation
+    #
+    class AccessControlTranslation < Struct.new(
+      :owner)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass AnalyticsAndOperator
     #   data as a hash:
     #
@@ -1483,6 +1503,25 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DeleteBucketEncryptionRequest
+    #   data as a hash:
+    #
+    #       {
+    #         bucket: "BucketName", # required
+    #       }
+    #
+    # @!attribute [rw] bucket
+    #   The name of the bucket containing the server-side encryption
+    #   configuration to delete.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketEncryptionRequest AWS API Documentation
+    #
+    class DeleteBucketEncryptionRequest < Struct.new(
+      :bucket)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DeleteBucketInventoryConfigurationRequest
     #   data as a hash:
     #
@@ -1865,12 +1904,21 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Container for replication destination information.
+    #
     # @note When making an API call, you may pass Destination
     #   data as a hash:
     #
     #       {
     #         bucket: "BucketName", # required
+    #         account: "AccountId",
     #         storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #         access_control_translation: {
+    #           owner: "Destination", # required, accepts Destination
+    #         },
+    #         encryption_configuration: {
+    #           replica_kms_key_id: "ReplicaKmsKeyID",
+    #         },
     #       }
     #
     # @!attribute [rw] bucket
@@ -1878,15 +1926,53 @@ module Aws::S3
     #   store replicas of the object identified by the rule.
     #   @return [String]
     #
+    # @!attribute [rw] account
+    #   Account ID of the destination bucket. Currently this is only being
+    #   verified if Access Control Translation is enabled
+    #   @return [String]
+    #
     # @!attribute [rw] storage_class
     #   The class of storage used to store the object.
     #   @return [String]
     #
+    # @!attribute [rw] access_control_translation
+    #   Container for information regarding the access control for replicas.
+    #   @return [Types::AccessControlTranslation]
+    #
+    # @!attribute [rw] encryption_configuration
+    #   Container for information regarding encryption based configuration
+    #   for replicas.
+    #   @return [Types::EncryptionConfiguration]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Destination AWS API Documentation
     #
     class Destination < Struct.new(
       :bucket,
-      :storage_class)
+      :account,
+      :storage_class,
+      :access_control_translation,
+      :encryption_configuration)
+      include Aws::Structure
+    end
+
+    # Container for information regarding encryption based configuration for
+    # replicas.
+    #
+    # @note When making an API call, you may pass EncryptionConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         replica_kms_key_id: "ReplicaKmsKeyID",
+    #       }
+    #
+    # @!attribute [rw] replica_kms_key_id
+    #   The id of the KMS key used to encrypt the replica object.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/EncryptionConfiguration AWS API Documentation
+    #
+    class EncryptionConfiguration < Struct.new(
+      :replica_kms_key_id)
       include Aws::Structure
     end
 
@@ -2090,6 +2176,37 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # @!attribute [rw] server_side_encryption_configuration
+    #   Container for server-side encryption configuration rules. Currently
+    #   S3 supports one rule only.
+    #   @return [Types::ServerSideEncryptionConfiguration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryptionOutput AWS API Documentation
+    #
+    class GetBucketEncryptionOutput < Struct.new(
+      :server_side_encryption_configuration)
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass GetBucketEncryptionRequest
+    #   data as a hash:
+    #
+    #       {
+    #         bucket: "BucketName", # required
+    #       }
+    #
+    # @!attribute [rw] bucket
+    #   The name of the bucket from which the server-side encryption
+    #   configuration is retrieved.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryptionRequest AWS API Documentation
+    #
+    class GetBucketEncryptionRequest < Struct.new(
+      :bucket)
+      include Aws::Structure
+    end
+
     # @!attribute [rw] inventory_configuration
     #   Specifies the inventory configuration.
     #   @return [Types::InventoryConfiguration]
@@ -3357,6 +3474,13 @@ module Aws::S3
     #             bucket: "BucketName", # required
     #             format: "CSV", # required, accepts CSV
     #             prefix: "Prefix",
+    #             encryption: {
+    #               sses3: {
+    #               },
+    #               ssekms: {
+    #                 key_id: "SSEKMSKeyId", # required
+    #               },
+    #             },
     #           },
     #         },
     #         is_enabled: false, # required
@@ -3365,7 +3489,7 @@ module Aws::S3
     #         },
     #         id: "InventoryId", # required
     #         included_object_versions: "All", # required, accepts All, Current
-    #         optional_fields: ["Size"], # accepts Size, LastModifiedDate, StorageClass, ETag, IsMultipartUploaded, ReplicationStatus
+    #         optional_fields: ["Size"], # accepts Size, LastModifiedDate, StorageClass, ETag, IsMultipartUploaded, ReplicationStatus, EncryptionStatus
     #         schedule: { # required
     #           frequency: "Daily", # required, accepts Daily, Weekly
     #         },
@@ -3424,6 +3548,13 @@ module Aws::S3
     #           bucket: "BucketName", # required
     #           format: "CSV", # required, accepts CSV
     #           prefix: "Prefix",
+    #           encryption: {
+    #             sses3: {
+    #             },
+    #             ssekms: {
+    #               key_id: "SSEKMSKeyId", # required
+    #             },
+    #           },
     #         },
     #       }
     #
@@ -3439,6 +3570,37 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Contains the type of server-side encryption used to encrypt the
+    # inventory results.
+    #
+    # @note When making an API call, you may pass InventoryEncryption
+    #   data as a hash:
+    #
+    #       {
+    #         sses3: {
+    #         },
+    #         ssekms: {
+    #           key_id: "SSEKMSKeyId", # required
+    #         },
+    #       }
+    #
+    # @!attribute [rw] sses3
+    #   Specifies the use of SSE-S3 to encrypt delievered Inventory reports.
+    #   @return [Types::SSES3]
+    #
+    # @!attribute [rw] ssekms
+    #   Specifies the use of SSE-KMS to encrypt delievered Inventory
+    #   reports.
+    #   @return [Types::SSEKMS]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryEncryption AWS API Documentation
+    #
+    class InventoryEncryption < Struct.new(
+      :sses3,
+      :ssekms)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass InventoryFilter
     #   data as a hash:
     #
@@ -3466,6 +3628,13 @@ module Aws::S3
     #         bucket: "BucketName", # required
     #         format: "CSV", # required, accepts CSV
     #         prefix: "Prefix",
+    #         encryption: {
+    #           sses3: {
+    #           },
+    #           ssekms: {
+    #             key_id: "SSEKMSKeyId", # required
+    #           },
+    #         },
     #       }
     #
     # @!attribute [rw] account_id
@@ -3485,13 +3654,19 @@ module Aws::S3
     #   The prefix that is prepended to all inventory results.
     #   @return [String]
     #
+    # @!attribute [rw] encryption
+    #   Contains the type of server-side encryption used to encrypt the
+    #   inventory results.
+    #   @return [Types::InventoryEncryption]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryS3BucketDestination AWS API Documentation
     #
     class InventoryS3BucketDestination < Struct.new(
       :account_id,
       :bucket,
       :format,
-      :prefix)
+      :prefix,
+      :encryption)
       include Aws::Structure
     end
 
@@ -5480,6 +5655,48 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass PutBucketEncryptionRequest
+    #   data as a hash:
+    #
+    #       {
+    #         bucket: "BucketName", # required
+    #         content_md5: "ContentMD5",
+    #         server_side_encryption_configuration: { # required
+    #           rules: [ # required
+    #             {
+    #               apply_server_side_encryption_by_default: {
+    #                 sse_algorithm: "AES256", # required, accepts AES256, aws:kms
+    #                 kms_master_key_id: "SSEKMSKeyId",
+    #               },
+    #             },
+    #           ],
+    #         },
+    #       }
+    #
+    # @!attribute [rw] bucket
+    #   The name of the bucket for which the server-side encryption
+    #   configuration is set.
+    #   @return [String]
+    #
+    # @!attribute [rw] content_md5
+    #   The base64-encoded 128-bit MD5 digest of the server-side encryption
+    #   configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] server_side_encryption_configuration
+    #   Container for server-side encryption configuration rules. Currently
+    #   S3 supports one rule only.
+    #   @return [Types::ServerSideEncryptionConfiguration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketEncryptionRequest AWS API Documentation
+    #
+    class PutBucketEncryptionRequest < Struct.new(
+      :bucket,
+      :content_md5,
+      :server_side_encryption_configuration)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass PutBucketInventoryConfigurationRequest
     #   data as a hash:
     #
@@ -5493,6 +5710,13 @@ module Aws::S3
     #               bucket: "BucketName", # required
     #               format: "CSV", # required, accepts CSV
     #               prefix: "Prefix",
+    #               encryption: {
+    #                 sses3: {
+    #                 },
+    #                 ssekms: {
+    #                   key_id: "SSEKMSKeyId", # required
+    #                 },
+    #               },
     #             },
     #           },
     #           is_enabled: false, # required
@@ -5501,7 +5725,7 @@ module Aws::S3
     #           },
     #           id: "InventoryId", # required
     #           included_object_versions: "All", # required, accepts All, Current
-    #           optional_fields: ["Size"], # accepts Size, LastModifiedDate, StorageClass, ETag, IsMultipartUploaded, ReplicationStatus
+    #           optional_fields: ["Size"], # accepts Size, LastModifiedDate, StorageClass, ETag, IsMultipartUploaded, ReplicationStatus, EncryptionStatus
     #           schedule: { # required
     #             frequency: "Daily", # required, accepts Daily, Weekly
     #           },
@@ -5877,6 +6101,7 @@ module Aws::S3
     #       {
     #         bucket: "BucketName", # required
     #         content_md5: "ContentMD5",
+    #         confirm_remove_self_bucket_access: false,
     #         policy: "Policy", # required
     #       }
     #
@@ -5886,6 +6111,11 @@ module Aws::S3
     # @!attribute [rw] content_md5
     #   @return [String]
     #
+    # @!attribute [rw] confirm_remove_self_bucket_access
+    #   Set this parameter to true to confirm that you want to remove your
+    #   permissions to change this bucket policy in the future.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] policy
     #   The bucket policy as a JSON document.
     #   @return [String]
@@ -5895,6 +6125,7 @@ module Aws::S3
     class PutBucketPolicyRequest < Struct.new(
       :bucket,
       :content_md5,
+      :confirm_remove_self_bucket_access,
       :policy)
       include Aws::Structure
     end
@@ -5912,9 +6143,21 @@ module Aws::S3
     #               id: "ID",
     #               prefix: "Prefix", # required
     #               status: "Enabled", # required, accepts Enabled, Disabled
+    #               source_selection_criteria: {
+    #                 sse_kms_encrypted_objects: {
+    #                   status: "Enabled", # required, accepts Enabled, Disabled
+    #                 },
+    #               },
     #               destination: { # required
     #                 bucket: "BucketName", # required
+    #                 account: "AccountId",
     #                 storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #                 access_control_translation: {
+    #                   owner: "Destination", # required, accepts Destination
+    #                 },
+    #                 encryption_configuration: {
+    #                   replica_kms_key_id: "ReplicaKmsKeyID",
+    #                 },
     #               },
     #             },
     #           ],
@@ -6697,9 +6940,21 @@ module Aws::S3
     #             id: "ID",
     #             prefix: "Prefix", # required
     #             status: "Enabled", # required, accepts Enabled, Disabled
+    #             source_selection_criteria: {
+    #               sse_kms_encrypted_objects: {
+    #                 status: "Enabled", # required, accepts Enabled, Disabled
+    #               },
+    #             },
     #             destination: { # required
     #               bucket: "BucketName", # required
+    #               account: "AccountId",
     #               storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #               access_control_translation: {
+    #                 owner: "Destination", # required, accepts Destination
+    #               },
+    #               encryption_configuration: {
+    #                 replica_kms_key_id: "ReplicaKmsKeyID",
+    #               },
     #             },
     #           },
     #         ],
@@ -6724,6 +6979,8 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Container for information about a particular replication rule.
+    #
     # @note When making an API call, you may pass ReplicationRule
     #   data as a hash:
     #
@@ -6731,9 +6988,21 @@ module Aws::S3
     #         id: "ID",
     #         prefix: "Prefix", # required
     #         status: "Enabled", # required, accepts Enabled, Disabled
+    #         source_selection_criteria: {
+    #           sse_kms_encrypted_objects: {
+    #             status: "Enabled", # required, accepts Enabled, Disabled
+    #           },
+    #         },
     #         destination: { # required
     #           bucket: "BucketName", # required
+    #           account: "AccountId",
     #           storage_class: "STANDARD", # accepts STANDARD, REDUCED_REDUNDANCY, STANDARD_IA
+    #           access_control_translation: {
+    #             owner: "Destination", # required, accepts Destination
+    #           },
+    #           encryption_configuration: {
+    #             replica_kms_key_id: "ReplicaKmsKeyID",
+    #           },
     #         },
     #       }
     #
@@ -6752,7 +7021,13 @@ module Aws::S3
     #   The rule is ignored if status is not Enabled.
     #   @return [String]
     #
+    # @!attribute [rw] source_selection_criteria
+    #   Container for filters that define which source objects should be
+    #   replicated.
+    #   @return [Types::SourceSelectionCriteria]
+    #
     # @!attribute [rw] destination
+    #   Container for replication destination information.
     #   @return [Types::Destination]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ReplicationRule AWS API Documentation
@@ -6761,6 +7036,7 @@ module Aws::S3
       :id,
       :prefix,
       :status,
+      :source_selection_criteria,
       :destination)
       include Aws::Structure
     end
@@ -7021,6 +7297,165 @@ module Aws::S3
       include Aws::Structure
     end
 
+    # Specifies the use of SSE-KMS to encrypt delievered Inventory reports.
+    #
+    # @note When making an API call, you may pass SSEKMS
+    #   data as a hash:
+    #
+    #       {
+    #         key_id: "SSEKMSKeyId", # required
+    #       }
+    #
+    # @!attribute [rw] key_id
+    #   Specifies the ID of the AWS Key Management Service (KMS) master
+    #   encryption key to use for encrypting Inventory reports.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SSEKMS AWS API Documentation
+    #
+    class SSEKMS < Struct.new(
+      :key_id)
+      include Aws::Structure
+    end
+
+    # Specifies the use of SSE-S3 to encrypt delievered Inventory reports.
+    #
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SSES3 AWS API Documentation
+    #
+    class SSES3 < Aws::EmptyStructure; end
+
+    # Describes the default server-side encryption to apply to new objects
+    # in the bucket. If Put Object request does not specify any server-side
+    # encryption, this default encryption will be applied.
+    #
+    # @note When making an API call, you may pass ServerSideEncryptionByDefault
+    #   data as a hash:
+    #
+    #       {
+    #         sse_algorithm: "AES256", # required, accepts AES256, aws:kms
+    #         kms_master_key_id: "SSEKMSKeyId",
+    #       }
+    #
+    # @!attribute [rw] sse_algorithm
+    #   Server-side encryption algorithm to use for the default encryption.
+    #   @return [String]
+    #
+    # @!attribute [rw] kms_master_key_id
+    #   KMS master key ID to use for the default encryption. This parameter
+    #   is allowed if SSEAlgorithm is aws:kms.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ServerSideEncryptionByDefault AWS API Documentation
+    #
+    class ServerSideEncryptionByDefault < Struct.new(
+      :sse_algorithm,
+      :kms_master_key_id)
+      include Aws::Structure
+    end
+
+    # Container for server-side encryption configuration rules. Currently S3
+    # supports one rule only.
+    #
+    # @note When making an API call, you may pass ServerSideEncryptionConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         rules: [ # required
+    #           {
+    #             apply_server_side_encryption_by_default: {
+    #               sse_algorithm: "AES256", # required, accepts AES256, aws:kms
+    #               kms_master_key_id: "SSEKMSKeyId",
+    #             },
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] rules
+    #   Container for information about a particular server-side encryption
+    #   configuration rule.
+    #   @return [Array<Types::ServerSideEncryptionRule>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ServerSideEncryptionConfiguration AWS API Documentation
+    #
+    class ServerSideEncryptionConfiguration < Struct.new(
+      :rules)
+      include Aws::Structure
+    end
+
+    # Container for information about a particular server-side encryption
+    # configuration rule.
+    #
+    # @note When making an API call, you may pass ServerSideEncryptionRule
+    #   data as a hash:
+    #
+    #       {
+    #         apply_server_side_encryption_by_default: {
+    #           sse_algorithm: "AES256", # required, accepts AES256, aws:kms
+    #           kms_master_key_id: "SSEKMSKeyId",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] apply_server_side_encryption_by_default
+    #   Describes the default server-side encryption to apply to new objects
+    #   in the bucket. If Put Object request does not specify any
+    #   server-side encryption, this default encryption will be applied.
+    #   @return [Types::ServerSideEncryptionByDefault]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ServerSideEncryptionRule AWS API Documentation
+    #
+    class ServerSideEncryptionRule < Struct.new(
+      :apply_server_side_encryption_by_default)
+      include Aws::Structure
+    end
+
+    # Container for filters that define which source objects should be
+    # replicated.
+    #
+    # @note When making an API call, you may pass SourceSelectionCriteria
+    #   data as a hash:
+    #
+    #       {
+    #         sse_kms_encrypted_objects: {
+    #           status: "Enabled", # required, accepts Enabled, Disabled
+    #         },
+    #       }
+    #
+    # @!attribute [rw] sse_kms_encrypted_objects
+    #   Container for filter information of selection of KMS Encrypted S3
+    #   objects.
+    #   @return [Types::SseKmsEncryptedObjects]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SourceSelectionCriteria AWS API Documentation
+    #
+    class SourceSelectionCriteria < Struct.new(
+      :sse_kms_encrypted_objects)
+      include Aws::Structure
+    end
+
+    # Container for filter information of selection of KMS Encrypted S3
+    # objects.
+    #
+    # @note When making an API call, you may pass SseKmsEncryptedObjects
+    #   data as a hash:
+    #
+    #       {
+    #         status: "Enabled", # required, accepts Enabled, Disabled
+    #       }
+    #
+    # @!attribute [rw] status
+    #   The replication for KMS encrypted S3 objects is disabled if status
+    #   is not Enabled.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SseKmsEncryptedObjects AWS API Documentation
+    #
+    class SseKmsEncryptedObjects < Struct.new(
+      :status)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass StorageClassAnalysis
     #   data as a hash:
     #