fog-aws 3.1.0 → 3.2.0

data/lib/fog/aws/requests/compute/delete_key_pair.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'    => 'DeleteKeyPair',
             'KeyName'   => key_name,
             :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_network_acl.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'       => 'DeleteNetworkAcl',
             'NetworkAclId' => network_acl_id,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -31,7 +31,7 @@ module Fog
           if self.data[:network_acls][network_acl_id]
 
             if self.data[:network_acls][network_acl_id]['associationSet'].any?
-              raise Fog::Compute::AWS::Error.new("ACL is in use")
+              raise Fog::AWS::Compute::Error.new("ACL is in use")
             end
 
             self.data[:network_acls].delete(network_acl_id)
@@ -43,7 +43,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -24,7 +24,7 @@ module Fog
             'NetworkAclId' => network_acl_id,
             'RuleNumber'   => rule_number,
             'Egress'       => egress,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -36,7 +36,7 @@ module Fog
             if self.data[:network_acls][network_acl_id]['entrySet'].find { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
               self.data[:network_acls][network_acl_id]['entrySet'].delete_if { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
             else
-              raise Fog::Compute::AWS::Error.new("No rule with that number and egress value")
+              raise Fog::AWS::Compute::Error.new("No rule with that number and egress value")
             end
 
             response.status = 200
@@ -46,7 +46,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end

data/lib/fog/aws/requests/compute/delete_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'
         # Deletes a network interface.
@@ -19,7 +19,7 @@ module Fog
           request(
             'Action'             => 'DeleteNetworkInterface',
             'NetworkInterfaceId' => network_interface_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -30,7 +30,7 @@ module Fog
           if self.data[:network_interfaces][network_interface_id]
 
             if self.data[:network_interfaces][network_interface_id]['attachment']['attachmentId']
-              raise Fog::Compute::AWS::Error.new("Interface is in use")
+              raise Fog::AWS::Compute::Error.new("Interface is in use")
             end
 
             self.data[:network_interfaces].delete(network_interface_id)
@@ -42,7 +42,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

data/lib/fog/aws/requests/compute/delete_placement_group.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'    => 'DeletePlacementGroup',
             'GroupName' => name,
             :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_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,11 +40,11 @@ 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 name
@@ -52,7 +52,7 @@ module Fog
           end
 
           unless self.data[:security_groups][id]
-            raise Fog::Compute::AWS::NotFound.new("The security group '#{id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The security group '#{id}' does not exist")
           end
 
           response = Excon::Response.new
@@ -93,11 +93,11 @@ 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(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