aws-sdk-s3control 1.41.0 → 1.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d28bd52b6bbe706f6c9d1916dd640c52d67f7ea8a0c33b609e0307e10989b8
-  data.tar.gz: 3a3ab4008947deb24aa608392770cef54805f6380801ac7b704da39470584d5b
+  metadata.gz: d88530f39288e09d88b63b381f0fd87dffcdc8c4bc0b33f58baae8ec5a252d39
+  data.tar.gz: 119e3e453e4ddb5b6481b26c4fc2c00d42f6388c555c80a0e9d74ec03307568b
 SHA512:
-  metadata.gz: 8283dd3eb854ac964b4897e34cf7103900f5b578279ddf998ba8dadb0570dc0d47091fcdc387d32d133878e75e830fd7a571dbc2adffa9665aa4ba73272241d9
-  data.tar.gz: a8f4e1818d04ed038b8cb943beb842b8b376291af02f409ed92a5126c2e62cbea7ac76e363e520b574ed28381a128b66705004959f59062d0e42c3fb83d0ce9b
+  metadata.gz: f1a409a208d7eb4a653f8eec759346139d42cc19efbec946ef336f42ce664c0b6cab69c22a6934b64ac30792f67b93290820268f72da6ab73275bc89372f5e67
+  data.tar.gz: afa3458e89c82e3128bcfd25b31241abc7b15894a668d1b0a67f993851d063b7ad2599f8bdc11f94497b464f4620e10ef63c02ae95a08ef036dc648e4acc3ac0

data/CHANGELOG.md

@@ -1,6 +1,30 @@
 Unreleased Changes
 ------------------
 
+1.44.0 (2021-11-30)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
+* Issue - Fix a bug where the dualstack plugin was dropping URI paths.
+
+1.43.0 (2021-11-22)
+------------------
+
+* Feature - Added Amazon CloudWatch publishing option for S3 Storage Lens metrics.
+
+1.42.0 (2021-11-04)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
+* Feature - Support FIPS endpoints for S3 Outposts using Bucket and Access Point ARNs.
+
+1.41.1 (2021-10-20)
+------------------
+
+* Issue - use the correct service with the `EndpointProvider` to determine `sigv4_region`.
+
 1.41.0 (2021-10-18)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.41.0
+1.44.0

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

@@ -23,30 +23,36 @@ module Aws
       end
 
       def support_fips?
-        false
+        true
       end
 
       def validate_arn!
         unless @service == 's3-outposts'
-          raise ArgumentError, 'Must provide a valid S3 outposts ARN.'
+          raise ArgumentError, 'Must provide a valid S3 Outpost Access '\
+                               'Point ARN.'
         end
 
         if @region.empty? || @account_id.empty?
           raise ArgumentError,
-                'S3 accesspoint ARNs must contain both a region '\
-                'and an account id.'
+                'S3 Outpost Access Point ARNs must contain both a region '\
+                'and an Account ID.'
+        end
+
+        if @region.include?('-fips') || @region.include?('fips-')
+          raise ArgumentError,
+                'S3 Outpost Access Point ARNs cannot contain a FIPS region.'
         end
 
         if @type != 'outpost' && @subtype != 'accesspoint'
-          raise ArgumentError, 'Invalid ARN, resource format is not correct'
+          raise ArgumentError, 'Invalid ARN, resource format is not correct.'
         end
 
         if @outpost_id.nil? || @outpost_id.empty?
-          raise ArgumentError, 'Missing ARN outpost id.'
+          raise ArgumentError, 'Missing ARN Outpost ID.'
         end
 
         if @access_point_name.nil? || @access_point_name.empty?
-          raise ArgumentError, 'Missing ARN accesspoint name.'
+          raise ArgumentError, 'Missing ARN Access Point name.'
         end
 
         if @extra
@@ -68,11 +74,11 @@ module Aws
       end
 
       # Outpost Access Point ARNs currently do not support dualstack
-      def host_url(region, _dualstack = false, custom_endpoint = nil)
+      def host_url(region, fips = false, _dualstack = false, custom_endpoint = nil)
         if custom_endpoint
           custom_endpoint
         else
-          "s3-outposts.#{region}.amazonaws.com"
+          "s3-outposts#{'-fips' if fips}.#{region}.amazonaws.com"
         end
       end
     end

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

@@ -28,13 +28,18 @@ module Aws
 
       def validate_arn!
         unless @service == 's3-outposts'
-          raise ArgumentError, 'Must provide a valid S3 outposts bucket ARN.'
+          raise ArgumentError, 'Must provide a valid S3 Outpost Bucket ARN.'
         end
 
         if @region.empty? || @account_id.empty?
           raise ArgumentError,
-                'S3 accesspoint ARNs must contain both a region '\
-                'and an account id.'
+                'S3 Outpost Bucket ARNs must contain both a region '\
+                'and an Account ID.'
+        end
+
+        if @region.include?('-fips') || @region.include?('fips-')
+          raise ArgumentError,
+                'S3 Outpost Bucket ARNs cannot contain a FIPS region.'
         end
 
         if @type != 'outpost' && @subtype != 'bucket'
@@ -42,16 +47,16 @@ module Aws
         end
 
         if @outpost_id.nil? || @outpost_id.empty?
-          raise ArgumentError, 'Missing ARN outpost id.'
+          raise ArgumentError, 'Missing ARN Outpost ID.'
         end
 
         if @bucket_name.nil? || @bucket_name.empty?
-          raise ArgumentError, 'Missing ARN accesspoint name.'
+          raise ArgumentError, 'Missing ARN bucket name.'
         end
 
         if @extra
           raise ArgumentError,
-                'ARN outpost bucket must be a single value.'
+                'ARN Outpost bucket must be a single value.'
         end
 
         unless Seahorse::Util.host_label?(@outpost_id)
@@ -64,11 +69,11 @@ module Aws
       end
 
       # Outpost Bucket ARNs currently do not support dualstack
-      def host_url(region, _dualstack = false, custom_endpoint = nil)
+      def host_url(region, fips = false, _dualstack = false, custom_endpoint = nil)
         if custom_endpoint
           custom_endpoint
         else
-          "s3-outposts.#{region}.amazonaws.com"
+          "s3-outposts#{'-fips' if fips}.#{region}.amazonaws.com"
         end
       end
     end

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

@@ -125,7 +125,9 @@ module Aws::S3Control
     #     * EC2/ECS IMDS instance profile - When used by default, the timeouts
     #       are very aggressive. Construct and pass an instance of
     #       `Aws::InstanceProfileCredentails` or `Aws::ECSCredentials` to
-    #       enable retries and extended timeouts.
+    #       enable retries and extended timeouts. Instance profile credential
+    #       fetching can be disabled by setting ENV['AWS_EC2_METADATA_DISABLED']
+    #       to true.
     #
     #   @option options [required, String] :region
     #     The AWS region to connect to.  The configured `:region` is
@@ -287,9 +289,14 @@ module Aws::S3Control
     #     ** Please note ** When response stubbing is enabled, no HTTP
     #     requests are made, and retries are disabled.
     #
-    #   @option options [Boolean] :use_dualstack_endpoint (false)
-    #     When set to `true`, IPv6-compatible bucket endpoints will be used
-    #     for all operations.
+    #   @option options [Boolean] :use_dualstack_endpoint
+    #     When set to `true`, dualstack enabled endpoints (with `.aws` TLD)
+    #     will be used if available.
+    #
+    #   @option options [Boolean] :use_fips_endpoint
+    #     When set to `true`, fips compatible endpoints will be used if available.
+    #     When a `fips` region is used, the region is normalized and this config
+    #     is set to `true`.
     #
     #   @option options [Boolean] :validate_params (true)
     #     When `true`, request parameters are validated before
@@ -3095,6 +3102,7 @@ module Aws::S3Control
     #   resp.storage_lens_configuration.data_export.s3_bucket_destination.arn #=> String
     #   resp.storage_lens_configuration.data_export.s3_bucket_destination.prefix #=> String
     #   resp.storage_lens_configuration.data_export.s3_bucket_destination.encryption.ssekms.key_id #=> String
+    #   resp.storage_lens_configuration.data_export.cloud_watch_metrics.is_enabled #=> Boolean
     #   resp.storage_lens_configuration.is_enabled #=> Boolean
     #   resp.storage_lens_configuration.aws_org.arn #=> String
     #   resp.storage_lens_configuration.storage_lens_arn #=> String
@@ -4417,7 +4425,7 @@ module Aws::S3Control
     #         regions: ["S3AWSRegion"],
     #       },
     #       data_export: {
-    #         s3_bucket_destination: { # required
+    #         s3_bucket_destination: {
     #           format: "CSV", # required, accepts CSV, Parquet
     #           output_schema_version: "V_1", # required, accepts V_1
     #           account_id: "AccountId", # required
@@ -4431,6 +4439,9 @@ module Aws::S3Control
     #             },
     #           },
     #         },
+    #         cloud_watch_metrics: {
+    #           is_enabled: false, # required
+    #         },
     #       },
     #       is_enabled: false, # required
     #       aws_org: {
@@ -4652,7 +4663,7 @@ module Aws::S3Control
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3control'
-      context[:gem_version] = '1.41.0'
+      context[:gem_version] = '1.44.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -41,6 +41,7 @@ module Aws::S3Control
     BucketLocationConstraint = Shapes::StringShape.new(name: 'BucketLocationConstraint')
     BucketName = Shapes::StringShape.new(name: 'BucketName')
     Buckets = Shapes::ListShape.new(name: 'Buckets')
+    CloudWatchMetrics = Shapes::StructureShape.new(name: 'CloudWatchMetrics')
     ConfigId = Shapes::StringShape.new(name: 'ConfigId')
     ConfirmRemoveSelfBucketAccess = Shapes::BooleanShape.new(name: 'ConfirmRemoveSelfBucketAccess')
     ConfirmationRequired = Shapes::BooleanShape.new(name: 'ConfirmationRequired')
@@ -399,6 +400,9 @@ module Aws::S3Control
 
     Buckets.member = Shapes::ShapeRef.new(shape: S3BucketArnString, location_name: "Arn")
 
+    CloudWatchMetrics.add_member(:is_enabled, Shapes::ShapeRef.new(shape: IsEnabled, required: true, location_name: "IsEnabled"))
+    CloudWatchMetrics.struct_class = Types::CloudWatchMetrics
+
     CreateAccessPointForObjectLambdaRequest.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, required: true, location: "header", location_name: "x-amz-account-id", metadata: {"hostLabel"=>true, "hostLabelName"=>"AccountId"}))
     CreateAccessPointForObjectLambdaRequest.add_member(:name, Shapes::ShapeRef.new(shape: ObjectLambdaAccessPointName, required: true, location: "uri", location_name: "name"))
     CreateAccessPointForObjectLambdaRequest.add_member(:configuration, Shapes::ShapeRef.new(shape: ObjectLambdaConfiguration, required: true, location_name: "Configuration"))
@@ -1186,7 +1190,8 @@ module Aws::S3Control
 
     StorageLensConfigurationList.member = Shapes::ShapeRef.new(shape: ListStorageLensConfigurationEntry, location_name: "StorageLensConfiguration")
 
-    StorageLensDataExport.add_member(:s3_bucket_destination, Shapes::ShapeRef.new(shape: S3BucketDestination, required: true, location_name: "S3BucketDestination"))
+    StorageLensDataExport.add_member(:s3_bucket_destination, Shapes::ShapeRef.new(shape: S3BucketDestination, location_name: "S3BucketDestination"))
+    StorageLensDataExport.add_member(:cloud_watch_metrics, Shapes::ShapeRef.new(shape: CloudWatchMetrics, location_name: "CloudWatchMetrics"))
     StorageLensDataExport.struct_class = Types::StorageLensDataExport
 
     StorageLensDataExportEncryption.add_member(:sses3, Shapes::ShapeRef.new(shape: SSES3, location_name: "SSE-S3"))

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

@@ -39,6 +39,7 @@ client's region instead.
                 context.http_request.endpoint,
                 context.metadata[:s3_arn][:arn],
                 context.metadata[:s3_arn][:resolved_region],
+                context.metadata[:s3_arn][:fips],
                 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
@@ -78,6 +79,7 @@ client's region instead.
                 context.metadata[:s3_arn] = {
                   arn: arn,
                   resolved_region: resolved_region,
+                  fips: context.config.use_fips_endpoint,
                   dualstack: extract_dualstack_config!(context)
                 }
               end
@@ -121,8 +123,8 @@ client's region instead.
           def validate_config!(context, arn)
             if !arn.support_dualstack? && context[:use_dualstack_endpoint]
               raise ArgumentError,
-                    'Cannot provide an Outpost Access Point ARN when '\
-                    '`:use_dualstack_endpoint` is set to true.'
+                    'Cannot provide an Outpost Access Point or Bucket ARN '\
+                    'when `:use_dualstack_endpoint` is set to true.'
             end
           end
 
@@ -165,9 +167,9 @@ client's region instead.
           end
 
           # @api private
-          def resolve_url!(url, arn, region, dualstack = false, has_custom_endpoint = false)
+          def resolve_url!(url, arn, region, fips = false, dualstack = false, has_custom_endpoint = false)
             custom_endpoint = url.host if has_custom_endpoint
-            url.host = arn.host_url(region, dualstack, custom_endpoint)
+            url.host = arn.host_url(region, fips, dualstack, custom_endpoint)
             url
           end
 
@@ -189,35 +191,13 @@ client's region instead.
           end
 
           def validate_region_config!(arn, region, use_arn_region)
-            fips = arn.support_fips?
-
-            # s3-external-1 is specific just to s3 and not part of partitions
-            # aws-global is a partition region
-            unless arn.partition == 'aws' &&
-                   (region == 's3-external-1' || region == 'aws-global')
-              if !fips && arn.region.include?('fips')
-                raise ArgumentError,
-                      'FIPS region ARNs are not supported for this type of ARN.'
-              end
-
-              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`.'
-              end
-
-              # if it's a fips region, attempt to normalize it
-              if fips || use_arn_region
-                region = region.gsub('fips-', '').gsub('-fips', '')
-              end
-              if use_arn_region &&
-                 !Aws::Partitions.partition(arn.partition).region?(region)
-                raise Aws::Errors::InvalidARNPartitionError
-              end
+            if use_arn_region &&
+               !Aws::Partitions.partition(arn.partition).region?(region)
+              raise Aws::Errors::InvalidARNPartitionError
+            end
 
-              if !use_arn_region && region != arn.region
-                raise Aws::Errors::InvalidARNRegionError
-              end
+            if !use_arn_region && region != arn.region
+              raise Aws::Errors::InvalidARNRegionError
             end
           end
         end

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

@@ -5,15 +5,6 @@ module Aws
     module Plugins
       # @api private
       class Dualstack < Seahorse::Client::Plugin
-
-        option(:use_dualstack_endpoint,
-          default: false,
-          doc_type: 'Boolean',
-          docstring: <<-DOCS)
-When set to `true`, IPv6-compatible bucket endpoints will be used
-for all operations.
-          DOCS
-
         def add_handlers(handlers, config)
           handlers.add(OptionHandler, step: :initialize)
           handlers.add(DualstackHandler, step: :build, priority: 11)
@@ -40,23 +31,24 @@ for all operations.
         # @api private
         class DualstackHandler < Seahorse::Client::Handler
           def call(context)
-            if context.config.regional_endpoint && context[:use_dualstack_endpoint]
-              apply_dualstack_endpoint(context)
+            # if it's a regional endpoint and not an ARN, then construct the
+            # endpoint. regional endpoint plugin uses the dualstack config
+            if context.config.regional_endpoint && !context.metadata[:s3_arn]
+              new_endpoint = Aws::Partitions::EndpointProvider.resolve(
+                context.config.region,
+                's3-control',
+                'regional',
+                {
+                  dualstack: context[:use_dualstack_endpoint],
+                  fips: context.config.use_fips_endpoint
+                }
+              )
+              endpoint = URI.parse(context.http_request.endpoint.to_s)
+              endpoint.host = URI.parse(new_endpoint).host
+              context.http_request.endpoint = endpoint
             end
             @handler.call(context)
           end
-
-          private
-          def apply_dualstack_endpoint(context)
-            region = context.config.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
-            endpoint.port = context.http_request.endpoint.port
-            endpoint.host = host
-            context.http_request.endpoint = endpoint.to_s
-          end
         end
 
       end

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

@@ -24,7 +24,7 @@ module Aws
         option(:sigv4_region) do |cfg|
           raise Aws::Errors::MissingRegionError if cfg.region.nil?
 
-          Aws::Partitions::EndpointProvider.signing_region(cfg.region, 's3')
+          Aws::Partitions::EndpointProvider.signing_region(cfg.region, 's3-control')
         end
 
         def add_handlers(handlers, _cfg)
@@ -54,8 +54,9 @@ module Aws
               # 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
+                fips = context.config.use_fips_endpoint
                 context.http_request.endpoint.host =
-                  "s3-outposts.#{context.config.region}.amazonaws.com"
+                  "s3-outposts#{'-fips' if fips}.#{context.config.region}.amazonaws.com"
               end
               S3ControlSigner.build_v4_signer(
                 service: 's3-outposts',

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

@@ -370,6 +370,38 @@ module Aws::S3Control
       include Aws::Structure
     end
 
+    # A container for enabling Amazon CloudWatch publishing for S3 Storage
+    # Lens metrics.
+    #
+    # For more information about publishing S3 Storage Lens metrics to
+    # CloudWatch, see [Monitor S3 Storage Lens metrics in CloudWatch][1] in
+    # the *Amazon S3 User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage_lens_view_metrics_cloudwatch.html
+    #
+    # @note When making an API call, you may pass CloudWatchMetrics
+    #   data as a hash:
+    #
+    #       {
+    #         is_enabled: false, # required
+    #       }
+    #
+    # @!attribute [rw] is_enabled
+    #   A container that indicates whether CloudWatch publishing for S3
+    #   Storage Lens metrics is enabled. A value of `true` indicates that
+    #   CloudWatch publishing for S3 Storage Lens metrics is enabled.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/CloudWatchMetrics AWS API Documentation
+    #
+    class CloudWatchMetrics < Struct.new(
+      :is_enabled)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateAccessPointForObjectLambdaRequest
     #   data as a hash:
     #
@@ -4932,7 +4964,7 @@ module Aws::S3Control
     #             regions: ["S3AWSRegion"],
     #           },
     #           data_export: {
-    #             s3_bucket_destination: { # required
+    #             s3_bucket_destination: {
     #               format: "CSV", # required, accepts CSV, Parquet
     #               output_schema_version: "V_1", # required, accepts V_1
     #               account_id: "AccountId", # required
@@ -4946,6 +4978,9 @@ module Aws::S3Control
     #                 },
     #               },
     #             },
+    #             cloud_watch_metrics: {
+    #               is_enabled: false, # required
+    #             },
     #           },
     #           is_enabled: false, # required
     #           aws_org: {
@@ -5980,7 +6015,7 @@ module Aws::S3Control
     #           regions: ["S3AWSRegion"],
     #         },
     #         data_export: {
-    #           s3_bucket_destination: { # required
+    #           s3_bucket_destination: {
     #             format: "CSV", # required, accepts CSV, Parquet
     #             output_schema_version: "V_1", # required, accepts V_1
     #             account_id: "AccountId", # required
@@ -5994,6 +6029,9 @@ module Aws::S3Control
     #               },
     #             },
     #           },
+    #           cloud_watch_metrics: {
+    #             is_enabled: false, # required
+    #           },
     #         },
     #         is_enabled: false, # required
     #         aws_org: {
@@ -6067,7 +6105,7 @@ module Aws::S3Control
     #   data as a hash:
     #
     #       {
-    #         s3_bucket_destination: { # required
+    #         s3_bucket_destination: {
     #           format: "CSV", # required, accepts CSV, Parquet
     #           output_schema_version: "V_1", # required, accepts V_1
     #           account_id: "AccountId", # required
@@ -6081,6 +6119,9 @@ module Aws::S3Control
     #             },
     #           },
     #         },
+    #         cloud_watch_metrics: {
+    #           is_enabled: false, # required
+    #         },
     #       }
     #
     # @!attribute [rw] s3_bucket_destination
@@ -6093,10 +6134,16 @@ module Aws::S3Control
     #    </note>
     #   @return [Types::S3BucketDestination]
     #
+    # @!attribute [rw] cloud_watch_metrics
+    #   A container for enabling Amazon CloudWatch publishing for S3 Storage
+    #   Lens metrics.
+    #   @return [Types::CloudWatchMetrics]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/s3control-2018-08-20/StorageLensDataExport AWS API Documentation
     #
     class StorageLensDataExport < Struct.new(
-      :s3_bucket_destination)
+      :s3_bucket_destination,
+      :cloud_watch_metrics)
       SENSITIVE = []
       include Aws::Structure
     end

data/lib/aws-sdk-s3control.rb

@@ -48,6 +48,6 @@ require_relative 'aws-sdk-s3control/customizations'
 # @!group service
 module Aws::S3Control
 
-  GEM_VERSION = '1.41.0'
+  GEM_VERSION = '1.44.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3control
 version: !ruby/object:Gem::Version
-  version: 1.41.0
+  version: 1.44.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
@@ -33,7 +33,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.121.2
+        version: 3.122.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.121.2
+        version: 3.122.0
 description: Official AWS Ruby gem for AWS S3 Control. This gem is part of the AWS
   SDK for Ruby.
 email: