fog-aws 3.0.0 → 3.10.0

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/cors_configuration'
 
@@ -31,7 +31,7 @@ module Fog
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::CorsConfiguration.new,
+            :parser     => Fog::Parsers::AWS::Storage::CorsConfiguration.new,
             :query      => {'cors' => nil}
           })
         end
@@ -45,7 +45,7 @@ module Fog
           if cors = self.data[:cors][:bucket][bucket_name]
             response.status = 200
             if cors.is_a?(String)
-              response.body = Fog::Storage::AWS.cors_to_hash(cors)
+              response.body = Fog::AWS::Storage.cors_to_hash(cors)
             else
               response.body = cors
             end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_location'
 
@@ -12,7 +12,7 @@ module Fog
         #   * body [Hash]:
         #     * LocationConstraint [String] - Location constraint of the bucket
         #
-        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlocation.html
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
 
         def get_bucket_location(bucket_name)
           request({
@@ -21,9 +21,8 @@ module Fog
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetBucketLocation.new,
-            :query    => {'location' => nil},
-            :path_style => true
+            :parser   => Fog::Parsers::AWS::Storage::GetBucketLocation.new,
+            :query    => {'location' => nil}
           })
         end
       end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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