fog-aws 3.0.0 → 3.10.0

data/lib/fog/aws/requests/cdn/put_distribution_config.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/distribution'
 
@@ -80,7 +80,7 @@ module Fog
             },
             :idempotent => true,
             :method     => 'PUT',
-            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
             :path       => "/distribution/#{distribution_id}/config"
           })
         end
@@ -92,10 +92,10 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['DistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
 
             distribution['DistributionConfig'].merge!(options)
@@ -103,11 +103,11 @@ module Fog
 
             response = Excon::Response.new
             response.status = 200
-            response.headers['ETag'] = Fog::CDN::AWS::Mock.generic_id
+            response.headers['ETag'] = Fog::AWS::CDN::Mock.generic_id
             response.body = distribution.merge({ 'LastModifiedTime' => Time.now.utc.iso8601 }).reject{ |k,v| k == 'ETag' }
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/streaming_distribution'
 
@@ -69,7 +69,7 @@ module Fog
             },
             :idempotent => true,
             :method     => 'PUT',
-            :parser     => Fog::Parsers::CDN::AWS::StreamingDistribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::StreamingDistribution.new,
             :path       => "/streaming-distribution/#{distribution_id}/config"
           })
         end
@@ -81,10 +81,10 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['StreamingDistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
 
             distribution['StreamingDistributionConfig'].merge!(options)
@@ -92,11 +92,11 @@ module Fog
 
             response = Excon::Response.new
             response.status = 200
-            response.headers['ETag'] = Fog::CDN::AWS::Mock.generic_id
+            response.headers['ETag'] = Fog::AWS::CDN::Mock.generic_id
             response.body = distribution.merge({ 'LastModifiedTime' => Time.now.utc.iso8601 }).reject{ |k,v| k == 'ETag' }
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_streaming_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb

@@ -61,13 +61,13 @@ module Fog
           supported_actions = [ "InsufficientDataActions", "OKActions", "AlarmActions" ]
           found_actions = options.keys.select {|key| supported_actions.include? key }
           if found_actions.empty?
-            raise Fog::Compute::AWS::Error.new("The request must contain at least one of #{supported_actions.join(", ")}'")
+            raise Fog::AWS::Compute::Error.new("The request must contain at least one of #{supported_actions.join(", ")}'")
           end
 
           requirements = [ "AlarmName", "ComparisonOperator", "EvaluationPeriods", "Namespace", "Period", "Statistic", "Threshold" ]
           requirements.each do |req|
             unless options.key?(req)
-              raise Fog::Compute::AWS::Error.new("The request must contain a the parameter '%s'" % req)
+              raise Fog::AWS::Compute::Error.new("The request must contain a the parameter '%s'" % req)
             end
           end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/allocate_address'
 
@@ -20,7 +20,7 @@ module Fog
           request(
             'Action'  => 'AllocateAddress',
             'Domain'  => domain,
-            :parser   => Fog::Parsers::Compute::AWS::AllocateAddress.new
+            :parser   => Fog::Parsers::AWS::Compute::AllocateAddress.new
           )
         end
       end
@@ -28,7 +28,7 @@ module Fog
       class Mock
         def allocate_address(domain = 'standard')
           unless describe_addresses.body['addressesSet'].size < self.data[:limits][:addresses]
-            raise Fog::Compute::AWS::Error, "AddressLimitExceeded => Too many addresses allocated"
+            raise Fog::AWS::Compute::Error, "AddressLimitExceeded => Too many addresses allocated"
           end
 
           response = Excon::Response.new

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/assign_private_ip_addresses'
 
@@ -20,7 +20,7 @@ module Fog
         # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssignPrivateIpAddresses.html]
         def assign_private_ip_addresses(network_interface_id, options={})
           if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
-            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+            raise Fog::AWS::Compute::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
           end
 
           if private_ip_addresses = options.delete('PrivateIpAddresses')
@@ -30,7 +30,7 @@ module Fog
           request({
             'Action'  => 'AssignPrivateIpAddresses',
             'NetworkInterfaceId' => network_interface_id,
-            :parser   => Fog::Parsers::Compute::AWS::AssignPrivateIpAddresses.new
+            :parser   => Fog::Parsers::AWS::Compute::AssignPrivateIpAddresses.new
           }.merge(options))
         end
       end
@@ -38,7 +38,7 @@ module Fog
       class Mock
         def assign_private_ip_addresses(network_interface_id, options={})
           if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
-            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+            raise Fog::AWS::Compute::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
           end
 
           response = Excon::Response.new

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/associate_address'
 
@@ -48,7 +48,7 @@ module Fog
             'PrivateIpAddress'   => params[:private_ip_address],
             'AllowReassociation' => params[:allow_reassociation],
             :idempotent          => true,
-            :parser              => Fog::Parsers::Compute::AWS::AssociateAddress.new
+            :parser              => Fog::Parsers::AWS::Compute::AssociateAddress.new
           )
         end
       end
@@ -119,13 +119,13 @@ module Fog
             end
             response
           elsif !instance
-            raise Fog::Compute::AWS::NotFound.new("You must specify either an InstanceId or a NetworkInterfaceID")
+            raise Fog::AWS::Compute::NotFound.new("You must specify either an InstanceId or a NetworkInterfaceID")
           elsif !address
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           elsif params[:network_interface_id].nil? && params[:allocation_id].nil?
-            raise Fog::Compute::AWS::NotFound.new("You must specify an AllocationId when specifying a NetworkInterfaceID")
+            raise Fog::AWS::Compute::NotFound.new("You must specify an AllocationId when specifying a NetworkInterfaceID")
           else (!instance.nil? && params[:network_interface_id].nil?) || (params[:instance_id].nil? && !params[:network_interface_id].nil?)
-            raise Fog::Compute::AWS::Error.new("You must specify either an InstanceId or a NetworkInterfaceID")
+            raise Fog::AWS::Compute::Error.new("You must specify either an InstanceId or a NetworkInterfaceID")
           end
         end
       end

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