aws-sdk-s3 1.48.0 → 1.183.0

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Aws
   module S3
     class Bucket
-
       # Deletes all objects and versioned objects from this bucket
       #
       # @example
@@ -31,10 +32,10 @@ module Aws
       #   each attempt.
       #
       # @return [void]
-      def delete! options = { }
+      def delete!(options = {})
         options = {
           initial_wait: 1.3,
-          max_attempts: 3,
+          max_attempts: 3
         }.merge(options)
 
         attempts = 0
@@ -43,38 +44,72 @@ module Aws
           delete
         rescue Errors::BucketNotEmpty
           attempts += 1
-          if attempts >= options[:max_attempts]
-            raise
-          else
-            Kernel.sleep(options[:initial_wait] ** attempts)
-            retry
-          end
+          raise if attempts >= options[:max_attempts]
+
+          Kernel.sleep(options[:initial_wait]**attempts)
+          retry
         end
       end
 
       # Returns a public URL for this bucket.
       #
-      #     bucket = s3.bucket('bucket-name')
-      #     bucket.url
-      #     #=> "https://bucket-name.s3.amazonaws.com"
+      # @example
+      #
+      #   bucket = s3.bucket('bucket-name')
+      #   bucket.url
+      #   #=> "https://bucket-name.s3.amazonaws.com"
+      #
+      # It will also work when provided an Access Point ARN.
+      #
+      # @example
+      #
+      #   bucket = s3.bucket(
+      #     'arn:aws:s3:us-east-1:123456789012:accesspoint:myendpoint'
+      #   )
+      #   bucket.url
+      #   #=> "https://myendpoint-123456789012.s3-accesspoint.us-west-2.amazonaws.com"
       #
       # You can pass `virtual_host: true` to use the bucket name as the
       # host name.
       #
-      #     bucket = s3.bucket('my.bucket.com')
+      #     bucket = s3.bucket('my-bucket.com')
       #     bucket.url(virtual_host: true)
-      #     #=> "http://my.bucket.com"
+      #     #=> "http://my-bucket.com"
       #
       # @option options [Boolean] :virtual_host (false) When `true`,
       #   the bucket name will be used as the host name. This is useful
       #   when you have a CNAME configured for this bucket.
       #
+      # @option options [Boolean] :secure (true) When `false`, http
+      #   will be used with virtual_host.  This is required when
+      #   the bucket name has a dot (.) in it.
+      #
       # @return [String] the URL for this bucket.
       def url(options = {})
         if options[:virtual_host]
-          "http://#{name}"
+          scheme = options.fetch(:secure, true) ? 'https' : 'http'
+          "#{scheme}://#{name}"
         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
 
@@ -93,35 +128,19 @@ module Aws
           client.config.credentials,
           client.config.region,
           name,
-          {url: url}.merge(options)
+          { url: url }.merge(options)
         )
       end
 
       # @api private
       def load
-        @data = client.list_buckets.buckets.find { |b| b.name == name }
-        raise "unable to load bucket #{name}" if @data.nil?
-        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)
+        @data = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
+          client.list_buckets.buckets.find { |b| b.name == name }
         end
-        url.to_s
-      end
+        raise "unable to load bucket #{name}" if @data.nil?
 
-      def bucket_as_hostname?(https)
-        Plugins::BucketDns.dns_compatible?(name, https) &&
-        !client.config.force_path_style
+        self
       end
-
     end
   end
 end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Aws
+  module S3
+    module Errors
+      # Hijack PermanentRedirect dynamic error to include the bucket, region,
+      # and endpoint.
+      class PermanentRedirect < ServiceError
+        # @param [Seahorse::Client::RequestContext] context
+        # @param [String] message
+        # @param [Aws::S3::Types::PermanentRedirect] _data
+        def initialize(context, message, _data = Aws::EmptyStructure.new)
+          data = Aws::S3::Types::PermanentRedirect.new(message: message)
+          body = context.http_response.body_contents
+          if (endpoint = body.match(/<Endpoint>(.+?)<\/Endpoint>/))
+            data.endpoint = endpoint[1]
+          end
+          if (bucket = body.match(/<Bucket>(.+?)<\/Bucket>/))
+            data.bucket = bucket[1]
+          end
+          data.region = context.http_response.headers['x-amz-bucket-region']
+          super(context, message, data)
+        end
+      end
+
+      # Hijack PermanentRedirect (HeadBucket case - no body) dynamic error to
+      # include the region.
+      class Http301Error < ServiceError
+        # @param [Seahorse::Client::RequestContext] context
+        # @param [String] message
+        # @param [Aws::S3::Types::PermanentRedirect] _data
+        def initialize(context, message, _data = Aws::EmptyStructure.new)
+          data = Aws::S3::Types::PermanentRedirect.new(message: message)
+          data.region = context.http_response.headers['x-amz-bucket-region']
+          super(context, message, data)
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module S3
     class MultipartUpload