aws-sdk-s3 1.93.0 → 1.93.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f1d3671e23de751982bd25a5481612d1cf95d7a9d99e5c7946bc78f38ca49b
-  data.tar.gz: '069c0978d08f329e2f4b849c51287d144930dced9c46920d5c12ae733c0097ed'
+  metadata.gz: 9720f4044b674d912ad1b52f866a0d433358503dd6cf4d8aa11391619674a15d
+  data.tar.gz: 6e6ddada3db5629e08660364136608876ce4bac0076ad31a203dd90d9ad52c17
 SHA512:
-  metadata.gz: 40e332366cf470ed55ca8397e1ffd6ffa9fc18d51db47791c0efea224a4e626d97533b08fffa881fc7e3ab77252009ca393e2573ad9e28e636724270c3ccc2c6
-  data.tar.gz: 73c4e75ceb0b8ea668025c830f1ecfa577527e663c77b149a5a533988c40e43ba2016122db1244b927adbe6a6eba3ad95cc2d54925993a66cb4d1d0380bcf739
+  metadata.gz: 769072321971f35f4fc668628908f9efeb4565a90a7aa1575fe71b59d01e6049899e48d468c59dd2fb540cdccb5fbe5de70dacebbc2081fd578a326cf5a93d23
+  data.tar.gz: 449f8325e0e316b16cff1e0fef1e108072cd5aade0eb4581db803645d9568fb925b6472ae95d6694666b819cb4606830a6d7606d71a476b077d4af66e80ba4fd

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Unreleased Changes
 ------------------
 
+1.93.1 (2021-04-12)
+------------------
+
+* Issue - Fix FIPS and global endpoint behavior for S3 ARNs.
+
+* Issue - Increases `multipart_threshold` default from 15 megabytes to 100 megabytes.
+
 1.93.0 (2021-03-24)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.93.0
+1.93.1

data/lib/aws-sdk-s3.rb

@@ -69,6 +69,6 @@ require_relative 'aws-sdk-s3/event_streams'
 # @!group service
 module Aws::S3
 
-  GEM_VERSION = '1.93.0'
+  GEM_VERSION = '1.93.1'
 
 end

data/lib/aws-sdk-s3/arn/access_point_arn.rb

@@ -9,8 +9,6 @@ module Aws
         @type, @access_point_name, @extra = @resource.split(/[:,\/]/)
       end
 
-      attr_reader :access_point_name
-
       def support_dualstack?
         true
       end
@@ -52,13 +50,13 @@ module Aws
         end
       end
 
-      def host_url(region, dualstack = false, custom_endpoint = nil)
+      def host_url(region, fips = false, dualstack = false, custom_endpoint = nil)
         pfx = "#{@access_point_name}-#{@account_id}"
         if custom_endpoint
           "#{pfx}.#{custom_endpoint}"
         else
           sfx = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
-          "#{pfx}.s3-accesspoint#{'.dualstack' if dualstack}.#{region}.#{sfx}"
+          "#{pfx}.s3-accesspoint#{'-fips' if fips}#{'.dualstack' if dualstack}.#{region}.#{sfx}"
         end
       end
     end

data/lib/aws-sdk-s3/arn/object_lambda_arn.rb

@@ -9,8 +9,6 @@ module Aws
         @type, @access_point_name, @extra = @resource.split(/[:,\/]/)
       end
 
-      attr_reader :access_point_name
-
       def support_dualstack?
         false
       end
@@ -52,13 +50,13 @@ module Aws
         end
       end
 
-      def host_url(region, _dualstack = false, custom_endpoint = nil)
+      def host_url(region, fips = false, _dualstack = false, custom_endpoint = nil)
         pfx = "#{@access_point_name}-#{@account_id}"
         if custom_endpoint
           "#{pfx}.#{custom_endpoint}"
         else
           sfx = Aws::Partitions::EndpointProvider.dns_suffix_for(region)
-          "#{pfx}.s3-object-lambda.#{region}.#{sfx}"
+          "#{pfx}.s3-object-lambda#{'-fips' if fips}.#{region}.#{sfx}"
         end
       end
     end

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

@@ -10,8 +10,6 @@ module Aws
           @resource.split(/[:,\/]/)
       end
 
-      attr_reader :outpost_id, :access_point_name
-
       def support_dualstack?
         false
       end
@@ -62,7 +60,7 @@ module Aws
       end
 
       # Outpost 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)
         pfx = "#{@access_point_name}-#{@account_id}.#{@outpost_id}"
         if custom_endpoint
           "#{pfx}.#{custom_endpoint}"

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

@@ -13910,7 +13910,7 @@ module Aws::S3
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.93.0'
+      context[:gem_version] = '1.93.1'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -7,7 +7,7 @@ module Aws
     # @api private
     class FileUploader
 
-      FIFTEEN_MEGABYTES = 15 * 1024 * 1024
+      ONE_HUNDRED_MEGABYTES = 100 * 1024 * 1024
 
       # @param [Hash] options
       # @option options [Client] :client
@@ -16,7 +16,7 @@ module Aws
         @options = options
         @client = options[:client] || Client.new
         @multipart_threshold = options[:multipart_threshold] ||
-                               FIFTEEN_MEGABYTES
+                               ONE_HUNDRED_MEGABYTES
       end
 
       # @return [Client]

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

@@ -39,6 +39,7 @@ be made. Set to `false` to use the 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
@@ -63,9 +64,17 @@ be made. Set to `false` to use the client's region instead.
               if arn
                 validate_config!(context, arn)
 
+                fips = false
+                if resolved_region.include?('fips')
+                  fips = true
+                  resolved_region = resolved_region.gsub('fips-', '')
+                                                   .gsub('-fips', '')
+                end
+
                 context.metadata[:s3_arn] = {
                   arn: arn,
                   resolved_region: resolved_region,
+                  fips: fips,
                   dualstack: extract_dualstack_config!(context)
                 }
               end
@@ -118,7 +127,7 @@ be made. Set to `false` to use the client's region instead.
               s3_arn = resolve_arn_type!(arn)
               s3_arn.validate_arn!
               validate_region_config!(s3_arn, region, use_arn_region)
-              region = s3_arn.region if use_arn_region
+              region = s3_arn.region if use_arn_region && !region.include?('fips')
               [region, s3_arn]
             else
               [region]
@@ -126,9 +135,9 @@ be made. Set to `false` to use the 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.path = url_path(url.path, arn)
             url
           end
@@ -174,33 +183,40 @@ be made. Set to `false` to use the 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.'
+            if ['s3-external-1', 'aws-global'].include?(region)
+              # These "regions" are not regional endpoints
+              unless use_arn_region
+                raise Aws::Errors::InvalidARNRegionError,
+                      'Configured client region is not a regional endpoint.'
               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`.'
+              # These "regions" are in the AWS partition
+              # Cannot use ARN region unless it's the same partition
+              unless arn.partition == 'aws'
+                raise Aws::Errors::InvalidARNPartitionError
               end
-
-              # if it's a fips region, attempt to normalize it
-              if fips || use_arn_region
+            else
+              if region.include?('fips')
+                # If ARN type doesn't support FIPS but the client region is FIPS
+                unless arn.support_fips?
+                  raise ArgumentError,
+                        'FIPS client regions are not supported for this type '\
+                        'of ARN.'
+                end
+
+                fips = true
+                # Normalize the region so we can compare partition and regions
                 region = region.gsub('fips-', '').gsub('-fips', '')
               end
+
+              # Raise if the ARN and client regions are in different partitions
               if use_arn_region &&
                  !Aws::Partitions.partition(arn.partition).region?(region)
                 raise Aws::Errors::InvalidARNPartitionError
               end
 
-              if !use_arn_region && region != arn.region
+              # Raise if regions mismatch
+              # Either when it's a fips client or not using the ARN region
+              if (!use_arn_region || fips) && region != arn.region
                 raise Aws::Errors::InvalidARNRegionError
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.93.0
+  version: 1.93.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms