fog-aws 1.4.1 → 3.27.0

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_network_interfaces'
 
@@ -20,7 +20,7 @@ module Fog
         # *   'availabilityZone'<~String>   - The availability zone
         # *   'description'<~String>        - The description
         # *   'ownerId'<~String>            - The ID of the person who created the interface
-        # *   'requesterId'<~String>        - The ID ot teh entity requesting this interface
+        # *   'requesterId'<~String>        - The ID of the entity requesting this interface
         # *   'requesterManaged'<~String>   -
         # *   'status'<~String>             - "available" or "in-use"
         # *   'macAddress'<~String>         -
@@ -49,7 +49,7 @@ module Fog
         # *   'privateIpAddresses' <~Array>:
         # *     'privateIpAddress'<~String> - One of the additional private ip address
         # *     'privateDnsName'<~String>   - The private DNS associate to the ip address
-        # *     'primay'<~String>           - Whether main ip associate with NIC true of false
+        # *     'primary'<~String>          - Whether main ip associate with NIC true of false
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/index.html?ApiReference-query-DescribeNetworkInterfaces.html]
         def describe_network_interfaces(filters = {})
@@ -57,7 +57,7 @@ module Fog
           request({
             'Action' => 'DescribeNetworkInterfaces',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeNetworkInterfaces.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeNetworkInterfaces.new
           }.merge!(params))
         end
       end

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_security_groups'
 
@@ -8,6 +8,8 @@ module Fog
         #
         # ==== Parameters
         # * filters<~Hash> - List of filters to limit results with
+        #   * 'MaxResults'<~Integer> - The maximum number of results to return for the request in a single page
+        #   * 'NextToken'<~String> - The token to retrieve the next page of results
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -25,8 +27,11 @@ module Fog
         #         * 'ipProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp']
         #         * 'ipRanges'<~Array>:
         #           * 'cidrIp'<~String> - CIDR range
+        #         * 'ipv6Ranges'<~Array>:
+        #           * 'cidrIpv6'<~String> - CIDR ipv6 range
         #         * 'toPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #       * 'ownerId'<~String> - AWS Access Key Id of the owner of the security group
+        #     * 'NextToken'<~String> - The token to retrieve the next page of results
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html]
         def describe_security_groups(filters = {})
@@ -34,11 +39,19 @@ module Fog
             Fog::Logger.deprecation("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'group-name' => [*filters]}
           end
-          params = Fog::AWS.indexed_filters(filters)
+
+          options = {}
+          for key in %w[MaxResults NextToken]
+            if filters.is_a?(Hash) && filters.key?(key)
+              options[key] = filters.delete(key)
+            end
+          end
+
+          params = Fog::AWS.indexed_filters(filters).merge!(options)
           request({
             'Action'    => 'DescribeSecurityGroups',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSecurityGroups.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSecurityGroups.new
           }.merge!(params))
         end
       end
@@ -66,22 +79,46 @@ module Fog
             'protocol'  => 'ipProtocol',
             'to-port'   => 'toPort'
           }
-          security_group_groups = lambda { |security_group| (security_group['ipPermissions'] || []).map { |permission| permission["groups"] }.flatten.compact.uniq }
+
+          security_group_groups = lambda do |security_group|
+            (security_group['ipPermissions'] || []).map do |permission|
+              permission['groups']
+            end.flatten.compact.uniq
+          end
+
           for filter_key, filter_value in filters
             if permission_key = filter_key.split('ip-permission.')[1]
               if permission_key == 'group-name'
-                security_group_info = security_group_info.reject{|security_group| !security_group_groups.call(security_group).find {|group| [*filter_value].include?(group['groupName'])}}
+                security_group_info = security_group_info.reject do |security_group|
+                  !security_group_groups.call(security_group).find do |group|
+                    [*filter_value].include?(group['groupName'])
+                  end
+                end
               elsif permission_key == 'group-id'
-                security_group_info = security_group_info.reject{|security_group| !security_group_groups.call(security_group).find {|group| [*filter_value].include?(group['groupId'])}}
+                security_group_info = security_group_info.reject do |security_group|
+                  !security_group_groups.call(security_group).find do |group|
+                    [*filter_value].include?(group['groupId'])
+                  end
+                end
               elsif permission_key == 'user-id'
-                security_group_info = security_group_info.reject{|security_group| !security_group_groups.call(security_group).find {|group| [*filter_value].include?(group['userId'])}}
+                security_group_info = security_group_info.reject do |security_group|
+                  !security_group_groups.call(security_group).find do |group|
+                    [*filter_value].include?(group['userId'])
+                  end
+                end
               else
                 aliased_key = permission_aliases[filter_key]
-                security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions'].find {|permission| [*filter_value].include?(permission[aliased_key])}}
+                security_group_info = security_group_info.reject do |security_group|
+                  !security_group['ipPermissions'].find do |permission|
+                    [*filter_value].include?(permission[aliased_key])
+                  end
+                end
               end
             else
               aliased_key = aliases[filter_key]
-              security_group_info = security_group_info.reject{|security_group| ![*filter_value].include?(security_group[aliased_key])}
+              security_group_info = security_group_info.reject do |security_group|
+                ![*filter_value].include?(security_group[aliased_key])
+              end
             end
           end
 

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

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

data/lib/fog/aws/requests/compute/describe_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/spot_datafeed_subscription'
 
@@ -24,7 +24,7 @@ module Fog
           request({
             'Action'    => 'DescribeSpotDatafeedSubscription',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new
+            :parser     => Fog::Parsers::AWS::Compute::SpotDatafeedSubscription.new
           })
         end
       end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_spot_price_history'
 
@@ -52,7 +52,7 @@ module Fog
           request({
             'Action'    => 'DescribeSpotPriceHistory',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSpotPriceHistory.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSpotPriceHistory.new
           }.merge!(params))
         end
       end
@@ -82,14 +82,14 @@ module Fog
           zones = params['AvailabilityZone']
           if (!zones.nil? && !all_zones.include?([*zones].shuffle.first))
             az_error = "InvalidParameterValue => Invalid availability zone: [#{zones}]"
-            raise Fog::Compute::AWS::Error, az_error
+            raise Fog::AWS::Compute::Error, az_error
           end
           zones = all_zones if zones.nil?
 
           max_results = params['MaxResults'] || Fog::Mock.random_numbers(3).to_i
           if !(max_results.is_a?(Integer) && max_results > 0)
             max_results_error = "InvalidParameterValue => Invalid value '#{max_results}' for maxResults"
-            raise Fog::Compute::AWS::Error, max_results_error
+            raise Fog::AWS::Compute::Error, max_results_error
           end
 
           all_instance_types = flavors.map { |f| f.id }

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_subnets'
 
@@ -14,17 +14,18 @@ module Fog
         # * body<~Hash>:
         # * 'requestId'<~String> - Id of request
         # * 'subnetSet'<~Array>:
-        # * 'subnetId'<~String> - The Subnet's ID
-        # * 'state'<~String> - The current state of the Subnet. ['pending', 'available']
-        # * 'vpcId'<~String> - The ID of the VPC the subnet is in
-        # * 'cidrBlock'<~String> - The CIDR block the Subnet covers.
-        # * 'availableIpAddressCount'<~Integer> - The number of unused IP addresses in the subnet (the IP addresses for any
-        #   stopped instances are considered unavailable)
-        # * 'availabilityZone'<~String> - The Availability Zone the subnet is in.
-        # * 'tagSet'<~Array>: Tags assigned to the resource.
-        # * 'key'<~String> - Tag's key
-        # * 'value'<~String> - Tag's value
-        # * 'instanceTenancy'<~String> - The allowed tenancy of instances launched into the Subnet.
+        #   * 'subnetId'<~String> - The Subnet's ID
+        #   * 'state'<~String> - The current state of the Subnet. ['pending', 'available']
+        #   * 'vpcId'<~String> - The ID of the VPC the subnet is in
+        #   * 'cidrBlock'<~String> - The CIDR block the Subnet covers.
+        #   * 'availableIpAddressCount'<~Integer> - The number of unused IP addresses in the subnet (the IP addresses for any
+        #     stopped instances are considered unavailable)
+        #   * 'availabilityZone'<~String> - The Availability Zone the subnet is in.
+        #   * 'tagSet'<~Array>: Tags assigned to the resource.
+        #     * 'key'<~String> - Tag's key
+        #     * 'value'<~String> - Tag's value
+        #   * 'mapPublicIpOnLaunch'<~Boolean> - Indicates whether instances launched in this subnet receive a public IPv4 address.
+        #   * 'defaultForAz'<~Boolean> - Indicates whether this is the default subnet for the Availability Zone.
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-DescribeSubnets.html]
         def describe_subnets(filters = {})
@@ -36,7 +37,7 @@ module Fog
           request({
             'Action'    => 'DescribeSubnets',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSubnets.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSubnets.new
           }.merge!(params))
         end
       end

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_attribute'
         # Describes a vpc attribute value
@@ -23,7 +23,7 @@ module Fog
             'Action'    => 'DescribeVpcAttribute',
             'VpcId'     => vpc_id,
             'Attribute' => attribute,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVpcAttribute.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVpcAttribute.new
           )
         end
       end
@@ -42,11 +42,11 @@ module Fog
             when 'enableDnsSupport', 'enableDnsHostnames'
               response.body[attribute] = vpc[attribute]
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_classic_link'
         # Describes the ClassicLink status of one or more VPCs.
@@ -26,7 +26,7 @@ module Fog
           params.merge!(Fog::AWS.indexed_filters(options[:filters])) if options[:filters]
           request({
             'Action'    => 'DescribeVpcClassicLink',
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVpcClassicLink.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVpcClassicLink.new
           }.merge(params))
         end
       end
@@ -38,7 +38,7 @@ module Fog
           if vpc_ids = options[:vpc_ids]
             vpcs = vpc_ids.collect do |vpc_id|
               vpc = vpcs.find{ |v| v['vpcId'] == vpc_id }
-              raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist") unless vpc
+              raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist") unless vpc
               vpc
             end
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_classic_link_dns_support'
 
@@ -29,7 +29,7 @@ module Fog
             'Action'     => 'DescribeVpcClassicLinkDnsSupport',
             'MaxResults' => options['MaxResults'],
             'NextToken'  => options['NextToken'],
-            :parser      => Fog::Parsers::Compute::AWS::DescribeVpcClassicLinkDnsSupport.new
+            :parser      => Fog::Parsers::AWS::Compute::DescribeVpcClassicLinkDnsSupport.new
           }.merge(params))
         end
       end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Links an EC2-Classic instance to a ClassicLink-enabled VPC through one or more of the VPC's security groups
@@ -24,7 +24,7 @@ module Fog
             'VpcId'     => vpc_id,
             'InstanceId'=> instance_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -47,9 +47,9 @@ module Fog
             end
             response
           elsif !instance
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist.")
           elsif !vpc
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist.")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Detaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC
@@ -22,7 +22,7 @@ module Fog
             'InternetGatewayId'    => internet_gateway_id,
             'VpcId'                => vpc_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             elsif !vpc_id
               message << 'The request must contain the parameter vpc_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/detach_network_interface.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Detaches a network interface.
@@ -21,7 +21,7 @@ module Fog
             'Action'       => 'DetachNetworkInterface',
             'AttachmentId' => attachment_id,
             'Force'        => force,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
         end
       end