fog-aws 3.1.0 → 3.2.0

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'
 
@@ -24,7 +24,7 @@ module Fog
             :host     => @host,
             :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
         #
@@ -57,14 +57,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_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,6 +1,6 @@
 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'

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Sync clock against S3 to avoid skew errors
         #

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)

data/lib/fog/aws/service_mapper.rb

@@ -20,13 +20,13 @@ module Fog
           when :cloud_watch
             Fog::AWS::CloudWatch
           when :compute
-            Fog::Compute::AWS
+            Fog::AWS::Compute
           when :data_pipeline
             Fog::AWS::DataPipeline
           when :ddb, :dynamodb
             Fog::AWS::DynamoDB
           when :dns
-            Fog::DNS::AWS
+            Fog::AWS::DNS
           when :elasticache
             Fog::AWS::Elasticache
           when :elb
@@ -46,7 +46,7 @@ module Fog
           when :sqs
             Fog::AWS::SQS
           when :eu_storage, :storage
-            Fog::Storage::AWS
+            Fog::AWS::Storage
           when :rds
             Fog::AWS::RDS
           when :sns

data/lib/fog/aws/storage.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS < Fog::Service
+  module AWS
+    class Storage < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
@@ -130,7 +130,7 @@ module Fog
         end
 
         def url(params, expires)
-          Fog::Logger.deprecation("Fog::Storage::AWS => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::AWS::Storage => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end
 
@@ -764,4 +764,17 @@ DATA
       end
     end
   end
+
+  # @deprecated
+  module Storage
+    # @deprecated
+    class AWS < Fog::AWS::Storage
+      # @deprecated
+      # @overrides Fog::Service.new (from the fog-core gem)
+      def self.new(*)
+        Fog::Logger.deprecation 'Fog::Storage::AWS is deprecated, please use Fog::AWS::Storage.'
+        super
+      end
+    end
+  end
 end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

data/tests/credentials_tests.rb

@@ -23,7 +23,7 @@ Shindo.tests('AWS | credentials', ['aws']) do
                 :aws_secret_access_key => 'dummysecret',
                 :aws_session_token => 'dummytoken',
                 :region => "us-west-1",
-                :aws_credentials_expire_at => expires_at}) { Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true) }
+                :aws_credentials_expire_at => expires_at}) { Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true) }
     end
 
     ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = '/v1/credentials?id=task_id'
@@ -34,12 +34,12 @@ Shindo.tests('AWS | credentials', ['aws']) do
                 :aws_secret_access_key => 'dummysecret',
                 :aws_session_token => 'dummytoken',
                 :region => "us-west-1",
-                :aws_credentials_expire_at => expires_at}) { Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true) }
+                :aws_credentials_expire_at => expires_at}) { Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true) }
     end
 
     ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
 
-    compute = Fog::Compute::AWS.new(:use_iam_profile => true)
+    compute = Fog::AWS::Compute.new(:use_iam_profile => true)
 
     tests("#refresh_credentials_if_expired") do
       returns(nil){compute.refresh_credentials_if_expired}
@@ -58,11 +58,11 @@ Shindo.tests('AWS | credentials', ['aws']) do
     end
     Fog::Time.now = Time.now
 
-    default_credentials = Fog::Compute::AWS.fetch_credentials({})
+    default_credentials = Fog::AWS::Compute.fetch_credentials({})
     tests("#fetch_credentials when the url 404s") do
       Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 404, :body => 'not bound'})
       Excon.stub({:method => :get, :path => "/latest/meta-data/placement/availability-zone/"}, {:status => 400, :body => 'not found'})
-      returns(default_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)}
+      returns(default_credentials) {Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true)}
     end
 
     mocked_credentials = {
@@ -73,8 +73,8 @@ Shindo.tests('AWS | credentials', ['aws']) do
     }
     tests("#fetch_credentials when mocking") do
       Fog.mock!
-      Fog::Compute::AWS::Mock.data[:iam_role_based_creds] = mocked_credentials
-      returns(mocked_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)}
+      Fog::AWS::Compute::Mock.data[:iam_role_based_creds] = mocked_credentials
+      returns(mocked_credentials) {Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true)}
     end
 
   ensure