fog 1.1.1 → 1.1.2

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

@@ -15,7 +15,7 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        def delete_db_instance(identifier, snapshot_identifier, skip_snapshot = false)          
+        def delete_db_instance(identifier, snapshot_identifier, skip_snapshot = false) 
           params = {}
           params['FinalDBSnapshotIdentifier'] = snapshot_identifier if snapshot_identifier
           request({
@@ -30,8 +30,24 @@ module Fog
 
       class Mock
 
-        def delete_db_snapshot(identifier, snapshot_identifier, skip_snapshot = false)
-          Fog::Mock.not_implemented
+        def delete_db_instance(identifier, snapshot_identifier, skip_snapshot = false)
+          response = Excon::Response.new
+          
+          unless skip_snapshot
+            # I don't know how to mock snapshot_identifier
+            Fog::Logger.warning("snapshot_identifier is not mocked [light_black](#{caller.first})[/]")
+          end
+          
+          if server_set = self.data[:servers].delete(identifier)
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+              "DeleteDBInstanceResult" => { "DBInstance" => server_set }
+            }
+            response
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found")
+          end
         end
 
       end

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

@@ -33,8 +33,47 @@ module Fog
       class Mock
 
         def describe_db_instances(identifier=nil, opts={})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          server_set = []
+          if identifier   
+            if server = self.data[:servers][identifier]
+              server_set << server
+            else
+              raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found")
+            end
+          else
+            server_set = self.data[:servers].values
+          end
+          
+          server_set.each do |server|
+             case server["DBInstanceStatus"]
+             when "creating"
+                 if Time.now - server['created_at'] >= Fog::Mock.delay * 2
+                   region = "us-east-1"
+                   server["DBInstanceStatus"] = "available"
+                   server["availability_zone"] = region + 'a'
+                   server["Endpoint"] = {"Port"=>3306, 
+                                         "Address"=> Fog::AWS::Mock.rds_address(server["DBInstanceIdentifier"],region) }
+                   server["PendingModifiedValues"] = {}
+                 end
+              when "rebooting"
+                # it applies pending modified values
+                if server["PendingModifiedValues"]
+                  server.merge!(server["PendingModifiedValues"])
+                  server["PendingModifiedValues"] = {}
+                  server["DBInstanceStatus"] = 'available'
+                end
+             end 
+          end
+          
+          response.status = 200
+          response.body = {
+            "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+            "DescribeDBInstancesResult" => { "DBInstances" => server_set }
+          }
+          response
         end
+        
 
       end
     end

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

@@ -32,7 +32,7 @@ module Fog
 
       class Mock
 
-        def describe_db_instances(identifier=nil, opts={})
+        def describe_db_reserved_instances(identifier=nil, opts={})
           Fog::Mock.not_implemented
         end
 

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

@@ -45,7 +45,30 @@ module Fog
       class Mock
 
         def modify_db_instance(db_name, apply_immediately, options={})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if server = self.data[:servers][db_name]
+            if server["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
+              response.status = 200
+              response.body = {
+                "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+                "ModifyDBInstanceResult" => { "DBInstance" => modified_server }
+              }
+              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 server = self.data[:servers][instance_identifier]
+            if server["DBInstanceStatus"] != "available"
+              raise Fog::AWS::RDS::NotFound.new("DBInstance #{db_name} not available for rebooting")
+            else
+              server["DBInstanceStatus"] = 'rebooting'
+              response.status = 200
+              response.body = {
+                "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+                "RebootDBInstanceResult" => { "DBInstance" => server }
+              }
+              response
+              
+            end
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBInstance #{db_name} not found")
+          end
         end
 
       end

data/lib/fog/aws/requests/storage/{hash_to_acl.rb → acl_utils.rb}

@@ -2,6 +2,8 @@ module Fog
   module Storage
     class AWS
 
+      require 'fog/aws/parsers/storage/access_control_list'
+
       private
         def self.hash_to_acl(acl)
           data =  "<AccessControlPolicy>\n"
@@ -49,6 +51,12 @@ module Fog
           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

@@ -51,6 +51,14 @@ module Fog
           source_object = source_bucket && source_bucket[:objects][source_object_name]
           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

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_object_acl.rb

@@ -59,11 +59,17 @@ module Fog
 
       class Mock # :nodoc:all
 
+        require 'fog/aws/requests/storage/acl_utils'
+
         def get_object_acl(bucket_name, object_name, options = {})
           response = Excon::Response.new
           if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_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_object_http_url.rb

@@ -4,7 +4,7 @@ module Fog
 
       module GetObjectHttpUrl
 
-        def get_object_http_url(bucket_name, object_name, expires)
+        def get_object_http_url(bucket_name, object_name, expires, options = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
@@ -15,7 +15,8 @@ module Fog
             :headers  => {},
             :host     => @host,
             :method   => 'GET',
-            :path     => "#{bucket_name}/#{object_name}"
+            :path     => "#{bucket_name}/#{object_name}",
+            :query    => options[:query]
           }, expires)
         end
 
@@ -48,4 +49,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -4,7 +4,7 @@ module Fog
 
       module GetObjectHttpsUrl
 
-        def get_object_https_url(bucket_name, object_name, expires)
+        def get_object_https_url(bucket_name, object_name, expires, options = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
@@ -15,7 +15,8 @@ module Fog
             :headers  => {},
             :host     => @host,
             :method   => 'GET',
-            :path     => "#{bucket_name}/#{object_name}"
+            :path     => "#{bucket_name}/#{object_name}",
+            :query    => options[:query]
           }, expires)
         end
 
@@ -48,4 +49,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -3,8 +3,8 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/aws/requests/storage/hash_to_acl'
-      
+        require 'fog/aws/requests/storage/acl_utils'
+
         # Change access control list for an S3 bucket
         #
         # ==== Parameters

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

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/aws/requests/storage/hash_to_acl'
+        require 'fog/aws/requests/storage/acl_utils'
 
         # Change access control list for an S3 object
         #

data/lib/fog/aws/requests/sts/get_federation_token.rb

@@ -0,0 +1,20 @@
+module Fog
+  module AWS
+    class STS
+      class Real
+
+        require 'fog/aws/parsers/sts/get_session_token'
+
+        def get_federation_token(name, policy, duration=43200)
+          request({
+            'Action'          => 'GetFederationToken',
+            'Name'            => name,
+            'Policy'          => MultiJson.encode(policy),
+            'DurationSeconds' => duration,
+            :parser           => Fog::Parsers::AWS::STS::GetSessionToken.new
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/sts/get_session_token.rb

@@ -0,0 +1,18 @@
+module Fog
+  module AWS
+    class STS
+      class Real
+
+        require 'fog/aws/parsers/sts/get_session_token'
+
+        def get_session_token(duration=43200)
+          request({
+            'Action'          => 'GetSessionToken',
+            'DurationSeconds' => duration,
+            :parser           => Fog::Parsers::AWS::STS::GetSessionToken.new
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/simpledb.rb

@@ -5,7 +5,7 @@ module Fog
     class SimpleDB < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region
+      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, :region, :aws_session_token
 
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes
@@ -70,6 +70,7 @@ module Fog
 
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
           @connection_options     = options[:connection_options] || {}
           @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @nil_string = options[:nil_string]|| 'nil'
@@ -88,6 +89,8 @@ module Fog
             'sdb.us-west-1.amazonaws.com'
           when 'us-west-2'
             'sdb.us-west-2.amazonaws.com'
+          when 'sa-east-1'
+            'sdb.sa-east-1.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
@@ -165,6 +168,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,

data/lib/fog/aws/sns.rb

@@ -67,6 +67,8 @@ module Fog
             'sns.us-west-1.amazonaws.com'
           when 'us-west-2'
             'sns.us-west-2.amazonaws.com'
+          when 'sa-east-1'
+            'sns.sa-east-1.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/fog/aws/sqs.rb

@@ -5,7 +5,7 @@ module Fog
     class SQS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token
 
       request_path 'fog/aws/requests/sqs'
       request :change_message_visibility
@@ -78,6 +78,7 @@ module Fog
         def initialize(options={})
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
           @connection_options     = options[:connection_options] || {}
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
           options[:region] ||= 'us-east-1'
@@ -92,6 +93,8 @@ module Fog
             'us-west-1.queue.amazonaws.com'
           when 'us-west-2'
             'us-west-2.queue.amazonaws.com'
+          when 'sa-east-1'
+            'sa-east-1.queue.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
@@ -121,6 +124,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => path || @path,

data/lib/fog/aws/storage.rb

@@ -197,10 +197,14 @@ module Fog
             's3-eu-west-1.amazonaws.com'
           when 'us-east-1'
             's3.amazonaws.com'
+          when 'sa-east-1'
+            's3-sa-east-1.amazonaws.com'
           when 'us-west-1'
             's3-us-west-1.amazonaws.com'
           when 'us-west-2'
             's3-us-west-2.amazonaws.com'
+          when 'sa-east-1'
+            's3-sa-east-1.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
@@ -271,6 +275,8 @@ module Fog
               's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
               's3.amazonaws.com'
+            when 'sa-east-1'
+              's3-sa-east-1.amazonaws.com'
             when 'us-west-1'
               's3-us-west-1.amazonaws.com'
             when 'us-west-2'