fog-aws 0.11.0 → 3.18.0

data/lib/fog/aws/requests/storage/get_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/access_control_list'
 
@@ -46,7 +46,7 @@ module Fog
             :object_name => object_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::AccessControlList.new,
+            :parser     => Fog::Parsers::AWS::Storage::AccessControlList.new,
             :query      => query
           })
         end
@@ -60,7 +60,7 @@ module Fog
           if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name]
             response.status = 200
             if acl.is_a?(String)
-              response.body = Fog::Storage::AWS.acl_to_hash(acl)
+              response.body = Fog::AWS::Storage.acl_to_hash(acl)
             else
               response.body = acl
             end

data/lib/fog/aws/requests/storage/get_object_http_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       module GetObjectHttpUrl
         def get_object_http_url(bucket_name, object_name, expires, options = {})
           get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'http'))

data/lib/fog/aws/requests/storage/get_object_https_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       module GetObjectHttpsUrl
         def get_object_https_url(bucket_name, object_name, expires, options = {})
           get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'https'))

data/lib/fog/aws/requests/storage/get_object_tagging.rb

@@ -0,0 +1,41 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        require 'fog/aws/parsers/storage/get_object_tagging'
+
+        # Get tags for an S3 object
+        #
+        # @param bucket_name [String] Name of bucket to read from
+        # @param object_name [String] Name of object to get tags for
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * ObjectTagging [Hash]:
+        #       * Key [String] - tag key
+        #       * Value [String] - tag value
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html
+
+        def get_object_tagging(bucket_name, object_name)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+
+          request({
+            :expects => 200,
+            :headers => {},
+            :bucket_name => bucket_name,
+            :object_name => object_name,
+            :idempotent => true,
+            :method => 'GET',
+            :parser => Fog::Parsers::AWS::Storage::GetObjectTagging.new,
+            :query => {'tagging' => nil}
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/get_object_torrent.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Get torrent for an S3 object
         #

data/lib/fog/aws/requests/storage/get_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       module GetObjectUrl
         def get_object_url(bucket_name, object_name, expires, options = {})
           unless bucket_name

data/lib/fog/aws/requests/storage/get_request_payment.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_request_payment'
 
@@ -21,7 +21,7 @@ module Fog
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetRequestPayment.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetRequestPayment.new,
             :query    => {'requestPayment' => nil}
           })
         end

data/lib/fog/aws/requests/storage/get_service.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_service'
 
@@ -15,16 +15,16 @@ module Fog
         #       * DisplayName [String] - Display name of bucket owner
         #       * ID [String] - Id of bucket owner
         #
-        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTServiceGET.html
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/RESTServiceGET.html
         #
         def get_service
           request({
             :expects  => 200,
             :headers  => {},
-            :host     => @host,
+            :host     => 's3.amazonaws.com',
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetService.new
+            :parser   => Fog::Parsers::AWS::Storage::GetService.new
           })
         end
       end

data/lib/fog/aws/requests/storage/head_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Get headers for an S3 bucket, used to verify if it exists and if you have permission to access it
         #

data/lib/fog/aws/requests/storage/head_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Get headers for an object from S3
         #

data/lib/fog/aws/requests/storage/head_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       module HeadObjectUrl
         def head_object_url(bucket_name, object_name, expires, options = {})
           unless bucket_name

data/lib/fog/aws/requests/storage/initiate_multipart_upload.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/initiate_multipart_upload'
 
@@ -32,7 +32,7 @@ module Fog
             :bucket_name => bucket_name,
             :object_name => object_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::InitiateMultipartUpload.new,
+            :parser     => Fog::Parsers::AWS::Storage::InitiateMultipartUpload.new,
             :query      => {'uploads' => nil}
           })
         end
@@ -40,7 +40,7 @@ module Fog
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def initiate_multipart_upload(bucket_name, object_name, options = {})
           verify_mock_bucket_exists(bucket_name)

data/lib/fog/aws/requests/storage/list_multipart_uploads.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/list_multipart_uploads'
 
@@ -42,7 +42,7 @@ module Fog
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::ListMultipartUploads.new,
+            :parser   => Fog::Parsers::AWS::Storage::ListMultipartUploads.new,
             :query    => options.merge!({'uploads' => nil})
           })
         end

data/lib/fog/aws/requests/storage/list_parts.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/list_parts'
 
@@ -43,7 +43,7 @@ module Fog
             :object_name => object_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::ListParts.new,
+            :parser   => Fog::Parsers::AWS::Storage::ListParts.new,
             :query    => options.merge!({'uploadId' => upload_id})
           })
         end

data/lib/fog/aws/requests/storage/post_object_hidden_fields.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       module PostObjectHiddenFields
         # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value}
         # Form should look like: <form action="http://#{bucket_name}.s3.amazonaws.com/" method="post" enctype="multipart/form-data">

data/lib/fog/aws/requests/storage/post_object_restore.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Restore an object from Glacier to its original S3 path
         #

data/lib/fog/aws/requests/storage/put_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Create an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/requests/storage/acl_utils'
 
@@ -29,7 +29,7 @@ module Fog
           headers = {}
 
           if acl.is_a?(Hash)
-            data = Fog::Storage::AWS.hash_to_acl(acl)
+            data = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
@@ -55,7 +55,7 @@ module Fog
       class Mock
         def put_bucket_acl(bucket_name, acl)
           if acl.is_a?(Hash)
-            self.data[:acls][:bucket][bucket_name] = Fog::Storage::AWS.hash_to_acl(acl)
+            self.data[:acls][:bucket][bucket_name] = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')

data/lib/fog/aws/requests/storage/put_bucket_cors.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/requests/storage/cors_utils'
 
@@ -19,7 +19,7 @@ module Fog
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTcors.html
 
         def put_bucket_cors(bucket_name, cors)
-          data = Fog::Storage::AWS.hash_to_cors(cors)
+          data = Fog::AWS::Storage.hash_to_cors(cors)
 
           headers = {}
           headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
@@ -39,7 +39,7 @@ module Fog
 
       class Mock
         def put_bucket_cors(bucket_name, cors)
-          self.data[:cors][:bucket][bucket_name] = Fog::Storage::AWS.hash_to_cors(cors)
+          self.data[:cors][:bucket][bucket_name] = Fog::AWS::Storage.hash_to_cors(cors)
         end
       end
     end

data/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change lifecycle configuration for an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_bucket_logging.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change logging status for an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_bucket_notification.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change notification configuration for an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_bucket_policy.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change bucket policy for an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_bucket_tagging.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change tag set for an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_bucket_versioning.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change versioning status for an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_bucket_website.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change website configuration for an S3 bucket
         #

data/lib/fog/aws/requests/storage/put_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Create an object in an S3 bucket
         #
@@ -18,8 +18,10 @@ module Fog
         # @option options x-amz-acl [String] Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
         # @option options x-amz-storage-class [String] Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
         # @option options x-amz-meta-#{name} Headers to be returned with object, note total size of request without body must be less than 8 KB. Each name, value pair must conform to US-ASCII.
-        # @option options encryption [String] Sets HTTP header for server-side encryption. Set to 'AES256' for SSE-S3 and SSE-C. Set to 'aws:kms' for SSE-KMS
-        # @option options encryption_key [String] Encryption customer key for SSE-C
+        # @option options x-amz-server-side-encryption [String] Sets HTTP header for server-side encryption. Set to 'AES256' for SSE-S3 and SSE-C. Set to 'aws:kms' for SSE-KMS
+        # @option options x-amz-server-side​-encryption​-customer-algorithm [String] Algorithm to use to when encrypting the object for SSE-C.
+        # @option options x-amz-server-side​-encryption​-customer-key [String] Encryption customer key for SSE-C
+        # @option options x-amz-server-side​-encryption​-customer-key-MD5 [String] MD5 digest of the encryption key for SSE-C
         # @option options x-amz-server-side-encryption-aws-kms-key-id [String] KMS key ID of the encryption key for SSE-KMS
         # @option options x-amz-server-side-encryption-context [String] Encryption context for SSE-KMS
         #
@@ -27,10 +29,9 @@ module Fog
         #   * headers [Hash]:
         #     * ETag [String] etag of new object
         #
-        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html
 
         def self.conforming_to_us_ascii!(keys, hash)
-          return if RUBY_VERSION =~ /^1\.8\./
           keys.each do |k|
             v = hash[k]
             if !v.encode(::Encoding::US_ASCII, :undef => :replace).eql?(v)
@@ -58,14 +59,14 @@ module Fog
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def put_object(bucket_name, object_name, data, options = {})
           define_mock_acl(bucket_name, object_name, options)
 
           data = parse_mock_data(data)
           headers = data[:headers].merge!(options)
-          Fog::Storage::AWS::Real.conforming_to_us_ascii! headers.keys.grep(/^x-amz-meta-/), headers
+          Fog::AWS::Storage::Real.conforming_to_us_ascii! headers.keys.grep(/^x-amz-meta-/), headers
           bucket = verify_mock_bucket_exists(bucket_name)
 
           options['Content-Type'] ||= data[:headers]['Content-Type']

data/lib/fog/aws/requests/storage/put_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/requests/storage/acl_utils'
 
@@ -37,7 +37,7 @@ module Fog
           headers = {}
 
           if acl.is_a?(Hash)
-            data = Fog::Storage::AWS.hash_to_acl(acl)
+            data = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
@@ -64,7 +64,7 @@ module Fog
       class Mock
         def put_object_acl(bucket_name, object_name, acl, options = {})
           if acl.is_a?(Hash)
-            self.data[:acls][:object][bucket_name][object_name] = Fog::Storage::AWS.hash_to_acl(acl)
+            self.data[:acls][:object][bucket_name][object_name] = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')

data/lib/fog/aws/requests/storage/put_object_tagging.rb

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        # Change tag set for an S3 object
+        #
+        # @param bucket_name [String] Name of bucket to modify object in
+        # @param object_name [String] Name of object to modify
+        #
+        # @param tags [Hash]:
+        #   * Key [String]: tag key
+        #   * Value [String]: tag value
+        #
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectTagging.html
+
+        def put_object_tagging(bucket_name, object_name, tags)
+          tagging = tags.map do |k,v|
+            "<Tag><Key>#{k}</Key><Value>#{v}</Value></Tag>"
+          end.join("\n")
+          data =
+              <<-DATA
+<Tagging xmlns="http://doc.s3.amazonaws.com/2006-03-01" >
+  <TagSet>
+    #{tagging}
+  </TagSet>
+</Tagging>
+          DATA
+
+          request({
+            :body     => data,
+            :expects  => 200,
+            :headers  => {'Content-MD5' => Base64.encode64(OpenSSL::Digest::MD5.digest(data)).chomp!, 'Content-Type' => 'application/xml'},
+            :bucket_name => bucket_name,
+            :object_name => object_name,
+            :method   => 'PUT',
+            :query    => {'tagging' => nil}
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/put_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       module PutObjectUrl
         def put_object_url(bucket_name, object_name, expires, headers = {}, options = {})
           unless bucket_name

data/lib/fog/aws/requests/storage/put_request_payment.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Change who pays for requests to an S3 bucket
         #

data/lib/fog/aws/requests/storage/shared_mock_methods.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       module SharedMockMethods
         def define_mock_acl(bucket_name, object_name, options)
           acl = options['x-amz-acl'] || 'private'
-          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
+          if !['private', 'public-read', 'public-read-write', 'authenticated-read', 'bucket-owner-read', 'bucket-owner-full-control'].include?(acl)
             raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
           else
             self.data[:acls][:object][bucket_name] ||= {}
@@ -15,6 +15,7 @@ module Fog
         def parse_mock_data(data)
           data = Fog::Storage.parse_data(data)
           unless data[:body].is_a?(String)
+            data[:body].rewind if data[:body].eof?
             data[:body] = data[:body].read
           end
           data

data/lib/fog/aws/requests/storage/sync_clock.rb

@@ -1,12 +1,12 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Sync clock against S3 to avoid skew errors
         #
         def sync_clock
           response = begin
-            get_service
+            Excon.get("#{@scheme}://#{@host}")
           rescue Excon::Errors::HTTPStatusError => error
             error.response
           end

data/lib/fog/aws/requests/storage/upload_part.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Upload a part for a multipart upload
         #
@@ -37,7 +37,7 @@ module Fog
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def upload_part(bucket_name, object_name, upload_id, part_number, data, options = {})
           data = parse_mock_data(data)