fog-aws 1.4.1 → 3.27.0

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/run_instances'
 
@@ -30,6 +30,8 @@ module Fog
         #     * 'Ebs.Encrypted'<~Boolean> - specifies whether or not the volume is to be encrypted unless snapshot is specified
         #     * 'Ebs.VolumeType'<~String> - Type of EBS volue. Valid options in ['standard', 'io1'] default is 'standard'.
         #     * 'Ebs.Iops'<~String> - The number of I/O operations per second (IOPS) that the volume supports. Required when VolumeType is 'io1'
+        #   * 'HibernationOptions'<~Array>: array of hashes
+        #     * 'Configured'<~Boolean> - specifies whether or not the instance is configured for hibernation.  This parameter is valid only if the instance meets the hibernation prerequisites.  
         #   * 'NetworkInterfaces'<~Array>: array of hashes
         #     * 'NetworkInterfaceId'<~String> - An existing interface to attach to a single instance
         #     * 'DeviceIndex'<~String> - The device index. Applies both to attaching an existing network interface and creating a network interface
@@ -42,13 +44,18 @@ module Fog
         #     * 'PrivateIpAddresses.Primary'<~Bool> - Indicates whether the private IP address is the primary private IP address.
         #     * 'SecondaryPrivateIpAddressCount'<~Bool> - The number of private IP addresses to assign to the network interface.
         #     * 'AssociatePublicIpAddress'<~String> - Indicates whether to assign a public IP address to an instance in a VPC. The public IP address is assigned to a specific network interface
+        #   * 'TagSpecifications'<~Array>: array of hashes
+        #     * 'ResourceType'<~String> - Type of resource to apply tags on, e.g: instance or volume
+        #     * 'Tags'<~Array> - List of hashes reprensenting tag to be set
+        #       * 'Key'<~String> - Tag name
+        #       * 'Value'<~String> - Tag value
         #   * 'ClientToken'<~String> - unique case-sensitive token for ensuring idempotency
         #   * 'DisableApiTermination'<~Boolean> - specifies whether or not to allow termination of the instance from the api
         #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (not supported for VPC)
         #   * 'SecurityGroupId'<~Array> or <~String> - id's of security group(s) for instances, use this or SecurityGroup
         #   * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown, in [stop, terminate]
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
-        #     in ['t1.micro', 't2.micro', 't2.small', 't2.medium', 'm1.small', 'm1.medium', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', 'g2.2xlarge', 'hs1.8xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cr1.8xlarge', 'm3.xlarge', 'm3.2xlarge', 'hi1.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge', 'i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge']
+        #     in ['t1.micro', 't2.nano', 't2.micro', 't2.small', 't2.medium', 'm1.small', 'm1.medium', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', 'g2.2xlarge', 'hs1.8xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cr1.8xlarge', 'm3.xlarge', 'm3.2xlarge', 'hi1.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge', 'i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge']
         #     default is 'm1.small'
         #   * 'KernelId'<~String> - Id of kernel with which to launch
         #   * 'KeyName'<~String> - Name of a keypair to add to booting instances
@@ -75,6 +82,8 @@ module Fog
         #           * 'deviceName'<~String> - specifies how volume is exposed to instance
         #           * 'status'<~String> - status of attached volume
         #           * 'volumeId'<~String> - Id of attached volume
+        #         * 'hibernationOptions'<~Array>
+        #           * 'configured'<~Boolean> - whether or not the instance is enabled for hibernation               
         #         * 'dnsName'<~String> - public dns name, blank until instance is running
         #         * 'imageId'<~String> - image id of ami used to launch instance
         #         * 'instanceId'<~String> - id of the instance
@@ -111,6 +120,13 @@ module Fog
               end
             end
           end
+          if hibernation_options = options.delete('HibernationOptions')
+            hibernation_options.each_with_index do |mapping, index|
+              for key, value in mapping
+                options.merge!({ format("HibernationOptions.%d.#{key}", index) => value })
+              end
+            end
+          end
           if security_groups = options.delete('SecurityGroup')
             options.merge!(Fog::AWS.indexed_param('SecurityGroup', [*security_groups]))
           end
@@ -133,6 +149,45 @@ module Fog
               end
             end
           end
+          if tag_specifications = options.delete('TagSpecifications')
+            # From https://docs.aws.amazon.com/sdk-for-ruby/v2/api/Aws/EC2/Client.html#run_instances-instance_method
+            # And https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html
+            # Discussed at https://github.com/fog/fog-aws/issues/603
+            #
+            # Example
+            #
+            # TagSpecifications: [
+            #     {
+            #       ResourceType: "instance",
+            #       Tags: [
+            #         {
+            #           Key: "Project",
+            #           Value: "MyProject",
+            #         },
+            #       ],
+            #     },
+            #     {
+            #       ResourceType: "volume",
+            #       Tags: [
+            #         {
+            #           Key: "Project",
+            #           Value: "MyProject",
+            #         },
+            #       ],
+            #     },
+            # ]
+            tag_specifications.each_with_index do |val, idx|
+              resource_type = val["ResourceType"]
+              tags = val["Tags"]
+              options["TagSpecification.#{idx}.ResourceType"] = resource_type
+              tags.each_with_index do |tag, tag_idx|
+                aws_tag_key = "TagSpecification.#{idx}.Tag.#{tag_idx}.Key"
+                aws_tag_value = "TagSpecification.#{idx}.Tag.#{tag_idx}.Value"
+                options[aws_tag_key] = tag["Key"]
+                options[aws_tag_value] = tag["Value"]
+              end
+            end
+          end
 
           idempotent = !(options['ClientToken'].nil? || options['ClientToken'].empty?)
 
@@ -142,7 +197,7 @@ module Fog
             'MinCount'  => min_count,
             'MaxCount'  => max_count,
             :idempotent => idempotent,
-            :parser     => Fog::Parsers::Compute::AWS::RunInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::RunInstances.new
           }.merge!(options))
         end
       end
@@ -157,7 +212,7 @@ module Fog
           reservation_id = Fog::AWS::Mock.reservation_id
 
           if options['KeyName'] && describe_key_pairs('key-name' => options['KeyName']).body['keySet'].empty?
-            raise Fog::Compute::AWS::NotFound.new("The key pair '#{options['KeyName']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The key pair '#{options['KeyName']}' does not exist")
           end
 
           min_count.times do |i|
@@ -182,6 +237,14 @@ module Fog
               }
             end
 
+	    hibernation_options = (options['HibernationOptions'] || []).reduce([]) do |mapping, device|
+              configure = device.fetch("Configure", true)
+
+              mapping << {
+                "Configure" => configure,
+              }
+            end
+
             if options['SubnetId']
               if options['PrivateIpAddress']
                 ni_options = {'PrivateIpAddress' => options['PrivateIpAddress']}
@@ -221,6 +284,7 @@ module Fog
               'associatePublicIP'     => options['associatePublicIP'] || false,
               'architecture'          => 'i386',
               'blockDeviceMapping'    => block_device_mapping,
+              'hibernationOptions'    => hibernation_options,
               'networkInterfaces'     => network_interfaces,
               'clientToken'           => options['clientToken'],
               'dnsName'               => nil,

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/start_stop_instances'
 
@@ -21,7 +21,7 @@ module Fog
           request({
             'Action'    => 'StartInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::StartStopInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
           }.merge!(params))
         end
       end
@@ -35,7 +35,7 @@ module Fog
           instance_set = instance_set.select {|x| instance_ids.include?(x["instanceId"]) }
 
           if instance_set.empty?
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
           else
             response = Excon::Response.new
             response.status = 200

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/start_stop_instances'
 
@@ -16,19 +16,27 @@ module Fog
         #     * TODO: fill in the blanks
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StopInstances.html]
-        def stop_instances(instance_id, force = false)
+        def stop_instances(instance_id, options = {})
           params = Fog::AWS.indexed_param('InstanceId', instance_id)
-          params.merge!('Force' => 'true') if force
+          unless options.is_a?(Hash)
+            Fog::Logger.warning("stop_instances with #{options.class} param is deprecated, use stop_instances('force' => boolean) instead [light_black](#{caller.first})[/]")
+            options = {'force' => options}
+          end
+          params.merge!('Force' => 'true') if options['force']
+          if options['hibernate']
+            params.merge!('Hibernate' => 'true')
+            params.merge!('Force' => 'false')
+          end
           request({
             'Action'    => 'StopInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::StartStopInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
           }.merge!(params))
         end
       end
 
       class Mock
-        def stop_instances(instance_id, force = false)
+        def stop_instances(instance_id, options = {})
           instance_ids = Array(instance_id)
 
           instance_set = self.data[:instances].values
@@ -36,7 +44,7 @@ module Fog
           instance_set = instance_set.select {|x| instance_ids.include?(x["instanceId"]) }
 
           if instance_set.empty?
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
           else
             response = Excon::Response.new
             response.status = 200

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/terminate_instances'
 
@@ -28,7 +28,7 @@ module Fog
           request({
             'Action'    => 'TerminateInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::TerminateInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::TerminateInstances.new
           }.merge!(params))
         end
       end
@@ -85,7 +85,7 @@ module Fog
 
             response
           else
-            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")
           end
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/monitor_unmonitor_instances'
 
@@ -22,7 +22,7 @@ module Fog
           request({
                           'Action' => 'UnmonitorInstances',
                           :idempotent => true,
-                          :parser => Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new
+                          :parser => Fog::Parsers::AWS::Compute::MonitorUnmonitorInstances.new
                   }.merge!(params))
         end
       end
@@ -35,7 +35,7 @@ module Fog
             if instance = self.data[:instances][instance_id]
               instance['monitoring']['state'] = 'enabled'
             else
-              raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids}' does not exist")
+              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist")
             end
           end
           instances_set = [*instance_ids].reduce([]) { |memo, id| memo << {'instanceId' => id, 'monitoring' => 'disabled'} }

data/lib/fog/aws/requests/data_pipeline/deactivate_pipeline.rb

@@ -15,7 +15,7 @@ module Fog
 
           response = request({
             :body => Fog::JSON.encode(params),
-            :headers => { 'X-Amz-Target' => 'DataPipeline.DectivatePipeline' }
+            :headers => { 'X-Amz-Target' => 'DataPipeline.DeactivatePipeline' }
           })
         end
       end

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

@@ -1,139 +1,6 @@
 module Fog
-  module DNS
-    class AWS
-
-      def self.hosted_zone_for_alias_target(dns_name)
-        hosted_zones = if dns_name.match(/^dualstack\./)
-          elb_dualstack_hosted_zone_mapping
-        else
-          elb_hosted_zone_mapping
-        end
-
-        Hash[hosted_zones.select { |k, _|
-          dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
-        }].values.last
-      end
-
-      def self.elb_hosted_zone_mapping
-        @elb_hosted_zone_mapping ||= {
-          "ap-northeast-1" => "Z2YN17T5R711GT",
-          "ap-southeast-1" => "Z1WI8VXHPB1R38",
-          "ap-southeast-2" => "Z2999QAZ9SRTIC",
-          "eu-west-1"      => "Z3NF1Z3NOM5OY2",
-          "eu-central-1"   => "Z215JYRZR1TBD5",
-          "sa-east-1"      => "Z2ES78Y61JGQKS",
-          "us-east-1"      => "Z3DZXE0Q79N41H",
-          "us-west-1"      => "Z1M58G0W56PQJA",
-          "us-west-2"      => "Z33MTJ483KN6FU",
-        }
-      end
-
-      # See https://forums.aws.amazon.com/message.jspa?messageID=612414
-      # Note: Oddly, to update this list, I have had to revert to going to
-      #       dev console at https://console.aws.amazon.com/route53/home, then using
-      #       search all sources for Z14GRHDCWA56QT to find this in a HashMap
-      def self.elb_dualstack_hosted_zone_mapping
-        @elb_dualstack_hosted_zone_mapping ||= {
-          "ap-northeast-1" => "Z14GRHDCWA56QT",
-          "ap-northeast-2" => "ZWKZPGTI48KDX",
-          "ap-south-1" => "ZP97RAFLXTNZK",
-          "ap-southeast-1" => "Z1LMS91P8CMLE5",
-          "ap-southeast-2" => "Z1GM3OXH4ZPM65",
-          "ca-central-1" => "ZQSVJUPU6J1EY",
-          "eu-central-1" => "Z215JYRZR1TBD5",
-          "eu-west-1" => "Z32O12XQLNTSW2",
-          "eu-west-2" => "ZHURV8PSTC4K8",
-          "us-east-1" => "Z35SXDOTRQ7X7K",
-          "us-east-2" => "Z3AADJGX6KTTL2",
-          "us-west-1" => "Z368ELLRRE2KJ0",
-          "us-west-2" => "Z1H1FL5HABSF5",
-          "sa-east-1" => "Z2P70J7HTTTPLU",
-        }
-      end
-
-      # Returns the xml request for a given changeset
-      def self.change_resource_record_sets_data(zone_id, change_batch, version, options = {})
-        # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use
-        # that form or just the actual id (which is what this request needs)
-        zone_id = zone_id.sub('/hostedzone/', '')
-
-        optional_tags = ''
-        options.each do |option, value|
-          case option
-          when :comment
-            optional_tags += "<Comment>#{value}</Comment>"
-          end
-        end
-
-        #build XML
-        if change_batch.count > 0
-
-          changes = "<ChangeBatch>#{optional_tags}<Changes>"
-
-          change_batch.each do |change_item|
-            action_tag = %Q{<Action>#{change_item[:action]}</Action>}
-            name_tag   = %Q{<Name>#{change_item[:name]}</Name>}
-            type_tag   = %Q{<Type>#{change_item[:type]}</Type>}
-
-            # TTL must be omitted if using an alias record
-            ttl_tag = ''
-            ttl_tag += %Q{<TTL>#{change_item[:ttl]}</TTL>} unless change_item[:alias_target]
-
-            weight_tag = ''
-            set_identifier_tag = ''
-            region_tag = ''
-            if change_item[:set_identifier]
-              set_identifier_tag += %Q{<SetIdentifier>#{change_item[:set_identifier]}</SetIdentifier>}
-              if change_item[:weight] # Weighted Record
-                weight_tag += %Q{<Weight>#{change_item[:weight]}</Weight>}
-              elsif change_item[:region] # Latency record
-                region_tag += %Q{<Region>#{change_item[:region]}</Region>}
-              end
-            end
-
-            failover_tag = if change_item[:failover]
-                             %Q{<Failover>#{change_item[:failover]}</Failover>}
-                           end
-
-            geolocation_tag = if change_item[:geo_location]
-                                xml_geo = change_item[:geo_location].map { |k,v| "<#{k}>#{v}</#{k}>" }.join
-                                %Q{<GeoLocation>#{xml_geo}</GeoLocation>}
-                              end
-
-            resource_records = change_item[:resource_records] || []
-            resource_record_tags = ''
-            resource_records.each do |record|
-              resource_record_tags += %Q{<ResourceRecord><Value>#{record}</Value></ResourceRecord>}
-            end
-
-            # ResourceRecords must be omitted if using an alias record
-            resource_tag = ''
-            resource_tag += %Q{<ResourceRecords>#{resource_record_tags}</ResourceRecords>} if resource_records.any?
-
-            alias_target_tag = ''
-            if change_item[:alias_target]
-              # Accept either underscore or camel case for hash keys.
-              dns_name = change_item[:alias_target][:dns_name] || change_item[:alias_target][:DNSName]
-              hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId] || AWS.hosted_zone_for_alias_target(dns_name)
-              evaluate_target_health = change_item[:alias_target][:evaluate_target_health] || change_item[:alias_target][:EvaluateTargetHealth] || false
-              evaluate_target_health_xml = !evaluate_target_health.nil? ? %Q{<EvaluateTargetHealth>#{evaluate_target_health}</EvaluateTargetHealth>} : ''
-              alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{hosted_zone_id}</HostedZoneId><DNSName>#{dns_name}</DNSName>#{evaluate_target_health_xml}</AliasTarget>}
-            end
-
-            health_check_id_tag = if change_item[:health_check_id]
-                                    %Q{<HealthCheckId>#{change_item[:health_check_id]}</HealthCheckId>}
-                                  end
-
-            change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{set_identifier_tag}#{weight_tag}#{region_tag}#{failover_tag}#{geolocation_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}#{health_check_id_tag}</ResourceRecordSet></Change>}
-            changes += change_tags
-          end
-
-          changes += '</Changes></ChangeBatch>'
-        end
-
-        %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{version}/">#{changes}</ChangeResourceRecordSetsRequest>}
-      end
-
+  module AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/change_resource_record_sets'
 
@@ -194,11 +61,11 @@ module Fog
         #     change_resource_record_sets("ABCDEFGHIJKLMN", change_batch_options)
         #
         def change_resource_record_sets(zone_id, change_batch, options = {})
-          body = AWS.change_resource_record_sets_data(zone_id, change_batch, @version, options)
+          body = Fog::AWS::DNS.change_resource_record_sets_data(zone_id, change_batch, @version, options)
           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 +169,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"