fog-aws 3.1.0 → 3.2.0

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
 
       def self.hosted_zone_for_alias_target(dns_name)
         hosted_zones = if dns_name.match(/^dualstack\./)
@@ -198,7 +198,7 @@ module Fog
           request({
             :body       => body,
             :idempotent => true,
-            :parser     => Fog::Parsers::DNS::AWS::ChangeResourceRecordSets.new,
+            :parser     => Fog::Parsers::AWS::DNS::ChangeResourceRecordSets.new,
             :expects    => 200,
             :method     => 'POST',
             :path       => "hostedzone/#{zone_id}/rrset"
@@ -302,10 +302,10 @@ module Fog
               }
               response
             else
-              raise Fog::DNS::AWS::Error.new("InvalidChangeBatch => #{errors.join(", ")}")
+              raise Fog::AWS::DNS::Error.new("InvalidChangeBatch => #{errors.join(", ")}")
             end
           else
-            raise Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
+            raise Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
           end
         end
       end

data/lib/fog/aws/requests/dns/create_health_check.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/health_check'
 
@@ -55,7 +55,7 @@ module Fog
             :expects => 201,
             :method  => 'POST',
             :path    => 'healthcheck',
-            :parser  => Fog::Parsers::DNS::AWS::HealthCheck.new
+            :parser  => Fog::Parsers::AWS::DNS::HealthCheck.new
           })
         end
       end

data/lib/fog/aws/requests/dns/create_hosted_zone.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/create_hosted_zone'
 
@@ -48,7 +48,7 @@ module Fog
 
           request({
             :body    => %Q{<?xml version="1.0" encoding="UTF-8"?><CreateHostedZoneRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/"><Name>#{name}</Name>#{optional_tags}</CreateHostedZoneRequest>},
-            :parser  => Fog::Parsers::DNS::AWS::CreateHostedZone.new,
+            :parser  => Fog::Parsers::AWS::DNS::CreateHostedZone.new,
             :expects => 201,
             :method  => 'POST',
             :path    => "hostedzone"
@@ -102,7 +102,7 @@ module Fog
             }
             response
           else
-            raise Fog::DNS::AWS::Error.new("DelegationSetNotAvailable => Amazon Route 53 allows some duplication, but Amazon Route 53 has a maximum threshold of duplicated domains. This error is generated when you reach that threshold. In this case, the error indicates that too many hosted zones with the given domain name exist. If you want to create a hosted zone and Amazon Route 53 generates this error, contact Customer Support.")
+            raise Fog::AWS::DNS::Error.new("DelegationSetNotAvailable => Amazon Route 53 allows some duplication, but Amazon Route 53 has a maximum threshold of duplicated domains. This error is generated when you reach that threshold. In this case, the error indicates that too many hosted zones with the given domain name exist. If you want to create a hosted zone and Amazon Route 53 generates this error, contact Customer Support.")
           end
         end
       end

data/lib/fog/aws/requests/dns/delete_health_check.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         # This action deletes a health check.
         # http://docs.aws.amazon.com/Route53/latest/APIReference/API_DeleteHealthCheck.html

data/lib/fog/aws/requests/dns/delete_hosted_zone.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/delete_hosted_zone'
 
@@ -24,7 +24,7 @@ module Fog
 
           request({
             :expects => 200,
-            :parser  => Fog::Parsers::DNS::AWS::DeleteHostedZone.new,
+            :parser  => Fog::Parsers::AWS::DNS::DeleteHostedZone.new,
             :method  => 'DELETE',
             :path    => "hostedzone/#{zone_id}"
           })
@@ -37,7 +37,7 @@ module Fog
         def delete_hosted_zone(zone_id)
           response = Excon::Response.new
           key = [zone_id, "/hostedzone/#{zone_id}"].find { |k| !self.data[:zones][k].nil? } ||
-            raise(Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone does not exist."))
+            raise(Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone does not exist."))
 
             change = {
               :id => Fog::AWS::Mock.change_id,

data/lib/fog/aws/requests/dns/get_change.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/get_change'
 
@@ -23,7 +23,7 @@ module Fog
 
           request({
             :expects => 200,
-            :parser  => Fog::Parsers::DNS::AWS::GetChange.new,
+            :parser  => Fog::Parsers::AWS::DNS::GetChange.new,
             :method  => 'GET',
             :path    => "change/#{change_id}"
           })
@@ -36,7 +36,7 @@ module Fog
           # find the record with matching change_id
           # records = data[:zones].values.map{|z| z[:records].values.map{|r| r.values}}.flatten
           change = self.data[:changes][change_id] ||
-            raise(Fog::DNS::AWS::NotFound.new("NoSuchChange => Could not find resource with ID: #{change_id}"))
+            raise(Fog::AWS::DNS::NotFound.new("NoSuchChange => Could not find resource with ID: #{change_id}"))
 
           response.status = 200
           submitted_at = Time.parse(change[:submitted_at])

data/lib/fog/aws/requests/dns/get_health_check.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/health_check'
 
@@ -30,7 +30,7 @@ module Fog
         def get_health_check(id)
           request({
             :expects => 200,
-            :parser  => Fog::Parsers::DNS::AWS::HealthCheck.new,
+            :parser  => Fog::Parsers::AWS::DNS::HealthCheck.new,
             :method  => 'GET',
             :path    => "healthcheck/#{id}"
           })

data/lib/fog/aws/requests/dns/get_hosted_zone.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/get_hosted_zone'
 
@@ -29,7 +29,7 @@ module Fog
             :expects => 200,
             :idempotent => true,
             :method  => 'GET',
-            :parser  => Fog::Parsers::DNS::AWS::GetHostedZone.new,
+            :parser  => Fog::Parsers::AWS::DNS::GetHostedZone.new,
             :path    => "hostedzone/#{zone_id}"
           })
         end
@@ -51,7 +51,7 @@ module Fog
             }
             response
           else
-            raise Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
+            raise Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
           end
         end
       end

data/lib/fog/aws/requests/dns/list_health_checks.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/list_health_checks'
 
@@ -26,7 +26,7 @@ module Fog
             :expects => 200,
             :method  => 'GET',
             :path    => "healthcheck",
-            :parser  => Fog::Parsers::DNS::AWS::ListHealthChecks.new
+            :parser  => Fog::Parsers::AWS::DNS::ListHealthChecks.new
           })
         end
       end

data/lib/fog/aws/requests/dns/list_hosted_zones.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/list_hosted_zones'
 
@@ -38,7 +38,7 @@ module Fog
 
           request({
             :query   => parameters,
-            :parser  => Fog::Parsers::DNS::AWS::ListHostedZones.new,
+            :parser  => Fog::Parsers::AWS::DNS::ListHostedZones.new,
             :expects => 200,
             :method  => 'GET',
             :path    => "hostedzone"

data/lib/fog/aws/requests/dns/list_resource_record_sets.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/list_resource_record_sets'
 
@@ -51,7 +51,7 @@ module Fog
             :expects => 200,
             :idempotent => true,
             :method  => 'GET',
-            :parser  => Fog::Parsers::DNS::AWS::ListResourceRecordSets.new,
+            :parser  => Fog::Parsers::AWS::DNS::ListResourceRecordSets.new,
             :path    => "hostedzone/#{zone_id}/rrset",
             :query   => parameters
           })
@@ -64,7 +64,7 @@ module Fog
             tmp_records.push(record) if !record[:name].nil? && ( name.nil? || record[:name].gsub(zone[:name],"") >= name)
             record.each do |key,subr|
               if subr.is_a?(Hash) && key.is_a?(String) &&
-                key.start_with?(Fog::DNS::AWS::Mock::SET_PREFIX)
+                key.start_with?(Fog::AWS::DNS::Mock::SET_PREFIX)
                 if name.nil?
                   tmp_records.append(subr)
                 else
@@ -81,7 +81,7 @@ module Fog
           response = Excon::Response.new
 
           zone = self.data[:zones][zone_id] ||
-            raise(Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist."))
+            raise(Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist."))
 
           records = if options[:type]
                       records_type = zone[:records][options[:type]]

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -80,7 +80,7 @@ module Fog
                    elsif subnet_ids.any?
                      # using Hash here for Rubt 1.8.7 support.
                      Hash[
-                       Fog::Compute::AWS::Mock.data.select do |_, region_data|
+                       Fog::AWS::Compute::Mock.data.select do |_, region_data|
                          region_data[@aws_access_key_id][:subnets].any? do |region_subnets|
                            subnet_ids.include? region_subnets['subnetId']
                          end
@@ -89,8 +89,8 @@ module Fog
                    else
                      'us-east-1'
                    end
-          supported_platforms = Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:account_attributes].find { |h| h["attributeName"] == "supported-platforms" }["values"]
-          subnets = Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:subnets].select {|e| subnet_ids.include?(e["subnetId"]) }
+          supported_platforms = Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:account_attributes].find { |h| h["attributeName"] == "supported-platforms" }["values"]
+          subnets = Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:subnets].select {|e| subnet_ids.include?(e["subnetId"]) }
 
           # http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/default-vpc.html
           elb_location = if supported_platforms.include?("EC2")
@@ -109,21 +109,21 @@ module Fog
 
           security_group = case elb_location
                            when 'EC2-Classic'
-                             Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups]['amazon-elb-sg']
+                             Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups]['amazon-elb-sg']
                            when 'EC2-VPC-Default'
-                             compute = Fog::Compute::AWS::new(:aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key)
+                             compute = Fog::AWS::Compute::new(:aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key)
 
                              vpc = compute.vpcs.all.first ||
                                compute.vpcs.create('cidr_block' => '10.0.0.0/24')
 
-                             Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
+                             Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
                                sg['groupName'] =~ /^default_elb/ &&
                                  sg["vpcId"] == vpc.id
                              }
                            when 'EC2-VPC'
                              vpc_id = subnets.first["vpcId"]
 
-                             Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
+                             Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
                                sg['groupName'] == 'default' &&
                                  sg["vpcId"] == vpc_id
                              }

data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb

@@ -35,7 +35,7 @@ module Fog
           raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
           instance_ids = [*instance_ids]
           instance_ids.each do |instance|
-            raise Fog::AWS::ELB::InvalidInstance unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][instance]
+            raise Fog::AWS::ELB::InvalidInstance unless Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:instances][instance]
           end
 
           response = Excon::Response.new

data/lib/fog/aws/requests/elb/describe_instance_health.rb

@@ -38,7 +38,7 @@ module Fog
           instance_ids = [*instance_ids]
           instance_ids = load_balancer['Instances'].map { |i| i['InstanceId'] } unless instance_ids.any?
           data = instance_ids.map do |id|
-            unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][id]
+            unless Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:instances][id]
               raise Fog::AWS::ELB::InvalidInstance
             end
 

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

@@ -24,7 +24,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
 

data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb

@@ -35,7 +35,7 @@ module Fog
           raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
           instance_ids = [*instance_ids]
           instances = instance_ids.map do |instance|
-            raise Fog::AWS::ELB::InvalidInstance unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][instance]
+            raise Fog::AWS::ELB::InvalidInstance unless Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:instances][instance]
             {'InstanceId' => instance}
           end
 

data/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb

@@ -34,7 +34,7 @@ module Fog
           end
 
           if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
-            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            ec2_security_group = (Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
             opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 

data/lib/fog/aws/requests/rds/create_db_instance.rb

@@ -83,7 +83,7 @@ module Fog
             raise Fog::AWS::RDS::InvalidParameterCombination.new('Requesting a specific availability zone is not valid for Multi-AZ instances.')
           end
 
-          ec2 = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id]
+          ec2 = Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id]
 
           db_parameter_groups     = if pg_name = options.delete("DBParameterGroupName")
                                       group = self.data[:parameter_groups][pg_name]

data/lib/fog/aws/requests/rds/create_db_subnet_group.rb

@@ -30,8 +30,8 @@ module Fog
             raise Fog::AWS::RDS::IdentifierTaken.new("DBSubnetGroupAlreadyExists => The subnet group '#{name}' already exists")
           end
 
-          # collection = Fog::Compute::AWS.new(:aws_access_key_id => 'mock key', :aws_secret_access_key => 'mock secret')
-          compute_data = Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id]
+          # collection = Fog::AWS::Compute.new(:aws_access_key_id => 'mock key', :aws_secret_access_key => 'mock secret')
+          compute_data = Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id]
 
           subnets = subnet_ids.map do |snid|
             subnet = compute_data[:subnets].detect { |s| s['subnetId'] == snid }

data/lib/fog/aws/requests/rds/modify_db_instance.rb

@@ -68,7 +68,7 @@ module Fog
               end
 
               rds_security_groups = self.data[:security_groups].values
-              ec2_security_groups = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:security_groups].values
+              ec2_security_groups = Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:security_groups].values
 
               db_security_group_names = Array(options.delete("DBSecurityGroups"))
               db_security_groups = db_security_group_names.inject([]) do |r, group_name|

data/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb

@@ -34,7 +34,7 @@ module Fog
           end
 
           if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
-            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            ec2_security_group = (Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
             opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 

data/lib/fog/aws/requests/storage/abort_multipart_upload.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         #
         # Abort a multipart upload
@@ -25,7 +25,7 @@ module Fog
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def abort_multipart_upload(bucket_name, object_name, upload_id)
           verify_mock_bucket_exists(bucket_name)

data/lib/fog/aws/requests/storage/acl_utils.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       require 'fog/aws/parsers/storage/access_control_list'
 
       private
@@ -51,7 +51,7 @@ module Fog
         end
 
         def self.acl_to_hash(acl_xml)
-          parser = Fog::Parsers::Storage::AWS::AccessControlList.new
+          parser = Fog::Parsers::AWS::Storage::AccessControlList.new
           Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml)
           parser.response
         end

data/lib/fog/aws/requests/storage/complete_multipart_upload.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/complete_multipart_upload'
 
@@ -40,7 +40,7 @@ module Fog
             :bucket_name => bucket_name,
             :object_name => object_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::CompleteMultipartUpload.new,
+            :parser     => Fog::Parsers::AWS::Storage::CompleteMultipartUpload.new,
             :query      => {'uploadId' => upload_id}
           })
         end
@@ -48,7 +48,7 @@ module Fog
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
           bucket = verify_mock_bucket_exists(bucket_name)