fog 0.0.9 → 0.0.10

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -70,6 +70,8 @@ else
               if Time.now - instance['launchTime'] > 2
                 instance['instanceState'] = { :code => 16, :name => 'running' }
               end
+            when 'rebooting'
+              instance['instanceState'] = { :code => 16, :name => 'running' }
             when 'shutting-down'
               if Time.now - Fog::AWS::EC2.data[:deleted_at][instance['instanceId']] > 2
                 instance['instanceState'] = { :code => 16, :name => 'terminating' }

data/lib/fog/aws/requests/ec2/get_console_output.rb

@@ -1,26 +1,57 @@
-module Fog
-  module AWS
-    class EC2
-
-      # Retrieve console output for specified instance
-      #
-      # ==== Parameters
-      # * instance_id<~String> - Id of instance to get console output from
-      #
-      # ==== Returns
-      # # * response<~Fog::AWS::Response>:
-      #   * body<~Hash>:
-      #     * 'instanceId'<~String> - Id of instance
-      #     * 'output'<~String> - Console output
-      #     * 'requestId'<~String> - Id of request
-      #     * 'timestamp'<~Time> - Timestamp of last update to output
-      def get_console_output(instance_id)
-        request({
-          'Action' => 'GetConsoleOutput',
-          'InstanceId' => instance_id
-        }, Fog::Parsers::AWS::EC2::GetConsoleOutput.new)
+unless Fog.mocking?
+
+  module Fog
+    module AWS
+      class EC2
+
+        # Retrieve console output for specified instance
+        #
+        # ==== Parameters
+        # * instance_id<~String> - Id of instance to get console output from
+        #
+        # ==== Returns
+        # # * response<~Fog::AWS::Response>:
+        #   * body<~Hash>:
+        #     * 'instanceId'<~String> - Id of instance
+        #     * 'output'<~String> - Console output
+        #     * 'requestId'<~String> - Id of request
+        #     * 'timestamp'<~Time> - Timestamp of last update to output
+        def get_console_output(instance_id)
+          request({
+            'Action' => 'GetConsoleOutput',
+            'InstanceId' => instance_id
+          }, Fog::Parsers::AWS::EC2::GetConsoleOutput.new)
+        end
+
       end
+    end
+  end
 
+else
+
+  module Fog
+    module AWS
+      class EC2
+
+        def get_console_output(instance_id)
+          response = Fog::Response.new
+          if instance = Fog::AWS::EC2.data[:instances][instance_id]
+            response.status = 200
+            response.body = {
+              'instanceId'    => instance_id,
+              'output'        => Fog::AWS::Mock.console_output,
+              'requestId'     => Fog::AWS::Mock.request_id,
+              'timestamp'     => Time.now
+            }
+          else
+            response.status = 400
+            raise(Fog::Errors.status_error(200, 400, response))
+          end
+          response
+        end
+
+      end
     end
   end
+
 end

data/lib/fog/aws/requests/ec2/reboot_instances.rb

@@ -1,24 +1,57 @@
-module Fog
-  module AWS
-    class EC2
-
-      # Reboot specified instances
-      #
-      # ==== Parameters
-      # * instance_id<~Array> - Ids of instances to reboot
-      #
-      # ==== Returns
-      # # * response<~Fog::AWS::Response>:
-      #   * body<~Hash>:
-      #     * 'requestId'<~String> - Id of request
-      #     * 'return'<~Boolean> - success?
-      def reboot_instances(instance_id = [])
-        params = indexed_params('InstanceId', instance_id)
-        request({
-          'Action' => 'RebootInstances'
-        }.merge!(params), Fog::Parsers::AWS::EC2::Basic.new)
+unless Fog.mocking?
+
+  module Fog
+    module AWS
+      class EC2
+
+        # Reboot specified instances
+        #
+        # ==== Parameters
+        # * instance_id<~Array> - Ids of instances to reboot
+        #
+        # ==== Returns
+        # # * response<~Fog::AWS::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        def reboot_instances(instance_id = [])
+          params = indexed_params('InstanceId', instance_id)
+          request({
+            'Action' => 'RebootInstances'
+          }.merge!(params), Fog::Parsers::AWS::EC2::Basic.new)
+        end
+
       end
+    end
+  end
 
+else
+
+  module Fog
+    module AWS
+      class EC2
+
+        def reboot_instances(instance_id = [])
+          response = Fog::Response.new
+          instance_id = [*instance_id]
+          if (Fog::AWS::EC2.data[:instances].keys & instance_id).length == instance_id.length
+            for instance_id in instance_id
+              Fog::AWS::EC2.data[:instances][instance_id]['status'] = 'rebooting'
+            end
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+          else
+            response.status = 400
+            raise(Fog::Errors.status_error(200, 400, response))
+          end
+          response
+        end
+
+      end
     end
   end
+
 end

data/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb

@@ -1,32 +1,68 @@
-module Fog
-  module AWS
-    class EC2
-
-      # Remove permissions from a security group
-      #
-      # ==== Parameters
-      # * options<~Hash>:
-      #   * 'GroupName'<~String> - Name of group
-      #   * 'SourceSecurityGroupName'<~String> - Name of security group to authorize
-      #   * 'SourceSecurityGroupOwnerId'<~String> - Name of owner to authorize
-      #   or
-      #   * 'CidrIp' - CIDR range
-      #   * 'FromPort' - Start of port range (or -1 for ICMP wildcard)
-      #   * 'GroupName' - Name of group to modify
-      #   * 'IpProtocol' - Ip protocol, must be in ['tcp', 'udp', 'icmp']
-      #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
-      #
-      # === Returns
-      # * response<~Fog::AWS::Response>:
-      #   * body<~Hash>:
-      #     * 'requestId'<~String> - Id of request
-      #     * 'return'<~Boolean> - success?
-      def revoke_security_group_ingress(options = {})
-        request({
-          'Action' => 'RevokeSecurityGroupIngress'
-        }.merge!(options), Fog::Parsers::AWS::EC2::Basic.new)
+unless Fog.mocking?
+
+  module Fog
+    module AWS
+      class EC2
+
+        # Remove permissions from a security group
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * 'GroupName'<~String> - Name of group
+        #   * 'SourceSecurityGroupName'<~String> - Name of security group to authorize
+        #   * 'SourceSecurityGroupOwnerId'<~String> - Name of owner to authorize
+        #   or
+        #   * 'CidrIp' - CIDR range
+        #   * 'FromPort' - Start of port range (or -1 for ICMP wildcard)
+        #   * 'GroupName' - Name of group to modify
+        #   * 'IpProtocol' - Ip protocol, must be in ['tcp', 'udp', 'icmp']
+        #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
+        #
+        # === Returns
+        # * response<~Fog::AWS::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        def revoke_security_group_ingress(options = {})
+          request({
+            'Action' => 'RevokeSecurityGroupIngress'
+          }.merge!(options), Fog::Parsers::AWS::EC2::Basic.new)
+        end
+
       end
+    end
+  end
+
+else
+
+  module Fog
+    module AWS
+      class EC2
 
+        # TODO: handle the GroupName/Source/Source case
+        def revoke_security_group_ingress(options = {})
+          response = Fog::Response.new
+          group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
+
+          ingress = group['ipPermissions'].select {|permission|
+            permission['fromPort']    == options['FromPort'] &&
+            permission['ipProtocol']  == options['IpProtocol'] &&
+            permission['toPort']      == options['ToPort'] &&
+            permission['ipRanges'].first['cidrIp'] == options['CidrIp']
+          }.first
+
+          group['ipPermissions'].delete(ingress)
+
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return'    => true
+          }
+          response
+        end
+
+      end
     end
   end
+
 end

data/lib/fog/aws/requests/ec2/run_instances.rb

@@ -21,7 +21,7 @@ unless Fog.mocking?
         #   * 'Placement.AvailabilityZone'<~String> - Placement constraint for instances
         #   * 'DeviceName'<~String> - ?
         #   * 'Encoding'<~String> - ?
-        #   * 'GroupId'<~String> - Name of security group for instances
+        #   * 'groupId'<~String> - Name of security group for instances
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
         #     in ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge']
         #     default is 'm1.small'

data/lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -39,17 +39,19 @@ else
       class EC2
 
         def terminate_instances(instance_id)
-          instance_id = [*instance_id]
           response = Fog::Response.new
-          instance_id.each do |instance_id|
-            response.body = {
-              'requestId'     => Fog::AWS::Mock.request_id,
-              'instancesSet'  => []
-            }
-            if instance = Fog::AWS::EC2.data[:instances][instance_id]
+          instance_id = [*instance_id]
+          if (Fog::AWS::EC2.data[:instances].keys & instance_id).length == instance_id.length
+            for instance_id in instance_id
+              response.body = {
+                'requestId'     => Fog::AWS::Mock.request_id,
+                'instancesSet'  => []
+              }
+              instance = Fog::AWS::EC2.data[:instances][instance_id]
               Fog::AWS::EC2.data[:deleted_at][instance_id] = Time.now
               instance['status'] = 'deleting'
               response.status = 200
+              # TODO: the codes are mostly educated guessing, not certainty
               code = case instance['state']
               when 'pending'
                 0
@@ -59,16 +61,18 @@ else
                 32
               when 'terminated'
                 64
+              when 'rebooting'
+                128
               end
               response.body['instancesSet'] << {
                 'instanceId'    => instance_id,
                 'previousState' => { 'name' => instance['state'], 'code' => code },
                 'shutdownState' => { 'name' => 'shutting-down', 'code' => 32}
               }
-            else
-              response.status = 400
-              raise(Fog::Errors.status_error(200, 400, response))
             end
+          else
+            response.status = 400
+            raise(Fog::Errors.status_error(200, 400, response))
           end
           response
         end

data/lib/fog/aws/s3.rb

@@ -12,40 +12,36 @@ module Fog
       end
 
       def self.reload
-        current_directory = File.dirname(__FILE__)
-        load "#{current_directory}/../collection.rb"
-        load "#{current_directory}/../connection.rb"
-        load "#{current_directory}/../model.rb"
-        load "#{current_directory}/../parser.rb"
-        load "#{current_directory}/../response.rb"
-
-        models_directory = "#{current_directory}/models/s3"
-        load "#{models_directory}/bucket.rb"
-        load "#{models_directory}/buckets.rb"
-        load "#{models_directory}/object.rb"
-        load "#{models_directory}/objects.rb"
-        load "#{models_directory}/owner.rb"
-
-        parsers_directory = "#{current_directory}/parsers/s3"
-        load "#{parsers_directory}/copy_object.rb"
-        load "#{parsers_directory}/get_bucket.rb"
-        load "#{parsers_directory}/get_bucket_location.rb"
-        load "#{parsers_directory}/get_request_payment.rb"
-        load "#{parsers_directory}/get_service.rb"
-
-        requests_directory = "#{current_directory}/requests/s3"
-        load "#{requests_directory}/copy_object.rb"
-        load "#{requests_directory}/delete_bucket.rb"
-        load "#{requests_directory}/delete_object.rb"
-        load "#{requests_directory}/get_bucket.rb"
-        load "#{requests_directory}/get_bucket_location.rb"
-        load "#{requests_directory}/get_object.rb"
-        load "#{requests_directory}/get_request_payment.rb"
-        load "#{requests_directory}/get_service.rb"
-        load "#{requests_directory}/head_object.rb"
-        load "#{requests_directory}/put_bucket.rb"
-        load "#{requests_directory}/put_object.rb"
-        load "#{requests_directory}/put_request_payment.rb"
+        load "fog/collection.rb"
+        load "fog/connection.rb"
+        load "fog/model.rb"
+        load "fog/parser.rb"
+        load "fog/response.rb"
+
+        load "fog/aws/models/s3/bucket.rb"
+        load "fog/aws/models/s3/buckets.rb"
+        load "fog/aws/models/s3/object.rb"
+        load "fog/aws/models/s3/objects.rb"
+        load "fog/aws/models/s3/owner.rb"
+
+        load "fog/aws/parsers/s3/copy_object.rb"
+        load "fog/aws/parsers/s3/get_bucket.rb"
+        load "fog/aws/parsers/s3/get_bucket_location.rb"
+        load "fog/aws/parsers/s3/get_request_payment.rb"
+        load "fog/aws/parsers/s3/get_service.rb"
+
+        load "fog/aws/requests/s3/copy_object.rb"
+        load "fog/aws/requests/s3/delete_bucket.rb"
+        load "fog/aws/requests/s3/delete_object.rb"
+        load "fog/aws/requests/s3/get_bucket.rb"
+        load "fog/aws/requests/s3/get_bucket_location.rb"
+        load "fog/aws/requests/s3/get_object.rb"
+        load "fog/aws/requests/s3/get_request_payment.rb"
+        load "fog/aws/requests/s3/get_service.rb"
+        load "fog/aws/requests/s3/head_object.rb"
+        load "fog/aws/requests/s3/put_bucket.rb"
+        load "fog/aws/requests/s3/put_object.rb"
+        load "fog/aws/requests/s3/put_request_payment.rb"
 
         if Fog.mocking?
           reset_data
@@ -134,7 +130,7 @@ DATA
         if ['acl', 'location', 'logging', 'requestPayment', 'torrent'].include?(params[:query])
           canonical_resource << "?#{params[:query]}"
         end
-        string_to_sign << "#{canonical_resource}"
+        string_to_sign << "#{canonical_resource}".downcase
 
         hmac = @hmac.update(string_to_sign)
         signature = Base64.encode64(hmac.digest).chomp!

data/lib/fog/aws/simpledb.rb

@@ -12,28 +12,25 @@ module Fog
       end
 
       def self.reload
-        current_directory = File.dirname(__FILE__)
-        load "#{current_directory}/../connection.rb"
-        load "#{current_directory}/../parser.rb"
-        load "#{current_directory}/../response.rb"
-
-        parsers_directory = "#{current_directory}/parsers/simpledb"
-        load "#{parsers_directory}/basic.rb"
-        load "#{parsers_directory}/domain_metadata.rb"
-        load "#{parsers_directory}/get_attributes.rb"
-        load "#{parsers_directory}/list_domains.rb"
-        load "#{parsers_directory}/select.rb"
-
-        requests_directory = "#{current_directory}/requests/simpledb"
-        load "#{requests_directory}/batch_put_attributes.rb"
-        load "#{requests_directory}/create_domain.rb"
-        load "#{requests_directory}/delete_attributes.rb"
-        load "#{requests_directory}/delete_domain.rb"
-        load "#{requests_directory}/domain_metadata.rb"
-        load "#{requests_directory}/get_attributes.rb"
-        load "#{requests_directory}/list_domains.rb"
-        load "#{requests_directory}/put_attributes.rb"
-        load "#{requests_directory}/select.rb"
+        load "fog/connection.rb"
+        load "fog/parser.rb"
+        load "fog/response.rb"
+
+        load "fog/aws/parsers/simpledb/basic.rb"
+        load "fog/aws/parsers/simpledb/domain_metadata.rb"
+        load "fog/aws/parsers/simpledb/get_attributes.rb"
+        load "fog/aws/parsers/simpledb/list_domains.rb"
+        load "fog/aws/parsers/simpledb/select.rb"
+
+        load "fog/aws/requests/simpledb/batch_put_attributes.rb"
+        load "fog/aws/requests/simpledb/create_domain.rb"
+        load "fog/aws/requests/simpledb/delete_attributes.rb"
+        load "fog/aws/requests/simpledb/delete_domain.rb"
+        load "fog/aws/requests/simpledb/domain_metadata.rb"
+        load "fog/aws/requests/simpledb/get_attributes.rb"
+        load "fog/aws/requests/simpledb/list_domains.rb"
+        load "fog/aws/requests/simpledb/put_attributes.rb"
+        load "fog/aws/requests/simpledb/select.rb"
 
         if Fog.mocking?
           reset_data