fog-aws 3.1.0 → 3.2.0

data/lib/fog/aws/requests/compute/associate_dhcp_options.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
             'DhcpOptionsId'        => dhcp_options_id,
             'VpcId'                => vpc_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -44,7 +44,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/associate_route_table.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/associate_route_table'
         # Associates a subnet with a route table.
@@ -21,7 +21,7 @@ module Fog
             'Action'       => 'AssociateRouteTable',
             'RouteTableId' => routeTableId,
             'SubnetId'     => subnetId,
-            :parser        => Fog::Parsers::Compute::AWS::AssociateRouteTable.new
+            :parser        => Fog::Parsers::AWS::Compute::AssociateRouteTable.new
           )
         end
       end
@@ -42,9 +42,9 @@ module Fog
             }
             response
           elsif routetable.nil?
-            raise Fog::Compute::AWS::NotFound.new("The routeTable ID '#{routeTableId}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The routeTable ID '#{routeTableId}' does not exist")
           else
-            raise Fog::Compute::AWS::NotFound.new("The subnet ID '#{subnetId}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The subnet ID '#{subnetId}' does not exist")
           end
         end
 

data/lib/fog/aws/requests/compute/attach_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
           }.merge(Fog::AWS.indexed_param('SecurityGroupId', security_group_ids)))
 
         end
@@ -38,10 +38,10 @@ module Fog
           instance = self.data[:instances][instance_id]
           if vpc && instance
             if instance['instanceState']['name'] != 'running' || instance['vpcId']
-              raise Fog::Compute::AWS::Error.new("Client.InvalidInstanceID.NotLinkable => Instance #{instance_id} is unlinkable")
+              raise Fog::AWS::Compute::Error.new("Client.InvalidInstanceID.NotLinkable => Instance #{instance_id} is unlinkable")
             end
             if instance['classicLinkVpcId']
-              raise Fog::Compute::AWS::Error.new("Client.InvalidInstanceID.InstanceAlreadyLinked => Instance #{instance_id} is already linked")
+              raise Fog::AWS::Compute::Error.new("Client.InvalidInstanceID.InstanceAlreadyLinked => Instance #{instance_id} is already linked")
             end
 
             response.status = 200
@@ -55,9 +55,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

data/lib/fog/aws/requests/compute/attach_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'
         # Attaches 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/attach_network_interface.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/attach_network_interface'
 
@@ -24,7 +24,7 @@ module Fog
             'NetworkInterfaceId' => nic_id,
             'InstanceId'         => instance_id,
             'DeviceIndex'        => device_index,
-            :parser => Fog::Parsers::Compute::AWS::AttachNetworkInterface.new
+            :parser => Fog::Parsers::AWS::Compute::AttachNetworkInterface.new
           )
         end
       end
@@ -35,9 +35,9 @@ module Fog
           if ! self.data[:instances].find{ |i,i_conf|
             i_conf['instanceId'] == instance_id
           }
-            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 self.data[:network_interfaces].find{ |ni,ni_conf| ni_conf['attachment']['instanceId'] == instance_id && ni_conf['attachment']['deviceIndex'] == device_index }
-            raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Instance '#{instance_id}' already has an interface attached at device index '#{device_index}'.")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Instance '#{instance_id}' already has an interface attached at device index '#{device_index}'.")
           elsif self.data[:network_interfaces][nic_id]
             attachment = self.data[:network_interfaces][nic_id]['attachment']
             attachment['attachmentId'] = Fog::AWS::Mock.request_id
@@ -50,7 +50,7 @@ module Fog
               'attachmentId' => attachment['attachmentId']
             }
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{nic_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{nic_id}' does not exist")
           end
 
           response

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/attach_volume'
 
@@ -29,7 +29,7 @@ module Fog
             'InstanceId'  => instance_id,
             'Device'      => device,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::AttachVolume.new
+            :parser       => Fog::Parsers::AWS::Compute::AttachVolume.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             volume = self.data[:volumes][volume_id]
             if instance && volume
               unless volume['status'] == 'available'
-                raise Fog::Compute::AWS::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")
+                raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")
               end
 
               data = {
@@ -61,9 +61,9 @@ module Fog
               }.merge!(data)
               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 !volume
-              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
           else
             message = 'MissingParameter => '
@@ -74,7 +74,7 @@ module Fog
             else
               message << 'The request must contain the parameter device'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -49,7 +49,7 @@ module Fog
           request({
             'Action'    => 'AuthorizeSecurityGroupEgress',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -66,7 +66,7 @@ module Fog
 
           response = Excon::Response.new
           group ||
-            raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist"))
+            raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist"))
 
           verify_permission_options(options, group['vpcId'] != nil)
 
@@ -75,11 +75,11 @@ module Fog
           normalized_permissions.each do |permission|
             if matching_group_permission = find_matching_permission_egress(group, permission)
               if permission['groups'].any? {|pg| matching_group_permission['groups'].include?(pg) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
 
               if permission['ipRanges'].any? {|pr| matching_group_permission['ipRanges'].include?(pr) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
             end
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
@@ -49,7 +49,7 @@ module Fog
           request({
             'Action'    => 'AuthorizeSecurityGroupIngress',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
 
@@ -89,7 +89,7 @@ module Fog
 
           response = Excon::Response.new
           group ||
-            raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist"))
+            raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist"))
 
           verify_permission_options(options, group['vpcId'] != nil)
 
@@ -98,11 +98,11 @@ module Fog
           normalized_permissions.each do |permission|
             if matching_group_permission = find_matching_permission(group, permission)
               if permission['groups'].any? {|pg| matching_group_permission['groups'].include?(pg) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
 
               if permission['ipRanges'].any? {|pr| matching_group_permission['ipRanges'].include?(pr) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
             end
           end
@@ -128,17 +128,17 @@ module Fog
 
         def verify_permission_options(options, is_vpc)
           if options.size <= 1
-            raise Fog::Compute::AWS::Error.new("InvalidRequest => The request received was invalid.")
+            raise Fog::AWS::Compute::Error.new("InvalidRequest => The request received was invalid.")
           end
           if !is_vpc && options['IpProtocol'] && !['tcp', 'udp', 'icmp'].include?(options['IpProtocol'])
-            raise Fog::Compute::AWS::Error.new("InvalidPermission.Malformed => Unsupported IP protocol \"#{options['IpProtocol']}\"  - supported: [tcp, udp, icmp]")
+            raise Fog::AWS::Compute::Error.new("InvalidPermission.Malformed => Unsupported IP protocol \"#{options['IpProtocol']}\"  - supported: [tcp, udp, icmp]")
           end
           if !is_vpc && (options['IpProtocol'] && (!options['FromPort'] || !options['ToPort']))
-            raise Fog::Compute::AWS::Error.new("InvalidPermission.Malformed => TCP/UDP port (-1) out of range")
+            raise Fog::AWS::Compute::Error.new("InvalidPermission.Malformed => TCP/UDP port (-1) out of range")
           end
           if options.key?('IpPermissions')
             if !options['IpPermissions'].is_a?(Array) || options['IpPermissions'].empty?
-              raise Fog::Compute::AWS::Error.new("InvalidRequest => The request received was invalid.")
+              raise Fog::AWS::Compute::Error.new("InvalidRequest => The request received was invalid.")
             end
             options['IpPermissions'].each {|p| verify_permission_options(p, is_vpc) }
           end
@@ -196,7 +196,7 @@ module Fog
                                    self.data[:security_groups][group_id]
                                  end
                 security_group ||
-                  raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name || group_id}' does not exist"))
+                  raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name || group_id}' does not exist"))
 
                 {
                   'groupName' => authorized_group['GroupName'] || security_group['groupName'],

data/lib/fog/aws/requests/compute/cancel_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/cancel_spot_instance_requests'
 
@@ -23,7 +23,7 @@ module Fog
           request({
             'Action'    => 'CancelSpotInstanceRequests',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::CancelSpotInstanceRequests.new
+            :parser     => Fog::Parsers::AWS::Compute::CancelSpotInstanceRequests.new
           }.merge!(params))
         end
       end
@@ -34,7 +34,7 @@ module Fog
           spot_request = self.data[:spot_requests][spot_instance_request_id]
 
           unless spot_request
-            raise Fog::Compute::AWS::NotFound.new("The spot instance request ID '#{spot_instance_request_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The spot instance request ID '#{spot_instance_request_id}' does not exist")
           end
 
           spot_request['fault']['code'] = 'request-cancelled'

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/copy_image'
 
@@ -28,7 +28,7 @@ module Fog
             'Name'            => name,
             'Description'     => description,
             'ClientToken'     => client_token,
-            :parser           => Fog::Parsers::Compute::AWS::CopyImage.new
+            :parser           => Fog::Parsers::AWS::Compute::CopyImage.new
           )
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/copy_snapshot'
 
@@ -33,7 +33,7 @@ module Fog
             'SourceSnapshotId' => source_snapshot_id,
             'SourceRegion'     => source_region,
             'Description'      => options['Description'],
-            :parser            => Fog::Parsers::Compute::AWS::CopySnapshot.new
+            :parser            => Fog::Parsers::AWS::Compute::CopySnapshot.new
           }
           params['Encrypted'] = true if options['Encrypted']
           params['KmsKeyId']  = options['KmsKeyId'] if options['Encrypted'] && options['KmsKeyId']

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_image'
 
@@ -39,7 +39,7 @@ module Fog
             'Name'              => name,
             'Description'       => description,
             'NoReboot'          => no_reboot.to_s,
-            :parser             => Fog::Parsers::Compute::AWS::CreateImage.new
+            :parser             => Fog::Parsers::AWS::Compute::CreateImage.new
           }.merge!(params))
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_internet_gateway'
 
@@ -25,7 +25,7 @@ module Fog
         def create_internet_gateway()
           request({
             'Action'     => 'CreateInternetGateway',
-            :parser      => Fog::Parsers::Compute::AWS::CreateInternetGateway.new
+            :parser      => Fog::Parsers::AWS::Compute::CreateInternetGateway.new
           })
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_key_pair'
 
@@ -22,7 +22,7 @@ module Fog
           request(
             'Action'  => 'CreateKeyPair',
             'KeyName' => key_name,
-            :parser   => Fog::Parsers::Compute::AWS::CreateKeyPair.new
+            :parser   => Fog::Parsers::AWS::Compute::CreateKeyPair.new
           )
         end
       end
@@ -43,7 +43,7 @@ module Fog
             }.merge!(data)
             response
           else
-            raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
       end