aws-sdk-s3control 1.24.0 → 1.29.0

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/types.rb

@@ -72,6 +72,71 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # A container for the account level Amazon S3 Storage Lens
+    # configuration.
+    #
+    # @note When making an API call, you may pass AccountLevel
+    #   data as a hash:
+    #
+    #       {
+    #         activity_metrics: {
+    #           is_enabled: false,
+    #         },
+    #         bucket_level: { # required
+    #           activity_metrics: {
+    #             is_enabled: false,
+    #           },
+    #           prefix_level: {
+    #             storage_metrics: { # required
+    #               is_enabled: false,
+    #               selection_criteria: {
+    #                 delimiter: "StorageLensPrefixLevelDelimiter",
+    #                 max_depth: 1,
+    #                 min_storage_bytes_percentage: 1.0,
+    #               },
+    #             },
+    #           },
+    #         },
+    #       }
+    #
+    # @!attribute [rw] activity_metrics
+    #   A container for the S3 Storage Lens activity metrics.
+    #   @return [Types::ActivityMetrics]
+    #
+    # @!attribute [rw] bucket_level
+    #   A container for the S3 Storage Lens bucket-level configuration.
+    #   @return [Types::BucketLevel]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/AccountLevel AWS API Documentation
+    #
+    class AccountLevel < Struct.new(
+      :activity_metrics,
+      :bucket_level)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A container for the activity metrics.
+    #
+    # @note When making an API call, you may pass ActivityMetrics
+    #   data as a hash:
+    #
+    #       {
+    #         is_enabled: false,
+    #       }
+    #
+    # @!attribute [rw] is_enabled
+    #   A container for whether the activity metrics are enabled.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/ActivityMetrics AWS API Documentation
+    #
+    class ActivityMetrics < Struct.new(
+      :is_enabled)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] message
     #   @return [String]
     #
@@ -98,6 +163,46 @@ module Aws::S3Control
     #
     class BucketAlreadyOwnedByYou < Aws::EmptyStructure; end
 
+    # A container for the bucket-level configuration.
+    #
+    # @note When making an API call, you may pass BucketLevel
+    #   data as a hash:
+    #
+    #       {
+    #         activity_metrics: {
+    #           is_enabled: false,
+    #         },
+    #         prefix_level: {
+    #           storage_metrics: { # required
+    #             is_enabled: false,
+    #             selection_criteria: {
+    #               delimiter: "StorageLensPrefixLevelDelimiter",
+    #               max_depth: 1,
+    #               min_storage_bytes_percentage: 1.0,
+    #             },
+    #           },
+    #         },
+    #       }
+    #
+    # @!attribute [rw] activity_metrics
+    #   A container for the bucket-level activity metrics for Amazon S3
+    #   Storage Lens
+    #   @return [Types::ActivityMetrics]
+    #
+    # @!attribute [rw] prefix_level
+    #   A container for the bucket-level prefix-level metrics for S3 Storage
+    #   Lens
+    #   @return [Types::PrefixLevel]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/BucketLevel AWS API Documentation
+    #
+    class BucketLevel < Struct.new(
+      :activity_metrics,
+      :prefix_level)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateAccessPointRequest
     #   data as a hash:
     #
@@ -129,8 +234,11 @@ module Aws::S3Control
     #   The name of the bucket that you want to associate this access point
     #   with.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -151,7 +259,7 @@ module Aws::S3Control
     #
     # @!attribute [rw] public_access_block_configuration
     #   The `PublicAccessBlock` configuration that you want to apply to this
-    #   Amazon S3 bucket. You can enable the configuration options in any
+    #   Amazon S3 account. You can enable the configuration options in any
     #   combination. For more information about when Amazon S3 considers a
     #   bucket or object public, see [The Meaning of "Public"][1] in the
     #   *Amazon Simple Storage Service Developer Guide*.
@@ -177,6 +285,10 @@ module Aws::S3Control
 
     # @!attribute [rw] access_point_arn
     #   The ARN of the access point.
+    #
+    #   <note markdown="1"> This is only supported by Amazon S3 on Outposts.
+    #
+    #    </note>
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/CreateAccessPointResult AWS API Documentation
@@ -339,8 +451,11 @@ module Aws::S3Control
     # @!attribute [rw] bucket_arn
     #   The Amazon Resource Name (ARN) of the bucket.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -443,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
@@ -501,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
@@ -542,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
@@ -595,8 +712,12 @@ module Aws::S3Control
     # @!attribute [rw] name
     #   The name of the access point whose policy you want to delete.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the access point
-    #   accessed in the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the access point accessed in the
+    #   format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/accesspoint/<my-accesspoint-name>`.
     #   For example, to access the access point `reports-ap` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -629,8 +750,12 @@ module Aws::S3Control
     # @!attribute [rw] name
     #   The name of the access point you want to delete.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the access point
-    #   accessed in the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the access point accessed in the
+    #   format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/accesspoint/<my-accesspoint-name>`.
     #   For example, to access the access point `reports-ap` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -661,10 +786,13 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] bucket
-    #   The bucket ARN of the bucket.
+    #   Specifies the bucket.
+    #
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -695,10 +823,13 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] bucket
-    #   The ARN of the bucket.
+    #   Specifies the bucket.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -731,8 +862,11 @@ module Aws::S3Control
     # @!attribute [rw] bucket
     #   Specifies the bucket being deleted.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -765,8 +899,11 @@ module Aws::S3Control
     # @!attribute [rw] bucket
     #   The bucket ARN that has the tag set to be removed.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -834,6 +971,60 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DeleteStorageLensConfigurationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         config_id: "ConfigId", # required
+    #         account_id: "AccountId", # required
+    #       }
+    #
+    # @!attribute [rw] config_id
+    #   The ID of the S3 Storage Lens configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the requester.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/DeleteStorageLensConfigurationRequest AWS API Documentation
+    #
+    class DeleteStorageLensConfigurationRequest < Struct.new(
+      :config_id,
+      :account_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass DeleteStorageLensConfigurationTaggingRequest
+    #   data as a hash:
+    #
+    #       {
+    #         config_id: "ConfigId", # required
+    #         account_id: "AccountId", # required
+    #       }
+    #
+    # @!attribute [rw] config_id
+    #   The ID of the S3 Storage Lens configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the requester.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/DeleteStorageLensConfigurationTaggingRequest AWS API Documentation
+    #
+    class DeleteStorageLensConfigurationTaggingRequest < Struct.new(
+      :config_id,
+      :account_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/DeleteStorageLensConfigurationTaggingResult AWS API Documentation
+    #
+    class DeleteStorageLensConfigurationTaggingResult < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass DescribeJobRequest
     #   data as a hash:
     #
@@ -843,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
@@ -871,6 +1063,33 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # A container for what Amazon S3 Storage Lens will exclude.
+    #
+    # @note When making an API call, you may pass Exclude
+    #   data as a hash:
+    #
+    #       {
+    #         buckets: ["S3BucketArnString"],
+    #         regions: ["S3AWSRegion"],
+    #       }
+    #
+    # @!attribute [rw] buckets
+    #   A container for the S3 Storage Lens bucket excludes.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] regions
+    #   A container for the S3 Storage Lens Region excludes.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/Exclude AWS API Documentation
+    #
+    class Exclude < Struct.new(
+      :buckets,
+      :regions)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass GetAccessPointPolicyRequest
     #   data as a hash:
     #
@@ -886,8 +1105,12 @@ module Aws::S3Control
     # @!attribute [rw] name
     #   The name of the access point whose policy you want to retrieve.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the access point
-    #   accessed in the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the access point accessed in the
+    #   format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/accesspoint/<my-accesspoint-name>`.
     #   For example, to access the access point `reports-ap` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -971,8 +1194,12 @@ module Aws::S3Control
     #   The name of the access point whose configuration information you
     #   want to retrieve.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the access point
-    #   accessed in the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the access point accessed in the
+    #   format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/accesspoint/<my-accesspoint-name>`.
     #   For example, to access the access point `reports-ap` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -1016,7 +1243,7 @@ module Aws::S3Control
     #
     # @!attribute [rw] public_access_block_configuration
     #   The `PublicAccessBlock` configuration that you want to apply to this
-    #   Amazon S3 bucket. You can enable the configuration options in any
+    #   Amazon S3 account. You can enable the configuration options in any
     #   combination. For more information about when Amazon S3 considers a
     #   bucket or object public, see [The Meaning of "Public"][1] in the
     #   *Amazon Simple Storage Service Developer Guide*.
@@ -1060,8 +1287,11 @@ module Aws::S3Control
     # @!attribute [rw] bucket
     #   The Amazon Resource Name (ARN) of the bucket.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -1104,10 +1334,13 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] bucket
-    #   The ARN of the bucket.
+    #   Specifies the bucket.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -1150,10 +1383,13 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] bucket
-    #   The ARN of the bucket.
+    #   Specifies the bucket.
+    #
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -1205,10 +1441,13 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] bucket
-    #   The ARN of the bucket.
+    #   Specifies the bucket.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -1309,6 +1548,80 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetStorageLensConfigurationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         config_id: "ConfigId", # required
+    #         account_id: "AccountId", # required
+    #       }
+    #
+    # @!attribute [rw] config_id
+    #   The ID of the Amazon S3 Storage Lens configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the requester.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/GetStorageLensConfigurationRequest AWS API Documentation
+    #
+    class GetStorageLensConfigurationRequest < Struct.new(
+      :config_id,
+      :account_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] storage_lens_configuration
+    #   The S3 Storage Lens configuration requested.
+    #   @return [Types::StorageLensConfiguration]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/GetStorageLensConfigurationResult AWS API Documentation
+    #
+    class GetStorageLensConfigurationResult < Struct.new(
+      :storage_lens_configuration)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass GetStorageLensConfigurationTaggingRequest
+    #   data as a hash:
+    #
+    #       {
+    #         config_id: "ConfigId", # required
+    #         account_id: "AccountId", # required
+    #       }
+    #
+    # @!attribute [rw] config_id
+    #   The ID of the Amazon S3 Storage Lens configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the requester.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/GetStorageLensConfigurationTaggingRequest AWS API Documentation
+    #
+    class GetStorageLensConfigurationTaggingRequest < Struct.new(
+      :config_id,
+      :account_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] tags
+    #   The tags of S3 Storage Lens configuration requested.
+    #   @return [Array<Types::StorageLensTag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/GetStorageLensConfigurationTaggingResult AWS API Documentation
+    #
+    class GetStorageLensConfigurationTaggingResult < Struct.new(
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] message
     #   @return [String]
     #
@@ -1320,6 +1633,33 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # A container for what Amazon S3 Storage Lens configuration includes.
+    #
+    # @note When making an API call, you may pass Include
+    #   data as a hash:
+    #
+    #       {
+    #         buckets: ["S3BucketArnString"],
+    #         regions: ["S3AWSRegion"],
+    #       }
+    #
+    # @!attribute [rw] buckets
+    #   A container for the S3 Storage Lens bucket includes.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] regions
+    #   A container for the S3 Storage Lens Region includes.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/Include AWS API Documentation
+    #
+    class Include < Struct.new(
+      :buckets,
+      :regions)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] message
     #   @return [String]
     #
@@ -1496,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]
     #
@@ -1589,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
@@ -1641,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*.
     #
     #
     #
@@ -1732,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
@@ -1751,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*.
     #
     #
     #
@@ -1789,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*.
     #
     #
     #
@@ -1807,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)
@@ -1909,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
@@ -2207,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
@@ -2245,8 +2607,11 @@ module Aws::S3Control
     #   The name of the bucket whose associated access points you want to
     #   list.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -2313,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
@@ -2422,6 +2788,85 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # Part of `ListStorageLensConfigurationResult`. Each entry includes the
+    # description of the S3 Storage Lens configuration, its home Region,
+    # whether it is enabled, its Amazon Resource Name (ARN), and config ID.
+    #
+    # @!attribute [rw] id
+    #   A container for the S3 Storage Lens configuration ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] storage_lens_arn
+    #   The ARN of the S3 Storage Lens configuration. This property is
+    #   read-only.
+    #   @return [String]
+    #
+    # @!attribute [rw] home_region
+    #   A container for the S3 Storage Lens home Region. Your metrics data
+    #   is stored and retained in your designated S3 Storage Lens home
+    #   Region.
+    #   @return [String]
+    #
+    # @!attribute [rw] is_enabled
+    #   A container for whether the S3 Storage Lens configuration is
+    #   enabled. This property is required.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/ListStorageLensConfigurationEntry AWS API Documentation
+    #
+    class ListStorageLensConfigurationEntry < Struct.new(
+      :id,
+      :storage_lens_arn,
+      :home_region,
+      :is_enabled)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass ListStorageLensConfigurationsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         account_id: "AccountId", # required
+    #         next_token: "ContinuationToken",
+    #       }
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the requester.
+    #   @return [String]
+    #
+    # @!attribute [rw] next_token
+    #   A pagination token to request the next page of results.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/ListStorageLensConfigurationsRequest AWS API Documentation
+    #
+    class ListStorageLensConfigurationsRequest < Struct.new(
+      :account_id,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   If the request produced more than the maximum number of S3 Storage
+    #   Lens configuration results, you can pass this value into a
+    #   subsequent request to retrieve the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] storage_lens_configuration_list
+    #   A list of S3 Storage Lens configurations.
+    #   @return [Array<Types::ListStorageLensConfigurationEntry>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/ListStorageLensConfigurationsResult AWS API Documentation
+    #
+    class ListStorageLensConfigurationsResult < Struct.new(
+      :next_token,
+      :storage_lens_configuration_list)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Amazon S3 throws this exception if you make a `GetPublicAccessBlock`
     # request against an account that doesn't have a
     # `PublicAccessBlockConfiguration` set.
@@ -2515,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*.
     #
     #
     #
@@ -2532,20 +2977,79 @@ module Aws::S3Control
       include Aws::Structure
     end
 
-    # The `PublicAccessBlock` configuration that you want to apply to this
-    # Amazon S3 bucket. You can enable the configuration options in any
-    # combination. For more information about when Amazon S3 considers a
-    # bucket or object public, see [The Meaning of "Public"][1] in the
-    # *Amazon Simple Storage Service Developer Guide*.
+    # A container for the prefix-level configuration.
     #
-    # This is not supported for Amazon S3 on Outposts.
+    # @note When making an API call, you may pass PrefixLevel
+    #   data as a hash:
     #
+    #       {
+    #         storage_metrics: { # required
+    #           is_enabled: false,
+    #           selection_criteria: {
+    #             delimiter: "StorageLensPrefixLevelDelimiter",
+    #             max_depth: 1,
+    #             min_storage_bytes_percentage: 1.0,
+    #           },
+    #         },
+    #       }
     #
+    # @!attribute [rw] storage_metrics
+    #   A container for the prefix-level storage metrics for S3 Storage
+    #   Lens.
+    #   @return [Types::PrefixLevelStorageMetrics]
     #
-    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/PrefixLevel AWS API Documentation
     #
-    # @note When making an API call, you may pass PublicAccessBlockConfiguration
-    #   data as a hash:
+    class PrefixLevel < Struct.new(
+      :storage_metrics)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A container for the prefix-level storage metrics for S3 Storage Lens.
+    #
+    # @note When making an API call, you may pass PrefixLevelStorageMetrics
+    #   data as a hash:
+    #
+    #       {
+    #         is_enabled: false,
+    #         selection_criteria: {
+    #           delimiter: "StorageLensPrefixLevelDelimiter",
+    #           max_depth: 1,
+    #           min_storage_bytes_percentage: 1.0,
+    #         },
+    #       }
+    #
+    # @!attribute [rw] is_enabled
+    #   A container for whether prefix-level storage metrics are enabled.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] selection_criteria
+    #   @return [Types::SelectionCriteria]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/PrefixLevelStorageMetrics AWS API Documentation
+    #
+    class PrefixLevelStorageMetrics < Struct.new(
+      :is_enabled,
+      :selection_criteria)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The `PublicAccessBlock` configuration that you want to apply to this
+    # Amazon S3 account. You can enable the configuration options in any
+    # combination. For more information about when Amazon S3 considers a
+    # bucket or object public, see [The Meaning of "Public"][1] in the
+    # *Amazon Simple Storage Service Developer Guide*.
+    #
+    # This is not supported for Amazon S3 on Outposts.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status
+    #
+    # @note When making an API call, you may pass PublicAccessBlockConfiguration
+    #   data as a hash:
     #
     #       {
     #         block_public_acls: false,
@@ -2597,8 +3101,8 @@ module Aws::S3Control
     # @!attribute [rw] restrict_public_buckets
     #   Specifies whether Amazon S3 should restrict public bucket policies
     #   for buckets in this account. Setting this element to `TRUE`
-    #   restricts access to buckets with public policies to only AWS
-    #   services and authorized users within this account.
+    #   restricts access to buckets with public policies to only AWS service
+    #   principals and authorized users within this account.
     #
     #   Enabling this setting doesn't affect previously stored bucket
     #   policies, except that public and cross-account access within any
@@ -2637,8 +3141,12 @@ module Aws::S3Control
     #   The name of the access point that you want to associate with the
     #   specified policy.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the access point
-    #   accessed in the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the access point accessed in the
+    #   format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/accesspoint/<my-accesspoint-name>`.
     #   For example, to access the access point `reports-ap` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -2649,9 +3157,9 @@ module Aws::S3Control
     #
     # @!attribute [rw] policy
     #   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*.
+    #   more information about access point policies, see [Managing data
+    #   access with Amazon S3 Access Points][1] in the *Amazon Simple
+    #   Storage Service User Guide*.
     #
     #
     #
@@ -2761,10 +3269,13 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] bucket
-    #   The ARN of the bucket.
+    #   Specifies the bucket.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -2820,8 +3331,11 @@ module Aws::S3Control
     # @!attribute [rw] bucket
     #   The Amazon Resource Name (ARN) of the bucket.
     #
-    #   For Amazon S3 on Outposts specify the ARN of the bucket accessed in
-    #   the format
+    #   For using this parameter with Amazon S3 on Outposts with the REST
+    #   API, you must specify the name and the x-amz-outpost-id as well.
+    #
+    #   For using this parameter with S3 on Outposts with the AWS SDK and
+    #   CLI, you must specify the ARN of the bucket accessed in the format
     #   `arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/bucket/<my-bucket-name>`.
     #   For example, to access the bucket `reports` through outpost
     #   `my-outpost` owned by account `123456789012` in Region `us-west-2`,
@@ -2916,6 +3430,147 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass PutStorageLensConfigurationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         config_id: "ConfigId", # required
+    #         account_id: "AccountId", # required
+    #         storage_lens_configuration: { # required
+    #           id: "ConfigId", # required
+    #           account_level: { # required
+    #             activity_metrics: {
+    #               is_enabled: false,
+    #             },
+    #             bucket_level: { # required
+    #               activity_metrics: {
+    #                 is_enabled: false,
+    #               },
+    #               prefix_level: {
+    #                 storage_metrics: { # required
+    #                   is_enabled: false,
+    #                   selection_criteria: {
+    #                     delimiter: "StorageLensPrefixLevelDelimiter",
+    #                     max_depth: 1,
+    #                     min_storage_bytes_percentage: 1.0,
+    #                   },
+    #                 },
+    #               },
+    #             },
+    #           },
+    #           include: {
+    #             buckets: ["S3BucketArnString"],
+    #             regions: ["S3AWSRegion"],
+    #           },
+    #           exclude: {
+    #             buckets: ["S3BucketArnString"],
+    #             regions: ["S3AWSRegion"],
+    #           },
+    #           data_export: {
+    #             s3_bucket_destination: { # required
+    #               format: "CSV", # required, accepts CSV, Parquet
+    #               output_schema_version: "V_1", # required, accepts V_1
+    #               account_id: "AccountId", # required
+    #               arn: "S3BucketArnString", # required
+    #               prefix: "Prefix",
+    #               encryption: {
+    #                 sses3: {
+    #                 },
+    #                 ssekms: {
+    #                   key_id: "SSEKMSKeyId", # required
+    #                 },
+    #               },
+    #             },
+    #           },
+    #           is_enabled: false, # required
+    #           aws_org: {
+    #             arn: "AwsOrgArn", # required
+    #           },
+    #           storage_lens_arn: "StorageLensArn",
+    #         },
+    #         tags: [
+    #           {
+    #             key: "TagKeyString", # required
+    #             value: "TagValueString", # required
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] config_id
+    #   The ID of the S3 Storage Lens configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the requester.
+    #   @return [String]
+    #
+    # @!attribute [rw] storage_lens_configuration
+    #   The S3 Storage Lens configuration.
+    #   @return [Types::StorageLensConfiguration]
+    #
+    # @!attribute [rw] tags
+    #   The tag set of the S3 Storage Lens configuration.
+    #
+    #   <note markdown="1"> You can set up to a maximum of 50 tags.
+    #
+    #    </note>
+    #   @return [Array<Types::StorageLensTag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/PutStorageLensConfigurationRequest AWS API Documentation
+    #
+    class PutStorageLensConfigurationRequest < Struct.new(
+      :config_id,
+      :account_id,
+      :storage_lens_configuration,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass PutStorageLensConfigurationTaggingRequest
+    #   data as a hash:
+    #
+    #       {
+    #         config_id: "ConfigId", # required
+    #         account_id: "AccountId", # required
+    #         tags: [ # required
+    #           {
+    #             key: "TagKeyString", # required
+    #             value: "TagValueString", # required
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] config_id
+    #   The ID of the S3 Storage Lens configuration.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the requester.
+    #   @return [String]
+    #
+    # @!attribute [rw] tags
+    #   The tag set of the S3 Storage Lens configuration.
+    #
+    #   <note markdown="1"> You can set up to a maximum of 50 tags.
+    #
+    #    </note>
+    #   @return [Array<Types::StorageLensTag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/PutStorageLensConfigurationTaggingRequest AWS API Documentation
+    #
+    class PutStorageLensConfigurationTaggingRequest < Struct.new(
+      :config_id,
+      :account_id,
+      :tags)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/PutStorageLensConfigurationTaggingResult AWS API Documentation
+    #
+    class PutStorageLensConfigurationTaggingResult < Aws::EmptyStructure; end
+
     # The container for the regional bucket.
     #
     # @!attribute [rw] bucket
@@ -3021,9 +3676,72 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # A container for the bucket where the Amazon S3 Storage Lens metrics
+    # export files are located.
+    #
+    # @note When making an API call, you may pass S3BucketDestination
+    #   data as a hash:
+    #
+    #       {
+    #         format: "CSV", # required, accepts CSV, Parquet
+    #         output_schema_version: "V_1", # required, accepts V_1
+    #         account_id: "AccountId", # required
+    #         arn: "S3BucketArnString", # required
+    #         prefix: "Prefix",
+    #         encryption: {
+    #           sses3: {
+    #           },
+    #           ssekms: {
+    #             key_id: "SSEKMSKeyId", # required
+    #           },
+    #         },
+    #       }
+    #
+    # @!attribute [rw] format
+    #   @return [String]
+    #
+    # @!attribute [rw] output_schema_version
+    #   The schema version of the export file.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_id
+    #   The account ID of the owner of the S3 Storage Lens metrics export
+    #   bucket.
+    #   @return [String]
+    #
+    # @!attribute [rw] arn
+    #   The Amazon Resource Name (ARN) of the bucket. This property is
+    #   read-only and follows the following format: `
+    #   arn:aws:s3:us-east-1:example-account-id:bucket/your-destination-bucket-name
+    #   `
+    #   @return [String]
+    #
+    # @!attribute [rw] prefix
+    #   The prefix of the destination bucket where the metrics export will
+    #   be delivered.
+    #   @return [String]
+    #
+    # @!attribute [rw] encryption
+    #   The container for the type encryption of the metrics exports in this
+    #   bucket.
+    #   @return [Types::StorageLensDataExportEncryption]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/S3BucketDestination AWS API Documentation
+    #
+    class S3BucketDestination < Struct.new(
+      :format,
+      :output_schema_version,
+      :account_id,
+      :arn,
+      :prefix,
+      :encryption)
+      SENSITIVE = []
+      include Aws::Structure
+    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].
     #
     #
@@ -3081,6 +3799,10 @@ module Aws::S3Control
     #       }
     #
     # @!attribute [rw] target_resource
+    #   Specifies the destination bucket ARN for the batch copy operation.
+    #   For example, to copy objects to a bucket named
+    #   "destinationBucket", set the TargetResource to
+    #   "arn:aws:s3:::destinationBucket".
     #   @return [String]
     #
     # @!attribute [rw] canned_access_control_list
@@ -3102,6 +3824,9 @@ module Aws::S3Control
     #   @return [Array<Types::S3Tag>]
     #
     # @!attribute [rw] redirect_location
+    #   Specifies an optional metadata property for website redirects,
+    #   `x-amz-website-redirect-location`. Allows webpage redirects if the
+    #   object is accessed through a website endpoint.
     #   @return [String]
     #
     # @!attribute [rw] requester_pays
@@ -3117,6 +3842,10 @@ module Aws::S3Control
     #   @return [String]
     #
     # @!attribute [rw] target_key_prefix
+    #   Specifies the folder prefix into which you would like the objects to
+    #   be copied. For example, to copy objects into a folder named
+    #   "Folder1" in the destination bucket, set the TargetKeyPrefix to
+    #   "Folder1/".
     #   @return [String]
     #
     # @!attribute [rw] object_lock_legal_hold_status
@@ -3157,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:
     #
@@ -3212,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].
     #
@@ -3230,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
@@ -3365,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*.
     #
     #
     #
@@ -3399,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].
     #
     #
     #
@@ -3444,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*.
     #
     #
     #
@@ -3476,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*.
     #
     #
     #
@@ -3506,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*.
     #
     #
     #
@@ -3523,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].
     #
     #
     #
@@ -3577,6 +4336,303 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass SSEKMS
+    #   data as a hash:
+    #
+    #       {
+    #         key_id: "SSEKMSKeyId", # required
+    #       }
+    #
+    # @!attribute [rw] key_id
+    #   A container for the ARN of the SSE-KMS encryption. This property is
+    #   read-only and follows the following format: `
+    #   arn:aws:kms:us-east-1:example-account-id:key/example-9a73-4afc-8d29-8f5900cef44e
+    #   `
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/SSEKMS AWS API Documentation
+    #
+    class SSEKMS < Struct.new(
+      :key_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/SSES3 AWS API Documentation
+    #
+    class SSES3 < Aws::EmptyStructure; end
+
+    # @note When making an API call, you may pass SelectionCriteria
+    #   data as a hash:
+    #
+    #       {
+    #         delimiter: "StorageLensPrefixLevelDelimiter",
+    #         max_depth: 1,
+    #         min_storage_bytes_percentage: 1.0,
+    #       }
+    #
+    # @!attribute [rw] delimiter
+    #   A container for the delimiter of the selection criteria being used.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_depth
+    #   The max depth of the selection criteria
+    #   @return [Integer]
+    #
+    # @!attribute [rw] min_storage_bytes_percentage
+    #   The minimum number of storage bytes percentage whose metrics will be
+    #   selected.
+    #
+    #   <note markdown="1"> You must choose a value greater than or equal to `1.0`.
+    #
+    #    </note>
+    #   @return [Float]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/SelectionCriteria AWS API Documentation
+    #
+    class SelectionCriteria < Struct.new(
+      :delimiter,
+      :max_depth,
+      :min_storage_bytes_percentage)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The AWS organization for your S3 Storage Lens.
+    #
+    # @note When making an API call, you may pass StorageLensAwsOrg
+    #   data as a hash:
+    #
+    #       {
+    #         arn: "AwsOrgArn", # required
+    #       }
+    #
+    # @!attribute [rw] arn
+    #   A container for the Amazon Resource Name (ARN) of the AWS
+    #   organization. This property is read-only and follows the following
+    #   format: `
+    #   arn:aws:organizations:us-east-1:example-account-id:organization/o-ex2l495dck
+    #   `
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/StorageLensAwsOrg AWS API Documentation
+    #
+    class StorageLensAwsOrg < Struct.new(
+      :arn)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A container for the Amazon S3 Storage Lens configuration.
+    #
+    # @note When making an API call, you may pass StorageLensConfiguration
+    #   data as a hash:
+    #
+    #       {
+    #         id: "ConfigId", # required
+    #         account_level: { # required
+    #           activity_metrics: {
+    #             is_enabled: false,
+    #           },
+    #           bucket_level: { # required
+    #             activity_metrics: {
+    #               is_enabled: false,
+    #             },
+    #             prefix_level: {
+    #               storage_metrics: { # required
+    #                 is_enabled: false,
+    #                 selection_criteria: {
+    #                   delimiter: "StorageLensPrefixLevelDelimiter",
+    #                   max_depth: 1,
+    #                   min_storage_bytes_percentage: 1.0,
+    #                 },
+    #               },
+    #             },
+    #           },
+    #         },
+    #         include: {
+    #           buckets: ["S3BucketArnString"],
+    #           regions: ["S3AWSRegion"],
+    #         },
+    #         exclude: {
+    #           buckets: ["S3BucketArnString"],
+    #           regions: ["S3AWSRegion"],
+    #         },
+    #         data_export: {
+    #           s3_bucket_destination: { # required
+    #             format: "CSV", # required, accepts CSV, Parquet
+    #             output_schema_version: "V_1", # required, accepts V_1
+    #             account_id: "AccountId", # required
+    #             arn: "S3BucketArnString", # required
+    #             prefix: "Prefix",
+    #             encryption: {
+    #               sses3: {
+    #               },
+    #               ssekms: {
+    #                 key_id: "SSEKMSKeyId", # required
+    #               },
+    #             },
+    #           },
+    #         },
+    #         is_enabled: false, # required
+    #         aws_org: {
+    #           arn: "AwsOrgArn", # required
+    #         },
+    #         storage_lens_arn: "StorageLensArn",
+    #       }
+    #
+    # @!attribute [rw] id
+    #   A container for the Amazon S3 Storage Lens configuration ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] account_level
+    #   A container for all the account-level configurations of your S3
+    #   Storage Lens configuration.
+    #   @return [Types::AccountLevel]
+    #
+    # @!attribute [rw] include
+    #   A container for what is included in this configuration. This
+    #   container can only be valid if there is no `Exclude` container
+    #   submitted, and it's not empty.
+    #   @return [Types::Include]
+    #
+    # @!attribute [rw] exclude
+    #   A container for what is excluded in this configuration. This
+    #   container can only be valid if there is no `Include` container
+    #   submitted, and it's not empty.
+    #   @return [Types::Exclude]
+    #
+    # @!attribute [rw] data_export
+    #   A container to specify the properties of your S3 Storage Lens
+    #   metrics export including, the destination, schema and format.
+    #   @return [Types::StorageLensDataExport]
+    #
+    # @!attribute [rw] is_enabled
+    #   A container for whether the S3 Storage Lens configuration is
+    #   enabled.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] aws_org
+    #   A container for the AWS organization for this S3 Storage Lens
+    #   configuration.
+    #   @return [Types::StorageLensAwsOrg]
+    #
+    # @!attribute [rw] storage_lens_arn
+    #   The Amazon Resource Name (ARN) of the S3 Storage Lens configuration.
+    #   This property is read-only and follows the following format: `
+    #   arn:aws:s3:us-east-1:example-account-id:storage-lens/your-dashboard-name
+    #   `
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/StorageLensConfiguration AWS API Documentation
+    #
+    class StorageLensConfiguration < Struct.new(
+      :id,
+      :account_level,
+      :include,
+      :exclude,
+      :data_export,
+      :is_enabled,
+      :aws_org,
+      :storage_lens_arn)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A container to specify the properties of your S3 Storage Lens metrics
+    # export, including the destination, schema, and format.
+    #
+    # @note When making an API call, you may pass StorageLensDataExport
+    #   data as a hash:
+    #
+    #       {
+    #         s3_bucket_destination: { # required
+    #           format: "CSV", # required, accepts CSV, Parquet
+    #           output_schema_version: "V_1", # required, accepts V_1
+    #           account_id: "AccountId", # required
+    #           arn: "S3BucketArnString", # required
+    #           prefix: "Prefix",
+    #           encryption: {
+    #             sses3: {
+    #             },
+    #             ssekms: {
+    #               key_id: "SSEKMSKeyId", # required
+    #             },
+    #           },
+    #         },
+    #       }
+    #
+    # @!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
+    #
+    class StorageLensDataExport < Struct.new(
+      :s3_bucket_destination)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A container for the encryption of the S3 Storage Lens metrics exports.
+    #
+    # @note When making an API call, you may pass StorageLensDataExportEncryption
+    #   data as a hash:
+    #
+    #       {
+    #         sses3: {
+    #         },
+    #         ssekms: {
+    #           key_id: "SSEKMSKeyId", # required
+    #         },
+    #       }
+    #
+    # @!attribute [rw] sses3
+    #   @return [Types::SSES3]
+    #
+    # @!attribute [rw] ssekms
+    #   @return [Types::SSEKMS]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/StorageLensDataExportEncryption AWS API Documentation
+    #
+    class StorageLensDataExportEncryption < Struct.new(
+      :sses3,
+      :ssekms)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @note When making an API call, you may pass StorageLensTag
+    #   data as a hash:
+    #
+    #       {
+    #         key: "TagKeyString", # required
+    #         value: "TagValueString", # required
+    #       }
+    #
+    # @!attribute [rw] key
+    #   @return [String]
+    #
+    # @!attribute [rw] value
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/StorageLensTag AWS API Documentation
+    #
+    class StorageLensTag < Struct.new(
+      :key,
+      :value)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass Tagging
     #   data as a hash:
     #
@@ -3628,8 +4684,8 @@ 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*.
+    # Transitioning objects using Amazon S3 Lifecycle][1] in the *Amazon
+    # Simple Storage Service User Guide*.
     #
     #
     #
@@ -3680,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
@@ -3728,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