aws-sdk-s3control 1.41.1 → 1.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb18d70c47a61e80a060b5724b6f9e084f69eebbf0c9d41ba4bdecb6c9919b69
-  data.tar.gz: 2c31f9060b0ad907eed64a0bdc9a6a24bcc93f1c410794cd8e3e0de211e4f170
+  metadata.gz: 3d717b8608be6b064bafa5fd3bfe4cab6a0bd53200071478dcddb696a087c3ed
+  data.tar.gz: 66b70379fe4e6040954b137ec45e5e67d67f9f8d05598c3e9fc950e3314712c6
 SHA512:
-  metadata.gz: 76a114672bc68c8abf9bb439b2f31619ab568385741cff18a7a3bf36cfe667daa10f72a074ab57a07f5f71e590c44f77e1e2882ef4feb0f3379b9b5106ce8cf8
-  data.tar.gz: 7666c8fa181b21dbd20e0f92cd3a35a36915a9fde553259ad48830ddf227851e255bc885fc2235629d2d97cf7bde69238efa6b7f2d2625edfda4c3588e7d0333
+  metadata.gz: 4608d26f4f298e23c24f5656bb05308175694e9154d054a96b983284b9836bb52f24ac39b45e373fb5189fc0cb6b0ea4385d34f35d8954458cd61fbeeb384c43
+  data.tar.gz: 9fad7cb5825ed52608717ace057089b3c1d3b9feb43a83cfbb73d0a51d10c2bce2c94cf0177ce8430b00edd3ac021a73ccb99e7642118b6b7fd2223078cfaad4

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Unreleased Changes
 ------------------
 
+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)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.41.1
+1.42.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

@@ -287,9 +287,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
@@ -4652,7 +4657,7 @@ module Aws::S3Control
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3control'
-      context[:gem_version] = '1.41.1'
+      context[:gem_version] = '1.42.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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,22 @@ 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]
+              endpoint = Aws::Partitions::EndpointProvider.resolve(
+                context.config.region,
+                's3-control',
+                'regional',
+                {
+                  dualstack: context[:use_dualstack_endpoint],
+                  fips: context.config.use_fips_endpoint
+                }
+              )
+              context.http_request.endpoint = URI.parse(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

@@ -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.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3control
 version: !ruby/object:Gem::Version
-  version: 1.41.1
+  version: 1.42.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-11-04 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: