fog-aws 0.11.0 → 3.18.0

data/lib/fog/aws/requests/rds/remove_tags_from_resource.rb

@@ -11,11 +11,12 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def remove_tags_from_resource(rds_id, keys)
+          resource_name = "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}"
+          %w[us-gov-west-1 us-gov-east-1].include?(@region) ? resource_name.insert(7, '-us-gov') : resource_name
           request(
-            { 'Action'        => 'RemoveTagsFromResource',
-              'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
-              :parser         => Fog::Parsers::AWS::RDS::Base.new,
-            }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
+            { 'Action' => 'RemoveTagsFromResource',
+              'ResourceName' => resource_name,
+              :parser => Fog::Parsers::AWS::RDS::Base.new }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
           )
         end
       end
@@ -23,15 +24,15 @@ module Fog
       class Mock
         def remove_tags_from_resource(rds_id, keys)
           response = Excon::Response.new
-          if server = self.data[:servers][rds_id]
-            keys.each {|key| self.data[:tags][rds_id].delete key}
+          if server = data[:servers][rds_id]
+            keys.each { |key| data[:tags][rds_id].delete key }
             response.status = 200
             response.body = {
-              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+              'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
             }
             response
           else
-            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+            raise Fog::AWS::RDS::NotFound, "DBInstance #{rds_id} not found"
           end
         end
       end

data/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb

@@ -15,8 +15,8 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         def revoke_db_security_group_ingress(name, opts={})
-          unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId'))
-            raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId'
+          unless opts.key?('CIDRIP') || ((opts.key?('EC2SecurityGroupName') || opts.key?('EC2SecurityGroupId')) && opts.key?('EC2SecurityGroupOwnerId'))
+            raise ArgumentError, 'Must specify CIDRIP, or one of EC2SecurityGroupName or EC2SecurityGroupId, and EC2SecurityGroupOwnerId'
           end
 
           request({
@@ -29,8 +29,13 @@ module Fog
 
       class Mock
         def revoke_db_security_group_ingress(name, opts = {})
-          unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId'))
-            raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId'
+          unless opts.key?('CIDRIP') || ((opts.key?('EC2SecurityGroupName') || opts.key?('EC2SecurityGroupId')) && opts.key?('EC2SecurityGroupOwnerId'))
+            raise ArgumentError, 'Must specify CIDRIP, or one of EC2SecurityGroupName or EC2SecurityGroupId, and EC2SecurityGroupOwnerId'
+          end
+
+          if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
+            ec2_security_group = (Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 
           response = Excon::Response.new

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         #
         # Abort a multipart upload
@@ -25,7 +25,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 abort_multipart_upload(bucket_name, object_name, upload_id)
           verify_mock_bucket_exists(bucket_name)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       require 'fog/aws/parsers/storage/access_control_list'
 
       private
@@ -51,7 +51,7 @@ module Fog
         end
 
         def self.acl_to_hash(acl_xml)
-          parser = Fog::Parsers::Storage::AWS::AccessControlList.new
+          parser = Fog::Parsers::AWS::Storage::AccessControlList.new
           Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml)
           parser.response
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/complete_multipart_upload'
 
@@ -40,7 +40,7 @@ module Fog
             :bucket_name => bucket_name,
             :object_name => object_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::CompleteMultipartUpload.new,
+            :parser     => Fog::Parsers::AWS::Storage::CompleteMultipartUpload.new,
             :query      => {'uploadId' => upload_id}
           })
         end
@@ -48,7 +48,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 complete_multipart_upload(bucket_name, object_name, upload_id, parts)
           bucket = verify_mock_bucket_exists(bucket_name)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/copy_object'
 
@@ -35,7 +35,7 @@ module Fog
             :bucket_name => target_bucket_name,
             :object_name => target_object_name,
             :method   => 'PUT',
-            :parser   => Fog::Parsers::Storage::AWS::CopyObject.new,
+            :parser   => Fog::Parsers::AWS::Storage::CopyObject.new,
           })
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       require 'fog/aws/parsers/storage/cors_configuration'
 
       private
@@ -30,7 +30,7 @@ module Fog
         end
 
         def self.cors_to_hash(cors_xml)
-          parser = Fog::Parsers::Storage::AWS::CorsConfiguration.new
+          parser = Fog::Parsers::AWS::Storage::CorsConfiguration.new
           Nokogiri::XML::SAX::Parser.new(parser).parse(cors_xml)
           parser.response
         end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Deletes the cors configuration information set for the bucket.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Delete lifecycle configuration for a bucket
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Delete policy for a bucket
         #
@@ -32,7 +32,7 @@ module Fog
                response.status = 200
              end
            else
-             raise Fog::AWS::IAM::NotFound.new("The bucket with name #{bucket_name} cannot be found.")
+             raise(Excon::Errors.status_error({:expects => 200}, response))
            end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Delete tagging for a bucket
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         # Delete website configuration for a bucket
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/delete_multiple_objects'
 
@@ -36,17 +36,24 @@ module Fog
           data << "<Quiet>true</Quiet>" if headers.delete(:quiet)
           version_ids = headers.delete('versionId')
           object_names.each do |object_name|
-            data << "<Object>"
-            data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
             object_version = version_ids.nil? ? nil : version_ids[object_name]
             if object_version
-              data << "<VersionId>#{CGI.escapeHTML(object_version)}</VersionId>"
+              object_version = object_version.is_a?(String) ? [object_version] : object_version
+              object_version.each do |version_id|
+                data << "<Object>"
+                data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
+                data << "<VersionId>#{CGI.escapeHTML(version_id)}</VersionId>"
+                data << "</Object>"
+              end
+            else
+              data << "<Object>"
+              data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
+              data << "</Object>"
             end
-            data << "</Object>"
           end
           data << "</Delete>"
 
-          headers['Content-Length'] = data.length
+          headers['Content-Length'] = data.bytesize
           headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).
                                    gsub("\n", '')
 
@@ -56,7 +63,7 @@ module Fog
             :headers    => headers,
             :bucket_name => bucket_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::DeleteMultipleObjects.new,
+            :parser     => Fog::Parsers::AWS::Storage::DeleteMultipleObjects.new,
             :query      => {'delete' => nil}
           })
         end
@@ -72,10 +79,13 @@ module Fog
             response.body = { 'DeleteResult' => [] }
             version_ids = headers.delete('versionId')
             object_names.each do |object_name|
-              object_version = version_ids.nil? ? nil : version_ids[object_name]
-              response.body['DeleteResult'] << delete_object_helper(bucket,
-                                                                object_name,
-                                                                object_version)
+              object_version = version_ids.nil? ? [nil] : version_ids[object_name]
+              object_version = object_version.is_a?(String) ? [object_version] : object_version
+              object_version.each do |version_id|
+                response.body['DeleteResult'] << delete_object_helper(bucket,
+                                                                  object_name,
+                                                                  version_id)
+              end
             end
           else
             response.status = 404

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

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

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

@@ -0,0 +1,40 @@
+module Fog
+  module AWS
+    class Storage
+      module DeleteObjectUrl
+        def delete_object_url(bucket_name, object_name, expires, options = {})
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          signed_url(options.merge({
+            :bucket_name => bucket_name,
+            :object_name => object_name,
+            :method => 'DELETE'
+          }), expires)
+        end
+      end
+
+      class Real
+        # Get an expiring object url from S3 for deleting an object
+        #
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to get expiring url for
+        # @param expires [Time] An expiry time for this url
+        #
+        # @return [Excon::Response] response:
+        #   * body [String] - url for object
+        #
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+
+        include DeleteObjectUrl
+      end
+
+      class Mock # :nodoc:all
+        include DeleteObjectUrl
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket'
 
@@ -46,7 +46,7 @@ module Fog
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetBucket.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetBucket.new,
             :query    => options
           })
         end

data/lib/fog/aws/requests/storage/get_bucket_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'
 
@@ -35,7 +35,7 @@ module Fog
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::AccessControlList.new,
+            :parser     => Fog::Parsers::AWS::Storage::AccessControlList.new,
             :query      => {'acl' => nil}
           })
         end
@@ -49,7 +49,7 @@ module Fog
           if acl = self.data[:acls][:bucket][bucket_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_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
@@ -85,6 +85,7 @@ module Fog
                 'HostId' => Fog::Mock.random_base64(65)
               }
             }
+            raise(Excon::Errors.status_error({:expects => 200}, response))
 
           # Valid case.
           # TODO: (nirvdrum 12/15/11) It's not clear to me how to actually use version-id-marker, so I didn't implement it below.

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
         #
@@ -50,7 +50,7 @@ module Fog
 
           idempotent = true
           if block_given?
-            params[:response_block] = Proc.new
+            params[:response_block] = Proc.new(&block)
             idempotent = false
           end
 
@@ -86,12 +86,16 @@ module Fog
             if (object && !object[:delete_marker])
               if options['If-Match'] && options['If-Match'] != object['ETag']
                 response.status = 412
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               elsif options['If-Modified-Since'] && options['If-Modified-Since'] >= Time.parse(object['Last-Modified'])
                 response.status = 304
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               elsif options['If-None-Match'] && options['If-None-Match'] == object['ETag']
                 response.status = 304
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               elsif options['If-Unmodified-Since'] && options['If-Unmodified-Since'] < Time.parse(object['Last-Modified'])
                 response.status = 412
+                raise(Excon::Errors.status_error({:expects => 200}, response))
               else
                 response.status = 200
                 for key, value in object