aws-sdk-s3 1.67.1 → 1.71.1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'thread'
 require 'set'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require 'time'
 require 'openssl'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'set'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'set'
 require 'tempfile'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     class MultipartUploadError < StandardError

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'cgi'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

data/lib/aws-sdk-s3/plugins/accelerate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/bucket_arn.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/bucket_dns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/bucket_name_restrictions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/dualstack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/expect_100_continue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/get_bucket_location_fix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/http_200_errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins
@@ -38,7 +40,8 @@ module Aws
           end
         end
 
-        handler(Handler,
+        handler(
+          Handler,
           step: :sign,
           operations: [
             :complete_multipart_upload,

data/lib/aws-sdk-s3/plugins/iad_regional_endpoint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/location_constraint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/md5s.rb

@@ -1,22 +1,19 @@
+# frozen_string_literal: true
+
 require 'openssl'
 
 module Aws
   module S3
     module Plugins
+      # @api private
+      # This plugin is effectively deprecated in favor of modeled
+      # httpChecksumRequired traits.
       class Md5s < Seahorse::Client::Plugin
-
-        # Amazon S3 requires these operations to have an MD5 checksum
-        REQUIRED_OPERATIONS = [
-          :delete_objects,
-          :put_bucket_cors,
-          :put_bucket_lifecycle,
-          :put_bucket_lifecycle_configuration,
-          :put_bucket_policy,
-          :put_bucket_replication,
-          :put_bucket_tagging,
-          :put_object_legal_hold,
-          :put_object_lock_configuration,
-          :put_object_retention
+        # These operations allow Content MD5 but are not required by
+        # httpChecksumRequired. This list should not grow.
+        OPTIONAL_OPERATIONS = [
+          :put_object,
+          :upload_part
         ]
 
         # @api private
@@ -63,20 +60,22 @@ module Aws
           default: true,
           doc_type: 'Boolean',
           docstring: <<-DOCS)
-When `true` a MD5 checksum will be computed for every request that
-sends a body.  When `false`, MD5 checksums will only be computed
-for operations that require them.  Checksum errors returned by Amazon
-S3 are automatically retried up to `:retry_limit` times.
+When `true` a MD5 checksum will be computed and sent in the Content Md5
+header for :put_object and :upload_part. When `false`, MD5 checksums
+will not be computed for these operations. Checksums are still computed
+for operations requiring them. Checksum errors returned by Amazon S3 are
+automatically retried up to `:retry_limit` times.
           DOCS
 
         def add_handlers(handlers, config)
-          # priority set low to ensure md5 is computed AFTER the request is
-          # built but before it is signed
-          handlers.add(Handler, {
-            priority: 10,
-            step: :build,
-            operations: config.compute_checksums ? nil : REQUIRED_OPERATIONS,
-          })
+          if config.compute_checksums
+            # priority set low to ensure md5 is computed AFTER the request is
+            # built but before it is signed
+            handlers.add(
+              Handler,
+              priority: 10, step: :build, operations: OPTIONAL_OPERATIONS
+            )
+          end
         end
 
       end

data/lib/aws-sdk-s3/plugins/redirects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/s3_host_id.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     module Plugins

data/lib/aws-sdk-s3/plugins/s3_signer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sigv4'
 
 module Aws

data/lib/aws-sdk-s3/plugins/sse_cpk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'openssl'
 

data/lib/aws-sdk-s3/plugins/streaming_retry.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module Aws
+  module S3
+    module Plugins
+
+      # A wrapper around BlockIO that adds no-ops for truncate and rewind
+      # @api private
+      class RetryableBlockIO
+        extend Forwardable
+        def_delegators :@block_io, :write, :read, :size
+
+        def initialize(block_io)
+          @block_io = block_io
+        end
+
+        def truncate(_integer); end
+
+        def rewind; end
+      end
+
+      # A wrapper around ManagedFile that adds no-ops for truncate and rewind
+      # @api private
+      class RetryableManagedFile
+        extend Forwardable
+        def_delegators :@file, :write, :read, :size, :open?, :close
+
+        def initialize(managed_file)
+          @file = managed_file
+        end
+
+        def truncate(_integer); end
+
+        def rewind; end
+      end
+
+      # This handler works with the ResponseTarget plugin to provide smart
+      # retries of S3 streaming operations that support the range parameter
+      # (currently only: get_object).  When a 200 OK with a TruncatedBodyError
+      # is received this handler will add a range header that excludes the
+      # data that has already been processed (written to file or sent to
+      # the target Proc).
+      # It is important to not write data to the custom target in the case of
+      # a non-success response. We do not want to write an XML error
+      # message to someone's file or pass it to a user's Proc.
+      # @api private
+      class StreamingRetry < Seahorse::Client::Plugin
+
+        class Handler < Seahorse::Client::Handler
+
+          def call(context)
+            target = context.params[:response_target] || context[:response_target]
+
+            # retry is only supported when range is NOT set on the initial request
+            if supported_target?(target) && !context.params[:range]
+              add_event_listeners(context, target)
+            end
+            @handler.call(context)
+          end
+
+          private
+
+          def add_event_listeners(context, target)
+            context.http_response.on_headers(200..299) do
+              case context.http_response.body
+              when Seahorse::Client::BlockIO then
+                context.http_response.body = RetryableBlockIO.new(context.http_response.body)
+              when Seahorse::Client::ManagedFile then
+                context.http_response.body = RetryableManagedFile.new(context.http_response.body)
+              end
+            end
+
+            context.http_response.on_headers(400..599) do
+              context.http_response.body = StringIO.new # something to write the error to
+            end
+
+            context.http_response.on_success(200..299) do
+              body = context.http_response.body
+              if body.is_a?(RetryableManagedFile) && body.open?
+                body.close
+              end
+            end
+
+            context.http_response.on_error do |error|
+              if retryable_body?(context) && truncated_body?(error)
+                context.http_request.headers[:range] = "bytes=#{context.http_response.body.size}-"
+              end
+            end
+          end
+
+          def truncated_body?(error)
+            error.is_a?(Seahorse::Client::NetworkingError) &&
+              error.original_error.is_a?(
+                Seahorse::Client::NetHttp::Handler::TruncatedBodyError
+              )
+          end
+
+          def retryable_body?(context)
+            context.http_response.body.is_a?(RetryableBlockIO) ||
+              context.http_response.body.is_a?(RetryableManagedFile)
+          end
+
+          def supported_target?(target)
+            case target
+            when Proc, String, Pathname then true
+            else false
+            end
+          end
+        end
+
+        handler(Handler, step: :sign, operations: [:get_object], priority: 10)
+
+      end
+    end
+  end
+end

data/lib/aws-sdk-s3/plugins/url_encoded_keys.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'cgi'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'base64'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     class Presigner

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -34,6 +36,7 @@ module Aws::S3
     #
     class AbortIncompleteMultipartUpload < Struct.new(
       :days_after_initiation)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -46,6 +49,7 @@ module Aws::S3
     #
     class AbortMultipartUploadOutput < Struct.new(
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -103,6 +107,7 @@ module Aws::S3
       :key,
       :upload_id,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -129,6 +134,7 @@ module Aws::S3
     #
     class AccelerateConfiguration < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -170,6 +176,7 @@ module Aws::S3
     class AccessControlPolicy < Struct.new(
       :grants,
       :owner)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -196,6 +203,7 @@ module Aws::S3
     #
     class AccessControlTranslation < Struct.new(
       :owner)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -231,6 +239,7 @@ module Aws::S3
     class AnalyticsAndOperator < Struct.new(
       :prefix,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -296,6 +305,7 @@ module Aws::S3
       :id,
       :filter,
       :storage_class_analysis)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -321,6 +331,7 @@ module Aws::S3
     #
     class AnalyticsExportDestination < Struct.new(
       :s3_bucket_destination)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -369,6 +380,7 @@ module Aws::S3
       :prefix,
       :tag,
       :and)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -416,6 +428,7 @@ module Aws::S3
       :bucket_account_id,
       :bucket,
       :prefix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -436,6 +449,7 @@ module Aws::S3
     class Bucket < Struct.new(
       :name,
       :creation_date)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -526,6 +540,7 @@ module Aws::S3
     #
     class BucketLifecycleConfiguration < Struct.new(
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -568,6 +583,7 @@ module Aws::S3
     #
     class BucketLoggingStatus < Struct.new(
       :logging_enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -604,6 +620,7 @@ module Aws::S3
     #
     class CORSConfiguration < Struct.new(
       :cors_rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -656,6 +673,7 @@ module Aws::S3
       :allowed_origins,
       :expose_headers,
       :max_age_seconds)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -741,6 +759,7 @@ module Aws::S3
       :field_delimiter,
       :quote_character,
       :allow_quoted_record_delimiter)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -796,6 +815,7 @@ module Aws::S3
       :record_delimiter,
       :field_delimiter,
       :quote_character)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -843,6 +863,7 @@ module Aws::S3
       :events,
       :cloud_function,
       :invocation_role)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -860,6 +881,7 @@ module Aws::S3
     #
     class CommonPrefix < Struct.new(
       :prefix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -927,6 +949,7 @@ module Aws::S3
       :version_id,
       :ssekms_key_id,
       :request_charged)
+      SENSITIVE = [:ssekms_key_id]
       include Aws::Structure
     end
 
@@ -984,6 +1007,7 @@ module Aws::S3
       :multipart_upload,
       :upload_id,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1009,6 +1033,7 @@ module Aws::S3
     #
     class CompletedMultipartUpload < Struct.new(
       :parts)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1036,6 +1061,7 @@ module Aws::S3
     class CompletedPart < Struct.new(
       :etag,
       :part_number)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1078,6 +1104,7 @@ module Aws::S3
     class Condition < Struct.new(
       :http_error_code_returned_equals,
       :key_prefix_equals)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1085,6 +1112,7 @@ module Aws::S3
     #
     class ContinuationEvent < Struct.new(
       :event_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1154,6 +1182,7 @@ module Aws::S3
       :ssekms_key_id,
       :ssekms_encryption_context,
       :request_charged)
+      SENSITIVE = [:ssekms_key_id, :ssekms_encryption_context]
       include Aws::Structure
     end
 
@@ -1438,6 +1467,7 @@ module Aws::S3
       :object_lock_mode,
       :object_lock_retain_until_date,
       :object_lock_legal_hold_status)
+      SENSITIVE = [:sse_customer_key, :ssekms_key_id, :ssekms_encryption_context, :copy_source_sse_customer_key]
       include Aws::Structure
     end
 
@@ -1458,6 +1488,7 @@ module Aws::S3
     class CopyObjectResult < Struct.new(
       :etag,
       :last_modified)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1476,6 +1507,7 @@ module Aws::S3
     class CopyPartResult < Struct.new(
       :etag,
       :last_modified)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1498,6 +1530,7 @@ module Aws::S3
     #
     class CreateBucketConfiguration < Struct.new(
       :location_constraint)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1511,6 +1544,7 @@ module Aws::S3
     #
     class CreateBucketOutput < Struct.new(
       :location)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1582,6 +1616,7 @@ module Aws::S3
       :grant_write,
       :grant_write_acp,
       :object_lock_enabled_for_bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1684,6 +1719,7 @@ module Aws::S3
       :ssekms_key_id,
       :ssekms_encryption_context,
       :request_charged)
+      SENSITIVE = [:ssekms_key_id, :ssekms_encryption_context]
       include Aws::Structure
     end
 
@@ -1897,6 +1933,7 @@ module Aws::S3
       :object_lock_mode,
       :object_lock_retain_until_date,
       :object_lock_legal_hold_status)
+      SENSITIVE = [:sse_customer_key, :ssekms_key_id, :ssekms_encryption_context]
       include Aws::Structure
     end
 
@@ -1933,6 +1970,7 @@ module Aws::S3
       :mode,
       :days,
       :years)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1965,6 +2003,7 @@ module Aws::S3
     class Delete < Struct.new(
       :objects,
       :quiet)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -1990,6 +2029,7 @@ module Aws::S3
     class DeleteBucketAnalyticsConfigurationRequest < Struct.new(
       :bucket,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2008,6 +2048,7 @@ module Aws::S3
     #
     class DeleteBucketCorsRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2027,6 +2068,7 @@ module Aws::S3
     #
     class DeleteBucketEncryptionRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2052,6 +2094,7 @@ module Aws::S3
     class DeleteBucketInventoryConfigurationRequest < Struct.new(
       :bucket,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2070,6 +2113,7 @@ module Aws::S3
     #
     class DeleteBucketLifecycleRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2095,6 +2139,7 @@ module Aws::S3
     class DeleteBucketMetricsConfigurationRequest < Struct.new(
       :bucket,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2113,6 +2158,7 @@ module Aws::S3
     #
     class DeleteBucketPolicyRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2131,6 +2177,7 @@ module Aws::S3
     #
     class DeleteBucketReplicationRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2149,6 +2196,7 @@ module Aws::S3
     #
     class DeleteBucketRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2167,6 +2215,7 @@ module Aws::S3
     #
     class DeleteBucketTaggingRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2186,6 +2235,7 @@ module Aws::S3
     #
     class DeleteBucketWebsiteRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2220,6 +2270,7 @@ module Aws::S3
       :version_id,
       :is_latest,
       :last_modified)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2263,6 +2314,7 @@ module Aws::S3
     #
     class DeleteMarkerReplication < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2287,6 +2339,7 @@ module Aws::S3
       :delete_marker,
       :version_id,
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2360,6 +2413,7 @@ module Aws::S3
       :version_id,
       :request_payer,
       :bypass_governance_retention)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2371,6 +2425,7 @@ module Aws::S3
     #
     class DeleteObjectTaggingOutput < Struct.new(
       :version_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2415,6 +2470,7 @@ module Aws::S3
       :bucket,
       :key,
       :version_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2439,6 +2495,7 @@ module Aws::S3
       :deleted,
       :request_charged,
       :errors)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2515,6 +2572,7 @@ module Aws::S3
       :mfa,
       :request_payer,
       :bypass_governance_retention)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2534,6 +2592,7 @@ module Aws::S3
     #
     class DeletePublicAccessBlockRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2568,6 +2627,7 @@ module Aws::S3
       :version_id,
       :delete_marker,
       :delete_marker_version_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2673,6 +2733,7 @@ module Aws::S3
       :encryption_configuration,
       :replication_time,
       :metrics)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2715,6 +2776,7 @@ module Aws::S3
       :encryption_type,
       :kms_key_id,
       :kms_context)
+      SENSITIVE = [:kms_key_id]
       include Aws::Structure
     end
 
@@ -2745,6 +2807,7 @@ module Aws::S3
     #
     class EncryptionConfiguration < Struct.new(
       :replica_kms_key_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -2756,6 +2819,7 @@ module Aws::S3
     #
     class EndEvent < Struct.new(
       :event_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3585,6 +3649,7 @@ module Aws::S3
       :version_id,
       :code,
       :message)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3605,6 +3670,7 @@ module Aws::S3
     #
     class ErrorDocument < Struct.new(
       :key)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3627,6 +3693,7 @@ module Aws::S3
     #
     class ExistingObjectReplication < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3662,6 +3729,7 @@ module Aws::S3
     class FilterRule < Struct.new(
       :name,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3673,6 +3741,7 @@ module Aws::S3
     #
     class GetBucketAccelerateConfigurationOutput < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3692,6 +3761,7 @@ module Aws::S3
     #
     class GetBucketAccelerateConfigurationRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3708,6 +3778,7 @@ module Aws::S3
     class GetBucketAclOutput < Struct.new(
       :owner,
       :grants)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3726,6 +3797,7 @@ module Aws::S3
     #
     class GetBucketAclRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3737,6 +3809,7 @@ module Aws::S3
     #
     class GetBucketAnalyticsConfigurationOutput < Struct.new(
       :analytics_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3762,6 +3835,7 @@ module Aws::S3
     class GetBucketAnalyticsConfigurationRequest < Struct.new(
       :bucket,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3774,6 +3848,7 @@ module Aws::S3
     #
     class GetBucketCorsOutput < Struct.new(
       :cors_rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3792,6 +3867,7 @@ module Aws::S3
     #
     class GetBucketCorsRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3803,6 +3879,7 @@ module Aws::S3
     #
     class GetBucketEncryptionOutput < Struct.new(
       :server_side_encryption_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3822,6 +3899,7 @@ module Aws::S3
     #
     class GetBucketEncryptionRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3833,6 +3911,7 @@ module Aws::S3
     #
     class GetBucketInventoryConfigurationOutput < Struct.new(
       :inventory_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3858,6 +3937,7 @@ module Aws::S3
     class GetBucketInventoryConfigurationRequest < Struct.new(
       :bucket,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3869,6 +3949,7 @@ module Aws::S3
     #
     class GetBucketLifecycleConfigurationOutput < Struct.new(
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3887,6 +3968,7 @@ module Aws::S3
     #
     class GetBucketLifecycleConfigurationRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3898,6 +3980,7 @@ module Aws::S3
     #
     class GetBucketLifecycleOutput < Struct.new(
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3916,6 +3999,7 @@ module Aws::S3
     #
     class GetBucketLifecycleRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3934,6 +4018,7 @@ module Aws::S3
     #
     class GetBucketLocationOutput < Struct.new(
       :location_constraint)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3952,6 +4037,7 @@ module Aws::S3
     #
     class GetBucketLocationRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3970,6 +4056,7 @@ module Aws::S3
     #
     class GetBucketLoggingOutput < Struct.new(
       :logging_enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3988,6 +4075,7 @@ module Aws::S3
     #
     class GetBucketLoggingRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -3999,6 +4087,7 @@ module Aws::S3
     #
     class GetBucketMetricsConfigurationOutput < Struct.new(
       :metrics_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4024,6 +4113,7 @@ module Aws::S3
     class GetBucketMetricsConfigurationRequest < Struct.new(
       :bucket,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4042,6 +4132,7 @@ module Aws::S3
     #
     class GetBucketNotificationConfigurationRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4053,6 +4144,7 @@ module Aws::S3
     #
     class GetBucketPolicyOutput < Struct.new(
       :policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4071,6 +4163,7 @@ module Aws::S3
     #
     class GetBucketPolicyRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4082,6 +4175,7 @@ module Aws::S3
     #
     class GetBucketPolicyStatusOutput < Struct.new(
       :policy_status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4101,6 +4195,7 @@ module Aws::S3
     #
     class GetBucketPolicyStatusRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4113,6 +4208,7 @@ module Aws::S3
     #
     class GetBucketReplicationOutput < Struct.new(
       :replication_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4131,6 +4227,7 @@ module Aws::S3
     #
     class GetBucketReplicationRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4142,6 +4239,7 @@ module Aws::S3
     #
     class GetBucketRequestPaymentOutput < Struct.new(
       :payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4161,6 +4259,7 @@ module Aws::S3
     #
     class GetBucketRequestPaymentRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4172,6 +4271,7 @@ module Aws::S3
     #
     class GetBucketTaggingOutput < Struct.new(
       :tag_set)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4190,6 +4290,7 @@ module Aws::S3
     #
     class GetBucketTaggingRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4209,6 +4310,7 @@ module Aws::S3
     class GetBucketVersioningOutput < Struct.new(
       :status,
       :mfa_delete)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4227,6 +4329,7 @@ module Aws::S3
     #
     class GetBucketVersioningRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4257,6 +4360,7 @@ module Aws::S3
       :index_document,
       :error_document,
       :routing_rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4275,6 +4379,7 @@ module Aws::S3
     #
     class GetBucketWebsiteRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4297,6 +4402,7 @@ module Aws::S3
       :owner,
       :grants,
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4355,6 +4461,7 @@ module Aws::S3
       :key,
       :version_id,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4366,6 +4473,7 @@ module Aws::S3
     #
     class GetObjectLegalHoldOutput < Struct.new(
       :legal_hold)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4426,6 +4534,7 @@ module Aws::S3
       :key,
       :version_id,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4437,6 +4546,7 @@ module Aws::S3
     #
     class GetObjectLockConfigurationOutput < Struct.new(
       :object_lock_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4455,6 +4565,7 @@ module Aws::S3
     #
     class GetObjectLockConfigurationRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4650,6 +4761,7 @@ module Aws::S3
       :object_lock_mode,
       :object_lock_retain_until_date,
       :object_lock_legal_hold_status)
+      SENSITIVE = [:ssekms_key_id]
       include Aws::Structure
     end
 
@@ -4822,6 +4934,7 @@ module Aws::S3
       :sse_customer_key_md5,
       :request_payer,
       :part_number)
+      SENSITIVE = [:sse_customer_key]
       include Aws::Structure
     end
 
@@ -4833,6 +4946,7 @@ module Aws::S3
     #
     class GetObjectRetentionOutput < Struct.new(
       :retention)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4893,6 +5007,7 @@ module Aws::S3
       :key,
       :version_id,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4910,6 +5025,7 @@ module Aws::S3
     class GetObjectTaggingOutput < Struct.new(
       :version_id,
       :tag_set)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4955,6 +5071,7 @@ module Aws::S3
       :bucket,
       :key,
       :version_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -4972,6 +5089,7 @@ module Aws::S3
     class GetObjectTorrentOutput < Struct.new(
       :body,
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5011,6 +5129,7 @@ module Aws::S3
       :bucket,
       :key,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5023,6 +5142,7 @@ module Aws::S3
     #
     class GetPublicAccessBlockOutput < Struct.new(
       :public_access_block_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5042,6 +5162,7 @@ module Aws::S3
     #
     class GetPublicAccessBlockRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5062,6 +5183,7 @@ module Aws::S3
     #
     class GlacierJobParameters < Struct.new(
       :tier)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5094,6 +5216,7 @@ module Aws::S3
     class Grant < Struct.new(
       :grantee,
       :permission)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5166,6 +5289,7 @@ module Aws::S3
       :id,
       :type,
       :uri)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5184,6 +5308,7 @@ module Aws::S3
     #
     class HeadBucketRequest < Struct.new(
       :bucket)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5437,6 +5562,7 @@ module Aws::S3
       :object_lock_mode,
       :object_lock_retain_until_date,
       :object_lock_legal_hold_status)
+      SENSITIVE = [:ssekms_key_id]
       include Aws::Structure
     end
 
@@ -5556,6 +5682,7 @@ module Aws::S3
       :sse_customer_key_md5,
       :request_payer,
       :part_number)
+      SENSITIVE = [:sse_customer_key]
       include Aws::Structure
     end
 
@@ -5580,6 +5707,7 @@ module Aws::S3
     #
     class IndexDocument < Struct.new(
       :suffix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5599,6 +5727,7 @@ module Aws::S3
     class Initiator < Struct.new(
       :id,
       :display_name)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5649,6 +5778,7 @@ module Aws::S3
       :compression_type,
       :json,
       :parquet)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5737,6 +5867,7 @@ module Aws::S3
       :included_object_versions,
       :optional_fields,
       :schedule)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5770,6 +5901,7 @@ module Aws::S3
     #
     class InventoryDestination < Struct.new(
       :s3_bucket_destination)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5800,6 +5932,7 @@ module Aws::S3
     class InventoryEncryption < Struct.new(
       :sses3,
       :ssekms)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5822,6 +5955,7 @@ module Aws::S3
     #
     class InventoryFilter < Struct.new(
       :prefix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5882,6 +6016,7 @@ module Aws::S3
       :format,
       :prefix,
       :encryption)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5902,6 +6037,7 @@ module Aws::S3
     #
     class InventorySchedule < Struct.new(
       :frequency)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5922,6 +6058,7 @@ module Aws::S3
     #
     class JSONInput < Struct.new(
       :type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -5943,6 +6080,7 @@ module Aws::S3
     #
     class JSONOutput < Struct.new(
       :record_delimiter)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6006,6 +6144,7 @@ module Aws::S3
       :lambda_function_arn,
       :events,
       :filter)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6052,6 +6191,7 @@ module Aws::S3
     #
     class LifecycleConfiguration < Struct.new(
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6089,6 +6229,7 @@ module Aws::S3
       :date,
       :days,
       :expired_object_delete_marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6216,6 +6357,7 @@ module Aws::S3
       :noncurrent_version_transitions,
       :noncurrent_version_expiration,
       :abort_incomplete_multipart_upload)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6250,6 +6392,7 @@ module Aws::S3
     class LifecycleRuleAndOperator < Struct.new(
       :prefix,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6298,6 +6441,7 @@ module Aws::S3
       :prefix,
       :tag,
       :and)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6332,6 +6476,7 @@ module Aws::S3
       :continuation_token,
       :next_continuation_token,
       :analytics_configuration_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6358,6 +6503,7 @@ module Aws::S3
     class ListBucketAnalyticsConfigurationsRequest < Struct.new(
       :bucket,
       :continuation_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6390,6 +6536,7 @@ module Aws::S3
       :inventory_configuration_list,
       :is_truncated,
       :next_continuation_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6418,6 +6565,7 @@ module Aws::S3
     class ListBucketInventoryConfigurationsRequest < Struct.new(
       :bucket,
       :continuation_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6452,6 +6600,7 @@ module Aws::S3
       :continuation_token,
       :next_continuation_token,
       :metrics_configuration_list)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6480,6 +6629,7 @@ module Aws::S3
     class ListBucketMetricsConfigurationsRequest < Struct.new(
       :bucket,
       :continuation_token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6496,6 +6646,7 @@ module Aws::S3
     class ListBucketsOutput < Struct.new(
       :buckets,
       :owner)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6585,6 +6736,7 @@ module Aws::S3
       :uploads,
       :common_prefixes,
       :encoding_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6685,6 +6837,7 @@ module Aws::S3
       :max_uploads,
       :prefix,
       :upload_id_marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6780,6 +6933,7 @@ module Aws::S3
       :max_keys,
       :common_prefixes,
       :encoding_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6868,6 +7022,7 @@ module Aws::S3
       :max_keys,
       :prefix,
       :version_id_marker)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -6953,6 +7108,7 @@ module Aws::S3
       :max_keys,
       :common_prefixes,
       :encoding_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7016,6 +7172,7 @@ module Aws::S3
       :max_keys,
       :prefix,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7134,6 +7291,7 @@ module Aws::S3
       :continuation_token,
       :next_continuation_token,
       :start_after)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7224,6 +7382,7 @@ module Aws::S3
       :fetch_owner,
       :start_after,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7332,6 +7491,7 @@ module Aws::S3
       :owner,
       :storage_class,
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7403,6 +7563,7 @@ module Aws::S3
       :part_number_marker,
       :upload_id,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7461,6 +7622,7 @@ module Aws::S3
       :target_bucket,
       :target_grants,
       :target_prefix)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7487,6 +7649,7 @@ module Aws::S3
     class MetadataEntry < Struct.new(
       :name,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7518,6 +7681,7 @@ module Aws::S3
     class Metrics < Struct.new(
       :status,
       :event_threshold)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7552,6 +7716,7 @@ module Aws::S3
     class MetricsAndOperator < Struct.new(
       :prefix,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7605,6 +7770,7 @@ module Aws::S3
     class MetricsConfiguration < Struct.new(
       :id,
       :filter)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7653,6 +7819,7 @@ module Aws::S3
       :prefix,
       :tag,
       :and)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7692,6 +7859,7 @@ module Aws::S3
       :storage_class,
       :owner,
       :initiator)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7742,6 +7910,7 @@ module Aws::S3
     #
     class NoncurrentVersionExpiration < Struct.new(
       :noncurrent_days)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7783,6 +7952,7 @@ module Aws::S3
     class NoncurrentVersionTransition < Struct.new(
       :noncurrent_days,
       :storage_class)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7868,6 +8038,7 @@ module Aws::S3
       :topic_configurations,
       :queue_configurations,
       :lambda_function_configurations)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7919,6 +8090,7 @@ module Aws::S3
       :topic_configuration,
       :queue_configuration,
       :cloud_function_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7952,6 +8124,7 @@ module Aws::S3
     #
     class NotificationConfigurationFilter < Struct.new(
       :key)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -7992,6 +8165,7 @@ module Aws::S3
       :size,
       :storage_class,
       :owner)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8024,6 +8198,7 @@ module Aws::S3
     class ObjectIdentifier < Struct.new(
       :key,
       :version_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8057,6 +8232,7 @@ module Aws::S3
     class ObjectLockConfiguration < Struct.new(
       :object_lock_enabled,
       :rule)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8077,6 +8253,7 @@ module Aws::S3
     #
     class ObjectLockLegalHold < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8103,6 +8280,7 @@ module Aws::S3
     class ObjectLockRetention < Struct.new(
       :mode,
       :retain_until_date)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8128,6 +8306,7 @@ module Aws::S3
     #
     class ObjectLockRule < Struct.new(
       :default_retention)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8184,6 +8363,7 @@ module Aws::S3
       :is_latest,
       :last_modified,
       :owner)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8241,6 +8421,7 @@ module Aws::S3
     #
     class OutputLocation < Struct.new(
       :s3)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8275,6 +8456,7 @@ module Aws::S3
     class OutputSerialization < Struct.new(
       :csv,
       :json)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8301,6 +8483,7 @@ module Aws::S3
     class Owner < Struct.new(
       :display_name,
       :id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8338,6 +8521,7 @@ module Aws::S3
       :last_modified,
       :etag,
       :size)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8352,6 +8536,7 @@ module Aws::S3
     #
     class PolicyStatus < Struct.new(
       :is_public)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8375,6 +8560,7 @@ module Aws::S3
       :bytes_scanned,
       :bytes_processed,
       :bytes_returned)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8390,6 +8576,7 @@ module Aws::S3
     class ProgressEvent < Struct.new(
       :details,
       :event_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8466,6 +8653,7 @@ module Aws::S3
       :ignore_public_acls,
       :block_public_policy,
       :restrict_public_buckets)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8492,6 +8680,7 @@ module Aws::S3
     class PutBucketAccelerateConfigurationRequest < Struct.new(
       :bucket,
       :accelerate_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8585,6 +8774,7 @@ module Aws::S3
       :grant_read_acp,
       :grant_write,
       :grant_write_acp)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8647,6 +8837,7 @@ module Aws::S3
       :bucket,
       :id,
       :analytics_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8701,6 +8892,7 @@ module Aws::S3
       :bucket,
       :cors_configuration,
       :content_md5)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8751,6 +8943,7 @@ module Aws::S3
       :bucket,
       :content_md5,
       :server_side_encryption_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8808,6 +9001,7 @@ module Aws::S3
       :bucket,
       :id,
       :inventory_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8880,6 +9074,7 @@ module Aws::S3
     class PutBucketLifecycleConfigurationRequest < Struct.new(
       :bucket,
       :lifecycle_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8935,6 +9130,7 @@ module Aws::S3
       :bucket,
       :content_md5,
       :lifecycle_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -8982,6 +9178,7 @@ module Aws::S3
       :bucket,
       :bucket_logging_status,
       :content_md5)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9030,6 +9227,7 @@ module Aws::S3
       :bucket,
       :id,
       :metrics_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9108,6 +9306,7 @@ module Aws::S3
     class PutBucketNotificationConfigurationRequest < Struct.new(
       :bucket,
       :notification_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9158,6 +9357,7 @@ module Aws::S3
       :bucket,
       :content_md5,
       :notification_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9195,6 +9395,7 @@ module Aws::S3
       :content_md5,
       :confirm_remove_self_bucket_access,
       :policy)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9298,6 +9499,7 @@ module Aws::S3
       :content_md5,
       :replication_configuration,
       :token)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9337,6 +9539,7 @@ module Aws::S3
       :bucket,
       :content_md5,
       :request_payment_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9381,6 +9584,7 @@ module Aws::S3
       :bucket,
       :content_md5,
       :tagging)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9429,6 +9633,7 @@ module Aws::S3
       :content_md5,
       :mfa,
       :versioning_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9492,6 +9697,7 @@ module Aws::S3
       :bucket,
       :content_md5,
       :website_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9504,6 +9710,7 @@ module Aws::S3
     #
     class PutObjectAclOutput < Struct.new(
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9642,6 +9849,7 @@ module Aws::S3
       :key,
       :request_payer,
       :version_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9654,6 +9862,7 @@ module Aws::S3
     #
     class PutObjectLegalHoldOutput < Struct.new(
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9727,6 +9936,7 @@ module Aws::S3
       :request_payer,
       :version_id,
       :content_md5)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9739,6 +9949,7 @@ module Aws::S3
     #
     class PutObjectLockConfigurationOutput < Struct.new(
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9800,6 +10011,7 @@ module Aws::S3
       :request_payer,
       :token,
       :content_md5)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -9870,6 +10082,7 @@ module Aws::S3
       :ssekms_key_id,
       :ssekms_encryption_context,
       :request_charged)
+      SENSITIVE = [:ssekms_key_id, :ssekms_encryption_context]
       include Aws::Structure
     end
 
@@ -10192,6 +10405,7 @@ module Aws::S3
       :object_lock_mode,
       :object_lock_retain_until_date,
       :object_lock_legal_hold_status)
+      SENSITIVE = [:sse_customer_key, :ssekms_key_id, :ssekms_encryption_context]
       include Aws::Structure
     end
 
@@ -10204,6 +10418,7 @@ module Aws::S3
     #
     class PutObjectRetentionOutput < Struct.new(
       :request_charged)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10286,6 +10501,7 @@ module Aws::S3
       :version_id,
       :bypass_governance_retention,
       :content_md5)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10297,6 +10513,7 @@ module Aws::S3
     #
     class PutObjectTaggingOutput < Struct.new(
       :version_id)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10359,6 +10576,7 @@ module Aws::S3
       :version_id,
       :content_md5,
       :tagging)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10403,6 +10621,7 @@ module Aws::S3
       :bucket,
       :content_md5,
       :public_access_block_configuration)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10462,6 +10681,7 @@ module Aws::S3
       :queue_arn,
       :events,
       :filter)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10507,6 +10727,7 @@ module Aws::S3
       :event,
       :events,
       :queue)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10521,6 +10742,7 @@ module Aws::S3
     class RecordsEvent < Struct.new(
       :payload,
       :event_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10577,6 +10799,7 @@ module Aws::S3
       :protocol,
       :replace_key_prefix_with,
       :replace_key_with)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10605,6 +10828,7 @@ module Aws::S3
     class RedirectAllRequestsTo < Struct.new(
       :host_name,
       :protocol)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10698,6 +10922,7 @@ module Aws::S3
     class ReplicationConfiguration < Struct.new(
       :role,
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10856,6 +11081,7 @@ module Aws::S3
       :existing_object_replication,
       :destination,
       :delete_marker_replication)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10898,6 +11124,7 @@ module Aws::S3
     class ReplicationRuleAndOperator < Struct.new(
       :prefix,
       :tags)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10954,6 +11181,7 @@ module Aws::S3
       :prefix,
       :tag,
       :and)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -10986,6 +11214,7 @@ module Aws::S3
     class ReplicationTime < Struct.new(
       :status,
       :time)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11009,6 +11238,7 @@ module Aws::S3
     #
     class ReplicationTimeValue < Struct.new(
       :minutes)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11029,6 +11259,7 @@ module Aws::S3
     #
     class RequestPaymentConfiguration < Struct.new(
       :payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11051,6 +11282,7 @@ module Aws::S3
     #
     class RequestProgress < Struct.new(
       :enabled)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11069,6 +11301,7 @@ module Aws::S3
     class RestoreObjectOutput < Struct.new(
       :request_charged,
       :restore_output_path)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11212,6 +11445,7 @@ module Aws::S3
       :version_id,
       :restore_request,
       :request_payer)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11342,6 +11576,7 @@ module Aws::S3
       :description,
       :select_parameters,
       :output_location)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11383,6 +11618,7 @@ module Aws::S3
     class RoutingRule < Struct.new(
       :condition,
       :redirect)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11498,6 +11734,7 @@ module Aws::S3
       :noncurrent_version_transition,
       :noncurrent_version_expiration,
       :abort_incomplete_multipart_upload)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11524,6 +11761,7 @@ module Aws::S3
     #
     class S3KeyFilter < Struct.new(
       :filter_rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11615,6 +11853,7 @@ module Aws::S3
       :tagging,
       :user_metadata,
       :storage_class)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11637,6 +11876,7 @@ module Aws::S3
     #
     class SSEKMS < Struct.new(
       :key_id)
+      SENSITIVE = [:key_id]
       include Aws::Structure
     end
 
@@ -11684,6 +11924,7 @@ module Aws::S3
     class ScanRange < Struct.new(
       :start,
       :end)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11695,6 +11936,7 @@ module Aws::S3
     #
     class SelectObjectContentOutput < Struct.new(
       :payload)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11853,6 +12095,7 @@ module Aws::S3
       :input_serialization,
       :output_serialization,
       :scan_range)
+      SENSITIVE = [:sse_customer_key]
       include Aws::Structure
     end
 
@@ -11918,6 +12161,7 @@ module Aws::S3
       :expression_type,
       :expression,
       :output_serialization)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -11975,6 +12219,7 @@ module Aws::S3
     class ServerSideEncryptionByDefault < Struct.new(
       :sse_algorithm,
       :kms_master_key_id)
+      SENSITIVE = [:kms_master_key_id]
       include Aws::Structure
     end
 
@@ -12003,6 +12248,7 @@ module Aws::S3
     #
     class ServerSideEncryptionConfiguration < Struct.new(
       :rules)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12028,6 +12274,7 @@ module Aws::S3
     #
     class ServerSideEncryptionRule < Struct.new(
       :apply_server_side_encryption_by_default)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12058,6 +12305,7 @@ module Aws::S3
     #
     class SourceSelectionCriteria < Struct.new(
       :sse_kms_encrypted_objects)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12081,6 +12329,7 @@ module Aws::S3
     #
     class SseKmsEncryptedObjects < Struct.new(
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12104,6 +12353,7 @@ module Aws::S3
       :bytes_scanned,
       :bytes_processed,
       :bytes_returned)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12118,6 +12368,7 @@ module Aws::S3
     class StatsEvent < Struct.new(
       :details,
       :event_type)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12151,6 +12402,7 @@ module Aws::S3
     #
     class StorageClassAnalysis < Struct.new(
       :data_export)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12186,6 +12438,7 @@ module Aws::S3
     class StorageClassAnalysisDataExport < Struct.new(
       :output_schema_version,
       :destination)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12212,6 +12465,7 @@ module Aws::S3
     class Tag < Struct.new(
       :key,
       :value)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12237,6 +12491,7 @@ module Aws::S3
     #
     class Tagging < Struct.new(
       :tag_set)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12269,6 +12524,7 @@ module Aws::S3
     class TargetGrant < Struct.new(
       :grantee,
       :permission)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12334,6 +12590,7 @@ module Aws::S3
       :topic_arn,
       :events,
       :filter)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12378,6 +12635,7 @@ module Aws::S3
       :events,
       :event,
       :topic)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12421,6 +12679,7 @@ module Aws::S3
       :date,
       :days,
       :storage_class)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12472,6 +12731,7 @@ module Aws::S3
       :sse_customer_key_md5,
       :ssekms_key_id,
       :request_charged)
+      SENSITIVE = [:ssekms_key_id]
       include Aws::Structure
     end
 
@@ -12618,6 +12878,7 @@ module Aws::S3
       :copy_source_sse_customer_key,
       :copy_source_sse_customer_key_md5,
       :request_payer)
+      SENSITIVE = [:sse_customer_key, :copy_source_sse_customer_key]
       include Aws::Structure
     end
 
@@ -12663,6 +12924,7 @@ module Aws::S3
       :sse_customer_key_md5,
       :ssekms_key_id,
       :request_charged)
+      SENSITIVE = [:ssekms_key_id]
       include Aws::Structure
     end
 
@@ -12763,6 +13025,7 @@ module Aws::S3
       :sse_customer_key,
       :sse_customer_key_md5,
       :request_payer)
+      SENSITIVE = [:sse_customer_key]
       include Aws::Structure
     end
 
@@ -12798,6 +13061,7 @@ module Aws::S3
     class VersioningConfiguration < Struct.new(
       :mfa_delete,
       :status)
+      SENSITIVE = []
       include Aws::Structure
     end
 
@@ -12861,6 +13125,7 @@ module Aws::S3
       :index_document,
       :redirect_all_requests_to,
       :routing_rules)
+      SENSITIVE = []
       include Aws::Structure
     end