fog 1.0.0 → 1.5.0

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

@@ -45,7 +45,32 @@ module Fog
       class Mock
 
         def modify_db_instance(db_name, apply_immediately, options={})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if self.data[:servers][db_name]
+            if self.data[:servers][db_name]["DBInstanceStatus"] != "available"
+              raise Fog::AWS::RDS::NotFound.new("DBInstance #{db_name} not available for modification")
+            else
+              # TODO verify the params options
+              # if apply_immediately is false, all the options go to pending_modified_values and then apply and clear after either 
+              # a reboot or the maintainance window
+              #if apply_immediately
+              #  modified_server = server.merge(options)
+              #else
+              #  modified_server = server["PendingModifiedValues"].merge!(options) # it appends
+              #end
+              self.data[:servers][db_name]["PendingModifiedValues"].merge!(options) # it appends
+              #self.data[:servers][db_name]["DBInstanceStatus"] = "modifying"
+              response.status = 200
+              response.body = {
+                "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+                "ModifyDBInstanceResult" => { "DBInstance" => self.data[:servers][db_name] }
+              }
+              response
+              
+            end
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBInstance #{db_name} not found")
+          end
         end
 
       end

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

@@ -25,7 +25,23 @@ module Fog
       class Mock
 
         def reboot_db_instance(instance_identifier)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if self.data[:servers][instance_identifier]
+            if self.data[:servers][instance_identifier]["DBInstanceStatus"] != "available"
+              raise Fog::AWS::RDS::NotFound.new("DBInstance #{instance_identifier} not available for rebooting")
+            else
+              self.data[:servers][instance_identifier]["DBInstanceStatus"] = 'rebooting'
+              response.status = 200
+              response.body = {
+                "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+                "RebootDBInstanceResult" => { "DBInstance" => self.data[:servers][instance_identifier] }
+              }
+              response
+              
+            end
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBInstance #{instance_identifier} not found")
+          end
         end
 
       end

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

@@ -33,7 +33,33 @@ module Fog
       class Mock
 
         def revoke_db_security_group_ingress(name, opts = {})
-          Fog::Mock.not_implemented
+          unless opts.key?('CIDRIP') || (opts.key?('EC2SecurityGroupName') && opts.key?('EC2SecurityGroupOwnerId'))
+            raise ArgumentError, 'Must specify CIDRIP, or both EC2SecurityGroupName and EC2SecurityGroupOwnerId'
+          end
+          
+          response = Excon::Response.new
+          
+          if sec_group = self.data[:security_groups][name]
+            if opts.key?('CIDRIP')
+              sec_group['IPRanges'].each do |iprange|
+                iprange['Status']= 'revoking' if iprange['CIDRIP'] == opts['CIDRIP']
+              end
+            else
+              sec_group['EC2SecurityGroups'].each do |ec2_secg|
+                ec2_secg['Status']= 'revoking' if ec2_secg['EC2SecurityGroupName'] == opts['EC2SecurityGroupName']
+              end
+            end
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+              'RevokeDBSecurityGroupIngressResult' => {          
+                'DBSecurityGroup' => sec_group
+              }
+            }
+            response
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBSecurityGroupNotFound => #{name} not found")
+          end
         end
 
       end

data/lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -29,7 +29,7 @@ module Fog
         #     * 'RequestId'
         def get_attributes(domain_name, item_name, options = {})
           if options.is_a?(Array)
-            Fog::Logger.warning("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options = {'AttributeName' => options}
           end
           options['AttributeName'] ||= []
@@ -49,7 +49,7 @@ module Fog
 
         def get_attributes(domain_name, item_name, options = {})
           if options.is_a?(Array)
-            Fog::Logger.warning("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options['AttributeName'] ||= options if options.is_a?(Array)
           end
           options['AttributeName'] ||= []

data/lib/fog/aws/requests/simpledb/select.rb

@@ -23,7 +23,7 @@ module Fog
         #     * 'NextToken'<~String> - offset to start with if there are are more domains to list
         def select(select_expression, options = {})
           if options.is_a?(String)
-            Fog::Logger.warning("get_attributes with string next_token param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with string next_token param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options = {'NextToken' => options}
           end
           options['NextToken'] ||= nil

data/lib/fog/aws/requests/sns/confirm_subscription.rb

@@ -21,7 +21,7 @@ module Fog
           request({
             'Action'    => 'ConfirmSubscription',
             'Token'     => token,
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::ConfirmSubscription.new
           }.merge!(options))
         end

data/lib/fog/aws/requests/sns/delete_topic.rb

@@ -17,7 +17,7 @@ module Fog
         def delete_topic(arn)
           request({
             'Action'    => 'DeleteTopic',
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::DeleteTopic.new
           })
         end

data/lib/fog/aws/requests/sns/get_topic_attributes.rb

@@ -17,7 +17,7 @@ module Fog
         def get_topic_attributes(arn)
           request({
             'Action'    => 'GetTopicAttributes',
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::GetTopicAttributes.new
           })
         end

data/lib/fog/aws/requests/sns/list_subscriptions_by_topic.rb

@@ -19,7 +19,7 @@ module Fog
         def list_subscriptions_by_topic(arn, options = {})
           request({
             'Action'    => 'ListSubscriptionsByTopic',
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::ListSubscriptions.new
           }.merge!(options))
         end

data/lib/fog/aws/requests/sns/publish.rb

@@ -22,7 +22,7 @@ module Fog
           request({
             'Action'    => 'Publish',
             'Message'   => message,
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::Publish.new
           }.merge!(options))
         end

data/lib/fog/aws/requests/sns/set_topic_attributes.rb

@@ -21,7 +21,7 @@ module Fog
             'Action'          => 'SetTopicAttributes',
             'AttributeName'   => attribute_name,
             'AttributeValue'  => attribute_value,
-            'TopicArn'        => arn,
+            'TopicArn'        => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::SetTopicAttributes.new
           })
         end

data/lib/fog/aws/requests/sns/subscribe.rb

@@ -21,7 +21,7 @@ module Fog
             'Action'    => 'Subscribe',
             'Endpoint'  => endpoint,
             'Protocol'  => protocol,
-            'TopicArn'  => arn,
+            'TopicArn'  => arn.strip,
             :parser     => Fog::Parsers::AWS::SNS::Subscribe.new
           })
         end

data/lib/fog/aws/requests/sns/unsubscribe.rb

@@ -17,7 +17,7 @@ module Fog
         def unsubscribe(arn)
           request({
             'Action'          => 'Unsubscribe',
-            'SubscriptionArn' => arn,
+            'SubscriptionArn' => arn.strip,
             :parser           => Fog::Parsers::AWS::SNS::Unsubscribe.new
           })
         end

data/lib/fog/aws/requests/sqs/change_message_visibility.rb

@@ -34,7 +34,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if (queue = data[:queues][queue_url])
               message_id, _ = queue[:receipt_handles].find { |message_id, receipts|
-                receipts.keys.include?(receipt_handle)
+                receipts.has_key?(receipt_handle)
               }
               
               if message_id

data/lib/fog/aws/requests/sqs/delete_message.rb

@@ -32,7 +32,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if (queue = data[:queues][queue_url])
               message_id, _ = queue[:receipt_handles].find { |msg_id, receipts|
-                receipts.keys.include?(receipt_handle)
+                receipts.has_key?(receipt_handle)
               }
 
               if message_id

data/lib/fog/aws/requests/sqs/receive_message.rb

@@ -37,37 +37,36 @@ module Fog
               max_number_of_messages = options['MaxNumberOfMessages'] || 1
               now = Time.now
               
-              keys = queue[:messages].keys[0, max_number_of_messages]
-              
-              messages = queue[:messages].values_at(*keys).map do |m|
+              messages = []
+
+              queue[:messages].values.each do |m|
                 message_id = m['MessageId']
-                
+
                 invisible = if (received_handles = queue[:receipt_handles][message_id])
                   visibility_timeout = m['Attributes']['VisibilityTimeout'] || queue['Attributes']['VisibilityTimeout']
                   received_handles.any? { |handle, time| now < time + visibility_timeout }
                 else
                   false
                 end
-                
-                if invisible
-                  nil
-                else
+
+                unless invisible
                   receipt_handle = Fog::Mock.random_base64(300)
-                  
+
                   queue[:receipt_handles][message_id] ||= {}
                   queue[:receipt_handles][message_id][receipt_handle] = now
-                  
+
                   m['Attributes'].tap do |attrs|
                     attrs['ApproximateFirstReceiveTimestamp'] ||= now
                     attrs['ApproximateReceiveCount'] = (attrs['ApproximateReceiveCount'] || 0) + 1
                   end
-                  
-                  m.merge({
+
+                  messages << m.merge({
                     'ReceiptHandle' => receipt_handle
                   })
+                  break if messages.size >= max_number_of_messages
                 end
-              end.compact
-              
+              end
+
               response.body = {
                 'ResponseMetadata' => {
                   'RequestId' => Fog::AWS::Mock.request_id

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

@@ -0,0 +1,62 @@
+module Fog
+  module Storage
+    class AWS
+
+      require 'fog/aws/parsers/storage/access_control_list'
+
+      private
+        def self.hash_to_acl(acl)
+          data =  "<AccessControlPolicy>\n"
+
+          if acl['Owner'] && (acl['Owner']['ID'] || acl['Owner']['DisplayName'])
+            data << "  <Owner>\n"
+            data << "    <ID>#{acl['Owner']['ID']}</ID>\n" if acl['Owner']['ID']
+            data << "    <DisplayName>#{acl['Owner']['DisplayName']}</DisplayName>\n" if acl['Owner']['DisplayName']
+            data << "  </Owner>\n"
+          end
+
+          grants = [acl['AccessControlList']].flatten.compact
+
+          data << "  <AccessControlList>\n" if grants.any?
+          grants.each do |grant|
+            data << "    <Grant>\n"
+            grantee = grant['Grantee']
+            type = case
+            when grantee.has_key?('ID')
+              'CanonicalUser'
+            when grantee.has_key?('EmailAddress')
+              'AmazonCustomerByEmail'
+            when grantee.has_key?('URI')
+              'Group'
+            end
+
+            data << "      <Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"#{type}\">\n"
+            case type
+            when 'CanonicalUser'
+              data << "        <ID>#{grantee['ID']}</ID>\n" if grantee['ID']
+              data << "        <DisplayName>#{grantee['DisplayName']}</DisplayName>\n" if grantee['DisplayName']
+            when 'AmazonCustomerByEmail'
+              data << "        <EmailAddress>#{grantee['EmailAddress']}</EmailAddress>\n" if grantee['EmailAddress']
+            when 'Group'
+              data << "        <URI>#{grantee['URI']}</URI>\n" if grantee['URI']
+            end
+            data << "      </Grantee>\n"
+            data << "      <Permission>#{grant['Permission']}</Permission>\n"
+            data << "    </Grant>\n"
+          end
+          data << "  </AccessControlList>\n" if grants.any?
+
+          data << "</AccessControlPolicy>"
+
+          data
+        end
+
+        def self.acl_to_hash(acl_xml)
+          parser = Fog::Parsers::Storage::AWS::AccessControlList.new
+          Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml)
+          parser.response
+        end
+
+    end
+  end
+end

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

@@ -48,16 +48,22 @@ module Fog
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           response = Excon::Response.new
           source_bucket = self.data[:buckets][source_bucket_name]
-          source_object = source_bucket && source_bucket[:objects][source_object_name]
+          source_object = source_bucket && source_bucket[:objects][source_object_name] && source_bucket[:objects][source_object_name].first
           target_bucket = self.data[:buckets][target_bucket_name]
 
+          acl = options['x-amz-acl'] || 'private'
+          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
+            raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
+          else
+            self.data[:acls][:object][target_bucket_name] ||= {}
+            self.data[:acls][:object][target_bucket_name][target_object_name] = self.class.acls(acl)
+          end
+
           if source_object && target_bucket
             response.status = 200
             target_object = source_object.dup
-            target_object.merge!({
-              'Name' => target_object_name
-            })
-            target_bucket[:objects][target_object_name] = target_object
+            target_object.merge!({'Key' => target_object_name})
+            target_bucket[:objects][target_object_name] = [target_object]
             response.body = {
               'ETag'          => target_object['ETag'],
               'LastModified'  => Time.parse(target_object['Last-Modified'])

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

@@ -0,0 +1,30 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        # Delete lifecycle configuration for a bucket
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to delete lifecycle configuration from
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * status<~Integer> - 204
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETElifecycle.html
+
+        def delete_bucket_lifecycle(bucket_name)
+          request({
+                    :expects  => 204,
+                    :headers  => {},
+                    :host     => "#{bucket_name}.#{@host}",
+                    :method   => 'DELETE',
+                    :query    => {'lifecycle' => nil}
+                  })
+        end
+      end
+    end
+  end
+end

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

@@ -17,6 +17,12 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectDELETE.html
 
         def delete_object(bucket_name, object_name, options = {})
+          if version_id = options.delete('versionId')
+            path = "#{CGI.escape(object_name)}?versionId=#{CGI.escape(version_id)}"
+          else
+            path = CGI.escape(object_name)
+          end
+
           headers = options
           request({
             :expects    => 204,
@@ -24,7 +30,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'DELETE',
-            :path       => CGI.escape(object_name)
+            :path       => path
           })
         end
 
@@ -36,7 +42,57 @@ module Fog
           response = Excon::Response.new
           if bucket = self.data[:buckets][bucket_name]
             response.status = 204
-            bucket[:objects].delete(object_name)
+
+            version_id = options.delete('versionId')
+
+            if bucket[:versioning]
+              bucket[:objects][object_name] ||= []
+
+              if version_id
+                version = bucket[:objects][object_name].find { |object| object['VersionId'] == version_id}
+
+                # S3 special cases the 'null' value to not error out if no such version exists.
+                if version || (version_id == 'null')
+                  bucket[:objects][object_name].delete(version)
+                  bucket[:objects].delete(object_name) if bucket[:objects][object_name].empty?
+
+                  response.headers['x-amz-delete-marker'] = 'true' if version[:delete_marker]
+                  response.headers['x-amz-version-id'] = version_id
+                else
+                  response.status = 400
+                  response.body = invalid_version_id_payload(version_id)
+                  raise(Excon::Errors.status_error({:expects => 200}, response))
+                end
+              else
+                delete_marker = {
+                  :delete_marker    => true,
+                  'Key'             => object_name,
+                  'VersionId'       => bucket[:versioning] == 'Enabled' ? Fog::Mock.random_base64(32) : 'null',
+                  'Last-Modified'   => Fog::Time.now.to_date_header
+                }
+
+                # When versioning is suspended, a delete marker is placed if the last object ID is not the value 'null',
+                # otherwise the last object is replaced.
+                if bucket[:versioning] == 'Suspended' && bucket[:objects][object_name].first['VersionId'] == 'null'
+                  bucket[:objects][object_name].shift
+                end
+
+                bucket[:objects][object_name].unshift(delete_marker)
+
+                response.headers['x-amz-delete-marker'] = 'true'
+                response.headers['x-amz-version-id'] = delete_marker['VersionId']
+              end
+            else
+              if version_id && version_id != 'null'
+                response.status = 400
+                response.body = invalid_version_id_payload(version_id)
+                raise(Excon::Errors.status_error({:expects => 200}, response))
+              else
+                bucket[:objects].delete(object_name)
+
+                response.headers['x-amz-version-id'] = 'null'
+              end
+            end
           else
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 204}, response))
@@ -44,6 +100,21 @@ module Fog
           response
         end
 
+        private
+
+        def invalid_version_id_payload(version_id)
+          {
+            'Error' => {
+              'Code' => 'InvalidArgument',
+              'Message' => 'Invalid version id specified',
+              'ArgumentValue' => version_id,
+              'ArgumentName' => 'versionId',
+              'RequestId' => Fog::Mock.random_hex(16),
+              'HostId' => Fog::Mock.random_base64(65)
+            }
+          }
+        end
+
       end
     end
   end

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

@@ -69,11 +69,12 @@ module Fog
           end
           response = Excon::Response.new
           if bucket = self.data[:buckets][bucket_name]
-            contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
+            contents = bucket[:objects].values.collect(&:first).sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
                 (prefix    && object['Key'][0...prefix.length] != prefix) ||
                 (marker    && object['Key'] <= marker) ||
                 (delimiter && object['Key'][(prefix ? prefix.length : 0)..-1].include?(delimiter) \
-                           && common_prefixes << object['Key'].sub(/^(#{prefix}[^#{delimiter}]+.).*/, '\1'))
+                           && common_prefixes << object['Key'].sub(/^(#{prefix}[^#{delimiter}]+.).*/, '\1')) ||
+                object.has_key?(:delete_marker)
               end.map do |object|
                 data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
                 data.merge!({

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

@@ -48,11 +48,17 @@ module Fog
 
       class Mock # :nodoc:all
 
+        require 'fog/aws/requests/storage/acl_utils'
+
         def get_bucket_acl(bucket_name)
           response = Excon::Response.new
           if acl = self.data[:acls][:bucket][bucket_name]
             response.status = 200
-            response.body = acl
+            if acl.is_a?(String)
+              response.body = Fog::Storage::AWS.acl_to_hash(acl)
+            else
+              response.body = acl
+            end
           else
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 200}, response))

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

@@ -0,0 +1,41 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/storage/get_bucket_lifecycle'
+
+        # Get bucket lifecycle configuration
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to get lifecycle configuration for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'Rules'<~Array> - object expire rules
+        #        * 'ID'<~String>      - Unique identifier for the rule
+        #        * 'Prefix'<~String>  - Prefix identifying one or more objects to which the rule applies
+        #        * 'Enabled'<~Boolean> - if rule is currently being applied
+        #        * 'Days'<~Integer>   - lifetime, in days, of the objects that are subject to the rule
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlifecycle.html
+
+        def get_bucket_lifecycle(bucket_name)
+          request({
+                    :expects  => 200,
+                    :headers  => {},
+                    :host     => "#{bucket_name}.#{@host}",
+                    :idempotent => true,
+                    :method   => 'GET',
+                    :parser   => Fog::Parsers::Storage::AWS::GetBucketLifecycle.new,
+                    :query    => {'lifecycle' => nil}
+                  })
+        end
+
+      end
+    end
+  end
+end
+