aws-sdk-s3control 1.25.0 → 1.30.0

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -197,6 +197,7 @@ module Aws::S3Control
     S3CannedAccessControlList = Shapes::StringShape.new(name: 'S3CannedAccessControlList')
     S3ContentLength = Shapes::IntegerShape.new(name: 'S3ContentLength')
     S3CopyObjectOperation = Shapes::StructureShape.new(name: 'S3CopyObjectOperation')
+    S3DeleteObjectTaggingOperation = Shapes::StructureShape.new(name: 'S3DeleteObjectTaggingOperation')
     S3ExpirationInDays = Shapes::IntegerShape.new(name: 'S3ExpirationInDays')
     S3GlacierJobTier = Shapes::StringShape.new(name: 'S3GlacierJobTier')
     S3Grant = Shapes::StructureShape.new(name: 'S3Grant')
@@ -550,6 +551,7 @@ module Aws::S3Control
     JobOperation.add_member(:s3_put_object_copy, Shapes::ShapeRef.new(shape: S3CopyObjectOperation, location_name: "S3PutObjectCopy", metadata: {"box"=>true}))
     JobOperation.add_member(:s3_put_object_acl, Shapes::ShapeRef.new(shape: S3SetObjectAclOperation, location_name: "S3PutObjectAcl", metadata: {"box"=>true}))
     JobOperation.add_member(:s3_put_object_tagging, Shapes::ShapeRef.new(shape: S3SetObjectTaggingOperation, location_name: "S3PutObjectTagging", metadata: {"box"=>true}))
+    JobOperation.add_member(:s3_delete_object_tagging, Shapes::ShapeRef.new(shape: S3DeleteObjectTaggingOperation, location_name: "S3DeleteObjectTagging", metadata: {"box"=>true}))
     JobOperation.add_member(:s3_initiate_restore_object, Shapes::ShapeRef.new(shape: S3InitiateRestoreObjectOperation, location_name: "S3InitiateRestoreObject", metadata: {"box"=>true}))
     JobOperation.add_member(:s3_put_object_legal_hold, Shapes::ShapeRef.new(shape: S3SetObjectLegalHoldOperation, location_name: "S3PutObjectLegalHold", metadata: {"box"=>true}))
     JobOperation.add_member(:s3_put_object_retention, Shapes::ShapeRef.new(shape: S3SetObjectRetentionOperation, location_name: "S3PutObjectRetention", metadata: {"box"=>true}))
@@ -775,6 +777,8 @@ module Aws::S3Control
     S3CopyObjectOperation.add_member(:object_lock_retain_until_date, Shapes::ShapeRef.new(shape: TimeStamp, location_name: "ObjectLockRetainUntilDate"))
     S3CopyObjectOperation.struct_class = Types::S3CopyObjectOperation
 
+    S3DeleteObjectTaggingOperation.struct_class = Types::S3DeleteObjectTaggingOperation
+
     S3Grant.add_member(:grantee, Shapes::ShapeRef.new(shape: S3Grantee, location_name: "Grantee"))
     S3Grant.add_member(:permission, Shapes::ShapeRef.new(shape: S3Permission, location_name: "Permission"))
     S3Grant.struct_class = Types::S3Grant
@@ -786,7 +790,7 @@ module Aws::S3Control
     S3Grantee.add_member(:display_name, Shapes::ShapeRef.new(shape: NonEmptyMaxLength1024String, location_name: "DisplayName"))
     S3Grantee.struct_class = Types::S3Grantee
 
-    S3InitiateRestoreObjectOperation.add_member(:expiration_in_days, Shapes::ShapeRef.new(shape: S3ExpirationInDays, location_name: "ExpirationInDays"))
+    S3InitiateRestoreObjectOperation.add_member(:expiration_in_days, Shapes::ShapeRef.new(shape: S3ExpirationInDays, location_name: "ExpirationInDays", metadata: {"box"=>true}))
     S3InitiateRestoreObjectOperation.add_member(:glacier_job_tier, Shapes::ShapeRef.new(shape: S3GlacierJobTier, location_name: "GlacierJobTier"))
     S3InitiateRestoreObjectOperation.struct_class = Types::S3InitiateRestoreObjectOperation
 

data/lib/aws-sdk-s3control/errors.rb

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

data/lib/aws-sdk-s3control/plugins/arn.rb

@@ -31,6 +31,7 @@ client's region instead.
           handlers.add(UrlHandler)
         end
 
+        # After extracting out any ARN input, resolve a new URL with it.
         class UrlHandler < Seahorse::Client::Handler
           def call(context)
             if context.metadata[:s3_arn]
@@ -38,13 +39,18 @@ client's region instead.
                 context.http_request.endpoint,
                 context.metadata[:s3_arn][:arn],
                 context.metadata[:s3_arn][:resolved_region],
-                context.metadata[:s3_arn][:dualstack]
+                context.metadata[:s3_arn][:dualstack],
+                # if regional_endpoint is false, a custom endpoint was provided
+                # in this case, we want to prefix the endpoint using the ARN
+                !context.config.regional_endpoint
               )
             end
             @handler.call(context)
           end
         end
 
+        # This plugin will extract out any ARN input and set context for other
+        # plugins to use without having to translate the ARN again.
         class ARNHandler < Seahorse::Client::Handler
           def call(context)
             arn_member = _arn_member(context.operation.input.shape)
@@ -54,6 +60,7 @@ client's region instead.
                 context.config.region,
                 context.config.s3_use_arn_region
               )
+              validate_outpost_dualstack!(context)
               if arn
                 validate_config!(context, arn)
 
@@ -68,7 +75,6 @@ client's region instead.
                 # depending on the ARN's resource type, put the resource value
                 # back onto params
                 context.params[arn_member] = arn.input_member
-
                 context.metadata[:s3_arn] = {
                   arn: arn,
                   resolved_region: resolved_region,
@@ -81,6 +87,17 @@ client's region instead.
 
           private
 
+          # this validation has nothing to do with ARNs (can't be in
+          # validate_config!) outposts does not support dualstack, so operations
+          # using an outpost id should be validated too.
+          def validate_outpost_dualstack!(context)
+            if context.params[:outpost_id] && context[:use_dualstack_endpoint]
+              raise ArgumentError,
+                    'Cannot provide an Outpost ID when '\
+                    '`:use_dualstack_endpoint` is set to true.'
+            end
+          end
+
           # This looks for BucketName or AccessPointName, but prefers BucketName
           # for CreateAccessPoint because it contains both but should not have
           # an Access Point ARN as AccessPointName.
@@ -102,16 +119,10 @@ client's region instead.
           end
 
           def validate_config!(context, arn)
-            unless context.config.regional_endpoint
-              raise ArgumentError,
-                    'Cannot provide both an Access Point ARN and setting '\
-                    ':endpoint.'
-            end
-
             if !arn.support_dualstack? && context[:use_dualstack_endpoint]
               raise ArgumentError,
-                    'Cannot provide both an Outpost Access Point ARN and '\
-                    'setting :use_dualstack_endpoint to true.'
+                    'Cannot provide an Outpost Access Point ARN when '\
+                    '`:use_dualstack_endpoint` is set to true.'
             end
           end
 
@@ -154,8 +165,9 @@ client's region instead.
           end
 
           # @api private
-          def resolve_url!(url, arn, region, dualstack = false)
-            url.host = arn.host_url(region, dualstack)
+          def resolve_url!(url, arn, region, dualstack = false, has_custom_endpoint = false)
+            custom_endpoint = url.host if has_custom_endpoint
+            url.host = arn.host_url(region, dualstack, custom_endpoint)
             url
           end
 
@@ -169,9 +181,9 @@ client's region instead.
             # Raise if provided value is not true or false
             if value.nil?
               raise ArgumentError,
-                    'Must provide either `true` or `false` for '\
-                    's3_use_arn_region profile option or for '\
-                    "ENV['AWS_S3_USE_ARN_REGION']"
+                    'Must provide either `true` or `false` for the '\
+                    '`s3_use_arn_region` profile option or for '\
+                    "ENV['AWS_S3_USE_ARN_REGION']."
             end
             value
           end
@@ -191,7 +203,7 @@ client's region instead.
               if !fips && !use_arn_region && region.include?('fips')
                 raise ArgumentError,
                       'FIPS client regions are not supported for this type of '\
-                      'ARN without s3_use_arn_region.'
+                      'ARN without `:s3_use_arn_region`.'
               end
 
               # if it's a fips region, attempt to normalize it

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

@@ -16,16 +16,22 @@ for all operations.
 
         def add_handlers(handlers, config)
           handlers.add(OptionHandler, step: :initialize)
-          handlers.add(DualstackHandler, step: :build, priority: 2)
+          handlers.add(DualstackHandler, step: :build, priority: 11)
         end
 
         # @api private
         class OptionHandler < Seahorse::Client::Handler
           def call(context)
+            # Support client configuration and per-operation configuration
             if context.params.is_a?(Hash)
               dualstack = context.params.delete(:use_dualstack_endpoint)
             end
             dualstack = context.config.use_dualstack_endpoint if dualstack.nil?
+            # Raise if :endpoint and dualstack are both provided
+            if dualstack && !context.config.regional_endpoint
+              raise ArgumentError,
+                    'Cannot use both :use_dualstack_endpoint and :endpoint'
+            end
             context[:use_dualstack_endpoint] = dualstack
             @handler.call(context)
           end
@@ -34,17 +40,16 @@ for all operations.
         # @api private
         class DualstackHandler < Seahorse::Client::Handler
           def call(context)
-            apply_dualstack_endpoint(context) if use_dualstack_endpoint?(context)
+            if context.config.regional_endpoint && context[:use_dualstack_endpoint]
+              apply_dualstack_endpoint(context)
+            end
             @handler.call(context)
           end
 
           private
           def apply_dualstack_endpoint(context)
-            bucket_name = context.params[:bucket]
             region = context.config.region
-            dns_suffix = Aws::Partitions::EndpointProvider.dns_suffix_for(
-              region
-            )
+            dns_suffix = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
             host = "s3-control.dualstack.#{region}.#{dns_suffix}"
             endpoint = URI.parse(context.http_request.endpoint.to_s)
             endpoint.scheme = context.http_request.endpoint.scheme
@@ -52,10 +57,6 @@ for all operations.
             endpoint.host = host
             context.http_request.endpoint = endpoint.to_s
           end
-
-          def use_dualstack_endpoint?(context)
-            context[:use_dualstack_endpoint]
-          end
         end
 
       end

data/lib/aws-sdk-s3control/plugins/s3_control_signer.rb

@@ -51,8 +51,12 @@ module Aws
                 credentials: context.config.credentials
               )
             elsif outpost_operation?(context)
-              context.http_request.endpoint.host =
-                "s3-outposts.#{context.config.region}.amazonaws.com"
+              # outpost operations should go to the outposts endpoint only if
+              # it's not a custom endpoint. the ARN class changes this for ARNs
+              if context.config.regional_endpoint
+                context.http_request.endpoint.host =
+                  "s3-outposts.#{context.config.region}.amazonaws.com"
+              end
               S3ControlSigner.build_v4_signer(
                 service: 's3-outposts',
                 region: context.config.region,

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -558,6 +558,8 @@ module Aws::S3Control
     #               },
     #             ],
     #           },
+    #           s3_delete_object_tagging: {
+    #           },
     #           s3_initiate_restore_object: {
     #             expiration_in_days: 1,
     #             glacier_job_tier: "BULK", # accepts BULK, STANDARD
@@ -616,14 +618,14 @@ module Aws::S3Control
     #   @return [Boolean]
     #
     # @!attribute [rw] operation
-    #   The operation that you want this job to perform on each object
-    #   listed in the manifest. For more information about the available
-    #   operations, see [Operations][1] in the *Amazon Simple Storage
-    #   Service Developer Guide*.
+    #   The action that you want this job to perform on every object listed
+    #   in the manifest. For more information about the available actions,
+    #   see [Operations][1] in the *Amazon Simple Storage Service User
+    #   Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-operations.html
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-actions.html
     #   @return [Types::JobOperation]
     #
     # @!attribute [rw] report
@@ -657,7 +659,7 @@ module Aws::S3Control
     # @!attribute [rw] role_arn
     #   The Amazon Resource Name (ARN) for the AWS Identity and Access
     #   Management (IAM) role that Batch Operations will use to run this
-    #   job's operation on each object in the manifest.
+    #   job's action on every object in the manifest.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -1032,6 +1034,7 @@ module Aws::S3Control
     #       }
     #
     # @!attribute [rw] account_id
+    #   The AWS account ID associated with the S3 Batch Operations job.
     #   @return [String]
     #
     # @!attribute [rw] job_id
@@ -1833,7 +1836,7 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] operation
-    #   The operation that the specified job is configured to run on each
+    #   The operation that the specified job is configured to run on every
     #   object listed in the manifest.
     #   @return [String]
     #
@@ -1926,6 +1929,14 @@ module Aws::S3Control
     #
     # @!attribute [rw] object_arn
     #   The Amazon Resource Name (ARN) for a manifest object.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] object_version_id
@@ -1978,10 +1989,9 @@ module Aws::S3Control
       include Aws::Structure
     end
 
-    # The operation that you want this job to perform on each object listed
+    # The operation that you want this job to perform on every object listed
     # in the manifest. For more information about the available operations,
-    # see [Operations][1] in the *Amazon Simple Storage Service Developer
-    # Guide*.
+    # see [Operations][1] in the *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -2069,6 +2079,8 @@ module Aws::S3Control
     #             },
     #           ],
     #         },
+    #         s3_delete_object_tagging: {
+    #         },
     #         s3_initiate_restore_object: {
     #           expiration_in_days: 1,
     #           glacier_job_tier: "BULK", # accepts BULK, STANDARD
@@ -2088,36 +2100,41 @@ module Aws::S3Control
     #       }
     #
     # @!attribute [rw] lambda_invoke
-    #   Directs the specified job to invoke an AWS Lambda function on each
+    #   Directs the specified job to invoke an AWS Lambda function on every
     #   object in the manifest.
     #   @return [Types::LambdaInvokeOperation]
     #
     # @!attribute [rw] s3_put_object_copy
-    #   Directs the specified job to run a PUT Copy object call on each
+    #   Directs the specified job to run a PUT Copy object call on every
     #   object in the manifest.
     #   @return [Types::S3CopyObjectOperation]
     #
     # @!attribute [rw] s3_put_object_acl
-    #   Directs the specified job to run a PUT Object acl call on each
+    #   Directs the specified job to run a PUT Object acl call on every
     #   object in the manifest.
     #   @return [Types::S3SetObjectAclOperation]
     #
     # @!attribute [rw] s3_put_object_tagging
-    #   Directs the specified job to run a PUT Object tagging call on each
+    #   Directs the specified job to run a PUT Object tagging call on every
     #   object in the manifest.
     #   @return [Types::S3SetObjectTaggingOperation]
     #
+    # @!attribute [rw] s3_delete_object_tagging
+    #   Directs the specified job to execute a DELETE Object tagging call on
+    #   every object in the manifest.
+    #   @return [Types::S3DeleteObjectTaggingOperation]
+    #
     # @!attribute [rw] s3_initiate_restore_object
-    #   Directs the specified job to run an Initiate Glacier Restore call on
-    #   each object in the manifest.
+    #   Directs the specified job to initiate restore requests for every
+    #   archived object in the manifest.
     #   @return [Types::S3InitiateRestoreObjectOperation]
     #
     # @!attribute [rw] s3_put_object_legal_hold
     #   Contains the configuration for an S3 Object Lock legal hold
-    #   operation that an S3 Batch Operations job passes each object through
-    #   to the underlying `PutObjectLegalHold` API. For more information,
-    #   see [Using S3 Object Lock legal hold with S3 Batch Operations][1] in
-    #   the *Amazon Simple Storage Service Developer Guide*.
+    #   operation that an S3 Batch Operations job passes every object to the
+    #   underlying `PutObjectLegalHold` API. For more information, see
+    #   [Using S3 Object Lock legal hold with S3 Batch Operations][1] in the
+    #   *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -2126,11 +2143,10 @@ module Aws::S3Control
     #
     # @!attribute [rw] s3_put_object_retention
     #   Contains the configuration parameters for the Object Lock retention
-    #   action for an S3 Batch Operations job. Batch Operations passes each
-    #   value through to the underlying `PutObjectRetention` API. For more
+    #   action for an S3 Batch Operations job. Batch Operations passes every
+    #   object to the underlying `PutObjectRetention` API. For more
     #   information, see [Using S3 Object Lock retention with S3 Batch
-    #   Operations][1] in the *Amazon Simple Storage Service Developer
-    #   Guide*.
+    #   Operations][1] in the *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -2144,6 +2160,7 @@ module Aws::S3Control
       :s3_put_object_copy,
       :s3_put_object_acl,
       :s3_put_object_tagging,
+      :s3_delete_object_tagging,
       :s3_initiate_restore_object,
       :s3_put_object_legal_hold,
       :s3_put_object_retention)
@@ -2246,7 +2263,7 @@ module Aws::S3Control
     #
     # @!attribute [rw] function_arn
     #   The Amazon Resource Name (ARN) for the AWS Lambda function that the
-    #   specified job will invoke for each object in the manifest.
+    #   specified job will invoke on every object in the manifest.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/LambdaInvokeOperation AWS API Documentation
@@ -2544,6 +2561,14 @@ module Aws::S3Control
     #
     # @!attribute [rw] prefix
     #   Prefix identifying one or more objects to which the rule applies.
+    #
+    #   Replacement must be made for object keys containing special
+    #   characters (such as carriage returns) when using XML requests. For
+    #   more information, see [ XML related object key constraints][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html#object-key-xml-related-constraints
     #   @return [String]
     #
     # @!attribute [rw] tag
@@ -2653,6 +2678,7 @@ module Aws::S3Control
     #       }
     #
     # @!attribute [rw] account_id
+    #   The AWS account ID associated with the S3 Batch Operations job.
     #   @return [String]
     #
     # @!attribute [rw] job_statuses
@@ -2934,7 +2960,7 @@ module Aws::S3Control
     # Indicates whether this access point policy is public. For more
     # information about how Amazon S3 evaluates policies to determine
     # whether they are public, see [The Meaning of "Public"][1] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -3133,7 +3159,7 @@ module Aws::S3Control
     #   The policy that you want to apply to the specified access point. For
     #   more information about access point policies, see [Managing data
     #   access with Amazon S3 Access Points][1] in the *Amazon Simple
-    #   Storage Service Developer Guide*.
+    #   Storage Service User Guide*.
     #
     #
     #
@@ -3714,8 +3740,8 @@ module Aws::S3Control
     end
 
     # Contains the configuration parameters for a PUT Copy object operation.
-    # S3 Batch Operations passes each value through to the underlying PUT
-    # Copy object API. For more information about the parameters for this
+    # S3 Batch Operations passes every object to the underlying PUT Copy
+    # object API. For more information about the parameters for this
     # operation, see [PUT Object - Copy][1].
     #
     #
@@ -3860,6 +3886,16 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # Contains no configuration parameters because the DELETE Object tagging
+    # API only accepts the bucket name and key name as parameters, which are
+    # defined in the job's manifest.
+    #
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/S3DeleteObjectTaggingOperation AWS API Documentation
+    #
+    class S3DeleteObjectTaggingOperation < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass S3Grant
     #   data as a hash:
     #
@@ -3915,8 +3951,8 @@ module Aws::S3Control
       include Aws::Structure
     end
 
-    # Contains the configuration parameters for an Initiate Glacier Restore
-    # job. S3 Batch Operations passes each value through to the underlying
+    # Contains the configuration parameters for an S3 Initiate Restore
+    # Object job. S3 Batch Operations passes every object to the underlying
     # POST Object restore API. For more information about the parameters for
     # this operation, see [RestoreObject][1].
     #
@@ -3933,9 +3969,29 @@ module Aws::S3Control
     #       }
     #
     # @!attribute [rw] expiration_in_days
+    #   This argument specifies how long the S3 Glacier or S3 Glacier Deep
+    #   Archive object remains available in Amazon S3. S3 Initiate Restore
+    #   Object jobs that target S3 Glacier and S3 Glacier Deep Archive
+    #   objects require `ExpirationInDays` set to 1 or greater.
+    #
+    #   Conversely, do *not* set `ExpirationInDays` when creating S3
+    #   Initiate Restore Object jobs that target S3 Intelligent-Tiering
+    #   Archive Access and Deep Archive Access tier objects. Objects in S3
+    #   Intelligent-Tiering archive access tiers are not subject to restore
+    #   expiry, so specifying `ExpirationInDays` results in restore request
+    #   failure.
+    #
+    #   S3 Batch Operations jobs can operate either on S3 Glacier and S3
+    #   Glacier Deep Archive storage class objects or on S3
+    #   Intelligent-Tiering Archive Access and Deep Archive Access storage
+    #   tier objects, but not both types in the same job. If you need to
+    #   restore objects of both types you *must* create separate Batch
+    #   Operations jobs.
     #   @return [Integer]
     #
     # @!attribute [rw] glacier_job_tier
+    #   S3 Batch Operations supports `STANDARD` and `BULK` retrieval tiers,
+    #   but not the `EXPEDITED` retrieval tier.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/S3InitiateRestoreObjectOperation AWS API Documentation
@@ -4068,7 +4124,7 @@ module Aws::S3Control
     # and `RetainUntilDate` data types in your operation, you will remove
     # the retention from your objects. For more information, see [Using S3
     # Object Lock retention with S3 Batch Operations][1] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # Simple Storage Service User Guide*.
     #
     #
     #
@@ -4102,9 +4158,9 @@ module Aws::S3Control
     end
 
     # Contains the configuration parameters for a Set Object ACL operation.
-    # S3 Batch Operations passes each value through to the underlying PUT
-    # Object acl API. For more information about the parameters for this
-    # operation, see [PUT Object acl][1].
+    # S3 Batch Operations passes every object to the underlying PUT Object
+    # acl API. For more information about the parameters for this operation,
+    # see [PUT Object acl][1].
     #
     #
     #
@@ -4147,10 +4203,10 @@ module Aws::S3Control
     end
 
     # Contains the configuration for an S3 Object Lock legal hold operation
-    # that an S3 Batch Operations job passes each object through to the
-    # underlying `PutObjectLegalHold` API. For more information, see [Using
-    # S3 Object Lock legal hold with S3 Batch Operations][1] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # that an S3 Batch Operations job passes every object to the underlying
+    # `PutObjectLegalHold` API. For more information, see [Using S3 Object
+    # Lock legal hold with S3 Batch Operations][1] in the *Amazon Simple
+    # Storage Service User Guide*.
     #
     #
     #
@@ -4179,10 +4235,10 @@ module Aws::S3Control
     end
 
     # Contains the configuration parameters for the Object Lock retention
-    # action for an S3 Batch Operations job. Batch Operations passes each
-    # value through to the underlying `PutObjectRetention` API. For more
+    # action for an S3 Batch Operations job. Batch Operations passes every
+    # object to the underlying `PutObjectRetention` API. For more
     # information, see [Using S3 Object Lock retention with S3 Batch
-    # Operations][1] in the *Amazon Simple Storage Service Developer Guide*.
+    # Operations][1] in the *Amazon Simple Storage Service User Guide*.
     #
     #
     #
@@ -4209,7 +4265,7 @@ module Aws::S3Control
     #   Contains the Object Lock retention mode to be applied to all objects
     #   in the Batch Operations job. For more information, see [Using S3
     #   Object Lock retention with S3 Batch Operations][1] in the *Amazon
-    #   Simple Storage Service Developer Guide*.
+    #   Simple Storage Service User Guide*.
     #
     #
     #
@@ -4226,9 +4282,9 @@ module Aws::S3Control
     end
 
     # Contains the configuration parameters for a Set Object Tagging
-    # operation. S3 Batch Operations passes each value through to the
-    # underlying PUT Object tagging API. For more information about the
-    # parameters for this operation, see [PUT Object tagging][1].
+    # operation. S3 Batch Operations passes every object to the underlying
+    # PUT Object tagging API. For more information about the parameters for
+    # this operation, see [PUT Object tagging][1].
     #
     #
     #
@@ -4511,6 +4567,11 @@ module Aws::S3Control
     # @!attribute [rw] s3_bucket_destination
     #   A container for the bucket where the S3 Storage Lens metrics export
     #   will be located.
+    #
+    #   <note markdown="1"> This bucket must be located in the same Region as the storage lens
+    #   configuration.
+    #
+    #    </note>
     #   @return [Types::S3BucketDestination]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/StorageLensDataExport AWS API Documentation
@@ -4624,7 +4685,7 @@ module Aws::S3Control
     # Specifies when an object transitions to a specified storage class. For
     # more information about Amazon S3 Lifecycle configuration rules, see [
     # Transitioning objects using Amazon S3 Lifecycle][1] in the *Amazon
-    # Simple Storage Service Developer Guide*.
+    # Simple Storage Service User Guide*.
     #
     #
     #
@@ -4675,6 +4736,7 @@ module Aws::S3Control
     #       }
     #
     # @!attribute [rw] account_id
+    #   The AWS account ID associated with the S3 Batch Operations job.
     #   @return [String]
     #
     # @!attribute [rw] job_id
@@ -4723,6 +4785,7 @@ module Aws::S3Control
     #       }
     #
     # @!attribute [rw] account_id
+    #   The AWS account ID associated with the S3 Batch Operations job.
     #   @return [String]
     #
     # @!attribute [rw] job_id