fog-aws 0.11.0 → 3.18.0

data/lib/fog/aws/requests/compute/delete_route.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -22,7 +22,7 @@ module Fog
             'Action'                => 'DeleteRoute',
             'RouteTableId'          => route_table_id,
             'DestinationCidrBlock'  => destination_cidr_block,
-            :parser                 => Fog::Parsers::Compute::AWS::Basic.new
+            :parser                 => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,12 +43,12 @@ module Fog
               response
             elsif route['gatewayId'] == "local"
               # Cannot delete the default route
-              raise Fog::Compute::AWS::Error, "InvalidParameterValue => cannot remove local route #{destination_cidr_block} in route table #{route_table_id}"
+              raise Fog::AWS::Compute::Error, "InvalidParameterValue => cannot remove local route #{destination_cidr_block} in route table #{route_table_id}"
             else
-              raise Fog::Compute::AWS::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
+              raise Fog::AWS::Compute::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
             end
           else
-            raise Fog::Compute::AWS::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
+            raise Fog::AWS::Compute::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
           end
         end
       end

data/lib/fog/aws/requests/compute/delete_route_table.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -20,7 +20,7 @@ module Fog
           request(
             'Action'    => 'DeleteRouteTable',
             'RouteTableId'  => route_table_id,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,9 +38,9 @@ module Fog
               }
               response
           elsif route_table.nil?
-            raise Fog::Compute::AWS::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
           elsif !route_table['associationSet'].empty?
-            raise Fog::Compute::AWS::Error, "DependencyViolation => The routeTable '#{route_table_id}' has dependencies and cannot be deleted."
+            raise Fog::AWS::Compute::Error, "DependencyViolation => The routeTable '#{route_table_id}' has dependencies and cannot be deleted."
           end
         end
       end

data/lib/fog/aws/requests/compute/delete_security_group.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -19,7 +19,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSecurityGroup.html]
         def delete_security_group(name, id = nil)
           if name && id
-            raise Fog::Compute::AWS::Error.new("May not specify both group_name and group_id")
+            raise Fog::AWS::Compute::Error.new("May not specify both group_name and group_id")
           end
           if name
             type_id    = 'GroupName'
@@ -32,7 +32,7 @@ module Fog
             'Action'    => 'DeleteSecurityGroup',
             type_id     => identifier,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -40,19 +40,19 @@ module Fog
       class Mock
         def delete_security_group(name, id = nil)
           if name == 'default'
-            raise Fog::Compute::AWS::Error.new("InvalidGroup.Reserved => The security group 'default' is reserved")
+            raise Fog::AWS::Compute::Error.new("InvalidGroup.Reserved => The security group 'default' is reserved")
           end
 
           if name && id
-            raise Fog::Compute::AWS::Error.new("May not specify both group_name and group_id")
+            raise Fog::AWS::Compute::Error.new("May not specify both group_name and group_id")
           end
 
-          if id
-            name = self.data[:security_groups].reject { |k,v| v['groupId'] != id } .keys.first
+          if name
+            id, _ = self.data[:security_groups].find { |_,v| v['groupName'] == name }
           end
 
-          unless self.data[:security_groups][name]
-            raise Fog::Compute::AWS::NotFound.new("The security group '#{name}' does not exist")
+          unless self.data[:security_groups][id]
+            raise Fog::AWS::Compute::NotFound.new("The security group '#{id}' does not exist")
           end
 
           response = Excon::Response.new
@@ -61,14 +61,14 @@ module Fog
 
           # ec2 authorizations
           self.region_data.each do |_, key_data|
-            key_data[:security_groups].each do |group_name, group|
-              next if group == self.data[:security_groups][name]
+            key_data[:security_groups].each do |group_id, group|
+              next if group == self.data[:security_groups][group_id]
 
               group['ipPermissions'].each do |group_ip_permission|
                 group_ip_permission['groups'].each do |group_group_permission|
-                  if group_group_permission['groupName'] == name &&
+                  if group_group_permission['groupId'] == group_id &&
                       group_group_permission['userId'] == self.data[:owner_id]
-                    used_by_groups << "#{key_data[:owner_id]}:#{group_name}"
+                    used_by_groups << "#{key_data[:owner_id]}:#{group['groupName']}"
                   end
                 end
               end
@@ -93,14 +93,14 @@ module Fog
           end
 
           unless used_by_groups.empty?
-            raise Fog::Compute::AWS::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
+            raise Fog::AWS::Compute::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
           end
 
           if active_instances.any?
-            raise Fog::Compute::AWS::Error.new("InUse => There are active instances using security group '#{name}'")
+            raise Fog::AWS::Compute::Error.new("InUse => There are active instances using security group '#{name}'")
           end
 
-          self.data[:security_groups].delete(name)
+          self.data[:security_groups].delete(id)
           response.status = 200
           response.body = {
             'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/aws/requests/compute/delete_snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -21,7 +21,7 @@ module Fog
             'Action'      => 'DeleteSnapshot',
             'SnapshotId'  => snapshot_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -37,7 +37,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
           end
         end
       end

data/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -17,7 +17,7 @@ module Fog
           request(
             'Action'    => 'DeleteSpotDatafeedSubscription',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end

data/lib/fog/aws/requests/compute/delete_subnet.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Deletes a subnet from a VPC. You must terminate all running instances in the subnet before deleting it, otherwise Amazon
@@ -20,7 +20,7 @@ module Fog
           request(
             'Action' => 'DeleteSubnet',
             'SubnetId' => subnet_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ module Fog
             else
               message = 'MissingParameter => '
               message << 'The request must contain the parameter subnet_id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           end
         end

data/lib/fog/aws/requests/compute/delete_tags.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -33,7 +33,7 @@ module Fog
 
           request({
             'Action'            => 'DeleteTags',
-            :parser             => Fog::Parsers::Compute::AWS::Basic.new
+            :parser             => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end

data/lib/fog/aws/requests/compute/delete_volume.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -21,7 +21,7 @@ module Fog
             'Action'    => 'DeleteVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -32,7 +32,7 @@ module Fog
           if volume = self.data[:volumes][volume_id]
             if volume["attachmentSet"].any?
               attach = volume["attachmentSet"].first
-              raise Fog::Compute::AWS::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
+              raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
             end
             self.data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
@@ -43,7 +43,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
       end

data/lib/fog/aws/requests/compute/delete_vpc.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -23,7 +23,7 @@ module Fog
           request(
             'Action' => 'DeleteVpc',
             'VpcId' => vpc_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -46,7 +46,7 @@ module Fog
             else
               message = 'MissingParameter => '
               message << 'The request must contain the parameter vpc_id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           end
         end

data/lib/fog/aws/requests/compute/deregister_image.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/deregister_image'
 
@@ -20,7 +20,7 @@ module Fog
           request(
             'Action'      => 'DeregisterImage',
             'ImageId'     => image_id,
-            :parser       => Fog::Parsers::Compute::AWS::DeregisterImage.new
+            :parser       => Fog::Parsers::AWS::Compute::DeregisterImage.new
           )
         end
       end
@@ -40,7 +40,7 @@ module Fog
             if !instance_id
               message << 'The request must contain the parameter image_id'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end

data/lib/fog/aws/requests/compute/describe_account_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_account_attributes'
 
@@ -25,7 +25,7 @@ module Fog
           request({
             'Action'    => 'DescribeAccountAttributes',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeAccountAttributes.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAccountAttributes.new
           }.merge!(params))
         end
       end

data/lib/fog/aws/requests/compute/describe_addresses.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_addresses'
 
@@ -27,7 +27,7 @@ module Fog
           request({
             'Action'    => 'DescribeAddresses',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeAddresses.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAddresses.new
           }.merge!(params))
         end
       end

data/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_availability_zones'
 
@@ -28,7 +28,7 @@ module Fog
           request({
             'Action'    => 'DescribeAvailabilityZones',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeAvailabilityZones.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAvailabilityZones.new
           }.merge!(params))
         end
       end
@@ -49,6 +49,10 @@ module Fog
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1d", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1e", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "us-east-2", "zoneName" => "us-east-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-east-2", "zoneName" => "us-east-2b", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-east-2", "zoneName" => "us-east-2c", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1c", "zoneState" => "available"},
@@ -63,9 +67,18 @@ module Fog
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1c", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "eu-west-2", "zoneName" => "eu-west-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "eu-west-2", "zoneName" => "eu-west-2b", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "eu-west-3", "zoneName" => "eu-west-3a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "eu-west-3", "zoneName" => "eu-west-3b", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "eu-central-1", "zoneName" => "eu-central-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-central-1", "zoneName" => "eu-central-1b", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "ca-central-1", "zoneName" => "ca-central-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "ca-central-1", "zoneName" => "ca-central-1b", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1b", "zoneState" => "available"},
 

data/lib/fog/aws/requests/compute/describe_classic_link_instances.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_classic_link_instances'
         # Describes one or more of your linked EC2-Classic instances. This request only returns information about EC2-Classic instances linked to a VPC through ClassicLink; you cannot use this request to return information about other instances.
@@ -32,7 +32,7 @@ module Fog
           params.merge!(Fog::AWS.indexed_filters(options[:filters])) if options[:filters]
           request({
             'Action'    => 'DescribeClassicLinkInstances',
-            :parser     => Fog::Parsers::Compute::AWS::DescribeClassicLinkInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeClassicLinkInstances.new
           }.merge(params))
         end
       end

data/lib/fog/aws/requests/compute/describe_dhcp_options.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_dhcp_options'
 
@@ -33,7 +33,7 @@ module Fog
           request({
             'Action' => 'DescribeDhcpOptions',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeDhcpOptions.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeDhcpOptions.new
           }.merge!(params))
         end
       end

data/lib/fog/aws/requests/compute/describe_image_attribute.rb

@@ -0,0 +1,74 @@
+module Fog
+  module AWS
+    class Compute
+      class Real
+        require 'fog/aws/parsers/compute/describe_image_attribute'
+        # Describes an image attribute value
+        #
+        # ==== Parameters
+        # * image_id<~String>    - The ID of the image you want to describe an attribute of
+        # * attribute<~String> - The attribute to describe, must be one of the following:
+        #    -'description'
+        #    -'kernel'
+        #    -'ramdisk'
+        #    -'launchPermission'
+        #    -'productCodes'
+        #    -'blockDeviceMapping'
+        #    -'sriovNetSupport'
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String>                - Id of request
+        # * 'description'<~String>           - The description for the AMI
+        # * 'imageId'<~String>               - The ID of the image
+        # * 'kernelId'<~String>                 - The kernel ID
+        # * 'ramdiskId'<~String>                - The RAM disk ID
+        # * 'blockDeviceMapping'<~List>        - The block device mapping of the image
+        # * 'productCodes'<~List>               - A list of product codes
+        # * 'sriovNetSupport'<~String>          - The value to use for a resource attribute
+        # (Amazon API Reference)[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImageAttribute.html]
+        def describe_image_attribute(image_id, attribute)
+          request(
+            'Action'       => 'DescribeImageAttribute',
+            'ImageId'   => image_id,
+            'Attribute'    => attribute,
+            :parser        => Fog::Parsers::AWS::Compute::DescribeImageAttribute.new
+          )
+        end
+      end
+
+      class Mock
+        def describe_image_attribute(image_id, attribute)
+          response = Excon::Response.new
+          if image = self.data[:images].values.find{ |i| i['imageId'] == image_id }
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'imageId'     => image_id
+            }
+            case attribute
+            when 'kernel'
+              response.body[attribute] = image["kernelId"]
+            when 'ramdisk'
+              response.body[attribute] = image["ramdiskId"]
+            when 'sriovNetSupport'
+              response.body[attribute] = 'simple'
+            when 'launchPermission'
+              if image_launch_permissions = self.data[:image_launch_permissions][image_id]
+                response.body[attribute] = image_launch_permissions[:users]
+              else
+                response.body[attribute] = []
+              end
+            else
+              response.body[attribute] = image[attribute]
+            end
+          response
+          else
+            raise Fog::AWS::Compute::NotFound.new("The Image '#{image_id}' does not exist")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/describe_images.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_images'
 
@@ -36,6 +36,8 @@ module Fog
         #       * 'rootDeviceName'<~String> - Root device name, e.g. /dev/sda1
         #       * 'rootDeviceType'<~String> - Root device type, ebs or instance-store
         #       * 'virtualizationType'<~String> - Type of virtualization
+        #       * 'creationDate'time<~Datetime> - Date and time the image was created
+        #       * 'enaSupport'<~Boolean> - whether or not the image supports enhanced networking
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html]
         def describe_images(filters = {})
@@ -49,7 +51,7 @@ module Fog
           request({
             'Action'    => 'DescribeImages',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeImages.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeImages.new
           }.merge!(params))
         end
       end

data/lib/fog/aws/requests/compute/describe_instance_attribute.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_instance_attribute'
         # Describes an instance attribute value
@@ -46,7 +46,7 @@ module Fog
             'Action'       => 'DescribeInstanceAttribute',
             'InstanceId'   => instance_id,
             'Attribute'    => attribute,
-            :parser        => Fog::Parsers::Compute::AWS::DescribeInstanceAttribute.new
+            :parser        => Fog::Parsers::AWS::Compute::DescribeInstanceAttribute.new
           )
         end
       end
@@ -78,7 +78,7 @@ module Fog
             end
           response
           else
-            raise Fog::Compute::AWS::NotFound.new("The Instance '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The Instance '#{instance_id}' does not exist")
           end
         end
       end

data/lib/fog/aws/requests/compute/describe_instance_status.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_instance_status'
 
@@ -23,7 +23,7 @@ module Fog
           request({
             'Action'    => 'DescribeInstanceStatus',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeInstanceStatus.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeInstanceStatus.new
           }.merge!(params))
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_instances'
 
@@ -81,7 +81,7 @@ module Fog
           request({
             'Action'    => 'DescribeInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeInstances.new
           }.merge!(params))
         end
       end
@@ -178,7 +178,7 @@ module Fog
 
           # Error if filtering for a brand new instance directly
           if (filters['instance-id'] || filters['instanceId']) && !brand_new_instances.empty?
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
           end
 
           # Otherwise don't include it in the list
@@ -249,7 +249,7 @@ module Fog
                 'ownerId'       => instance['ownerId'],
                 'reservationId' => instance['reservationId']
               }
-              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'hypervisor', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceName', 'rootDeviceType', 'stateReason', 'virtualizationType'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'hypervisor', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceName', 'rootDeviceType', 'spotInstanceRequestId', 'stateReason', 'subnetId', 'virtualizationType'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
             end
           end