aws-sdk-s3 1.115.0 → 1.117.0

data/lib/aws-sdk-s3/customizations/bucket.rb

@@ -5,22 +5,6 @@ require 'uri'
 module Aws
   module S3
     class Bucket
-      # Save the old initialize method so that we can call 'super'.
-      old_initialize = instance_method(:initialize)
-      # Make the method redefinable
-      alias_method :initialize, :initialize
-      # Define a new initialize method that extracts out a bucket ARN.
-      define_method(:initialize) do |*args|
-        old_initialize.bind(self).call(*args)
-        resolved_region, arn = Plugins::ARN.resolve_arn!(
-          name,
-          client.config.region,
-          client.config.s3_use_arn_region
-        )
-        @resolved_region = resolved_region
-        @arn = arn
-      end
-
       # Deletes all objects and versioned objects from this bucket
       #
       # @example
@@ -105,14 +89,27 @@ module Aws
         if options[:virtual_host]
           scheme = options.fetch(:secure, true) ? 'https' : 'http'
           "#{scheme}://#{name}"
-        elsif @arn
-          Plugins::ARN.resolve_url!(
-            client.config.endpoint.dup,
-            @arn,
-            @resolved_region
-          ).to_s
         else
-          s3_bucket_url
+          # Taken from Aws::S3::Endpoints module
+          unless client.config.regional_endpoint
+            endpoint = client.config.endpoint.to_s
+          end
+          params = Aws::S3::EndpointParameters.new(
+            bucket: name,
+            region: client.config.region,
+            use_fips: client.config.use_fips_endpoint,
+            use_dual_stack: client.config.use_dualstack_endpoint,
+            endpoint: endpoint,
+            force_path_style: client.config.force_path_style,
+            accelerate: client.config.use_accelerate_endpoint,
+            use_global_endpoint: client.config.s3_us_east_1_regional_endpoint == 'legacy',
+            use_object_lambda_endpoint: nil,
+            disable_access_points: nil,
+            disable_multi_region_access_points: client.config.s3_disable_multiregion_access_points,
+            use_arn_region: client.config.s3_use_arn_region,
+          )
+          endpoint = Aws::S3::EndpointProvider.new.resolve_endpoint(params)
+          endpoint.url
         end
       end
 
@@ -142,29 +139,6 @@ module Aws
 
         self
       end
-
-      private
-
-      def s3_bucket_url
-        url = client.config.endpoint.dup
-        if bucket_as_hostname?(url.scheme == 'https')
-          url.host = "#{name}.#{url.host}"
-        else
-          url.path += '/' unless url.path[-1] == '/'
-          url.path += Seahorse::Util.uri_escape(name)
-        end
-        if (client.config.region == 'us-east-1') &&
-           (client.config.s3_us_east_1_regional_endpoint == 'legacy')
-          url.host = Plugins::IADRegionalEndpoint.legacy_host(url.host)
-        end
-        url.to_s
-      end
-
-      def bucket_as_hostname?(https)
-        Plugins::BucketDns.dns_compatible?(name, https) &&
-          !client.config.force_path_style
-      end
-
     end
   end
 end

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

@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+# WARNING ABOUT GENERATED CODE
+#
+# This file is generated. See the contributing guide for more information:
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
+#
+# WARNING ABOUT GENERATED CODE
+
+module Aws::S3
+  # Endpoint parameters used to influence endpoints per request.
+  #
+  # @!attribute bucket
+  #   The S3 bucket used to send the request. This is an optional parameter that will be set automatically for operations that are scoped to an S3 bucket.
+  #
+  #   @return [String]
+  #
+  # @!attribute region
+  #   The AWS region used to dispatch the request.
+  #
+  #   @return [String]
+  #
+  # @!attribute use_fips
+  #   When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute use_dual_stack
+  #   When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute endpoint
+  #   Override the endpoint used to send this request
+  #
+  #   @return [String]
+  #
+  # @!attribute force_path_style
+  #   When true, force a path-style endpoint to be used where the bucket name is part of the path.
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute accelerate
+  #   When true, use S3 Accelerate. NOTE: Not all regions support S3 accelerate.
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute use_global_endpoint
+  #   Whether the global endpoint should be used, rather then the regional endpoint for us-east-1.
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute use_object_lambda_endpoint
+  #   Internal parameter to use object lambda endpoint for an operation (eg: WriteGetObjectResponse)
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute disable_access_points
+  #   Internal parameter to disable Access Point Buckets
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute disable_multi_region_access_points
+  #   Whether multi-region access points (MRAP) should be disabled.
+  #
+  #   @return [Boolean]
+  #
+  # @!attribute use_arn_region
+  #   When an Access Point ARN is provided and this flag is enabled, the SDK MUST use the ARN's region when constructing the endpoint instead of the client's configured region.
+  #
+  #   @return [Boolean]
+  #
+  EndpointParameters = Struct.new(
+    :bucket,
+    :region,
+    :use_fips,
+    :use_dual_stack,
+    :endpoint,
+    :force_path_style,
+    :accelerate,
+    :use_global_endpoint,
+    :use_object_lambda_endpoint,
+    :disable_access_points,
+    :disable_multi_region_access_points,
+    :use_arn_region,
+  ) do
+    include Aws::Structure
+
+    # @api private
+    class << self
+      PARAM_MAP = {
+        'Bucket' => :bucket,
+        'Region' => :region,
+        'UseFIPS' => :use_fips,
+        'UseDualStack' => :use_dual_stack,
+        'Endpoint' => :endpoint,
+        'ForcePathStyle' => :force_path_style,
+        'Accelerate' => :accelerate,
+        'UseGlobalEndpoint' => :use_global_endpoint,
+        'UseObjectLambdaEndpoint' => :use_object_lambda_endpoint,
+        'DisableAccessPoints' => :disable_access_points,
+        'DisableMultiRegionAccessPoints' => :disable_multi_region_access_points,
+        'UseArnRegion' => :use_arn_region,
+      }.freeze
+    end
+
+    def initialize(options = {})
+      self[:bucket] = options[:bucket]
+      self[:region] = options[:region]
+      self[:use_fips] = options[:use_fips]
+      self[:use_fips] = false if self[:use_fips].nil?
+      if self[:use_fips].nil?
+        raise ArgumentError, "Missing required EndpointParameter: :use_fips"
+      end
+      self[:use_dual_stack] = options[:use_dual_stack]
+      self[:use_dual_stack] = false if self[:use_dual_stack].nil?
+      if self[:use_dual_stack].nil?
+        raise ArgumentError, "Missing required EndpointParameter: :use_dual_stack"
+      end
+      self[:endpoint] = options[:endpoint]
+      self[:force_path_style] = options[:force_path_style]
+      self[:accelerate] = options[:accelerate]
+      self[:accelerate] = false if self[:accelerate].nil?
+      if self[:accelerate].nil?
+        raise ArgumentError, "Missing required EndpointParameter: :accelerate"
+      end
+      self[:use_global_endpoint] = options[:use_global_endpoint]
+      self[:use_global_endpoint] = false if self[:use_global_endpoint].nil?
+      if self[:use_global_endpoint].nil?
+        raise ArgumentError, "Missing required EndpointParameter: :use_global_endpoint"
+      end
+      self[:use_object_lambda_endpoint] = options[:use_object_lambda_endpoint]
+      self[:disable_access_points] = options[:disable_access_points]
+      self[:disable_multi_region_access_points] = options[:disable_multi_region_access_points]
+      self[:disable_multi_region_access_points] = false if self[:disable_multi_region_access_points].nil?
+      if self[:disable_multi_region_access_points].nil?
+        raise ArgumentError, "Missing required EndpointParameter: :disable_multi_region_access_points"
+      end
+      self[:use_arn_region] = options[:use_arn_region]
+    end
+  end
+end