fog-aws 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b74ccb392ce39559dbdd053081d2e304b52957
-  data.tar.gz: c5010f4e017481193b8f0e84c17b54a2bb3edc6f
+  metadata.gz: 84e01817c525f630628cc5228b64c4887fe88936
+  data.tar.gz: 54c9b3172b779d70f2a3ac3b373762b805dbee1e
 SHA512:
-  metadata.gz: f24cc2d407182a671b21b832ccfbc45fda04f794ac5f6fcb8a117925a86f9df1c82af39d1021d412cf8ca190b98c461807cdeea74322beaaec7af9aafaf33bfa
-  data.tar.gz: e6f134e032e570cc657deec822c02621e27e9a7e891adf3967ddb85b2c0fd48883be9fe33de1578d6349226f8279ae8a5563119cf9894f15e96adc781ddc0183
+  metadata.gz: 96d2bf8959b64f8b25c48082b620234f6c9a02d447f26266b93f2ee74dacda96f3f62aab5937aca0504b0addb80a4abbcf736463b6aef9bf4dd13c1b8b7dd356
+  data.tar.gz: 4a03a295b335373298ff9ddb808d31c5d49a1772f3cbab159b123613c0cc10b74ea61805491f78f9c70879364ce2dae35b9a3d2e8ab4ea06f5ddc88a56df8276

data/lib/fog/aws.rb

@@ -44,6 +44,7 @@ module Fog
     autoload :Federation,       File.expand_path('../aws/federation', __FILE__)
     autoload :Glacier,          File.expand_path('../aws/glacier', __FILE__)
     autoload :IAM,              File.expand_path('../aws/iam', __FILE__)
+    autoload :Kinesis,          File.expand_path('../aws/kinesis', __FILE__)
     autoload :KMS,              File.expand_path('../aws/kms', __FILE__)
     autoload :Lambda,           File.expand_path('../aws/lambda', __FILE__)
     autoload :RDS,              File.expand_path('../aws/rds', __FILE__)
@@ -70,6 +71,7 @@ module Fog
     service(:federation,      'Federation')
     service(:glacier,         'Glacier')
     service(:iam,             'IAM')
+    service(:kinesis,         'Kinesis')
     service(:kms,             'KMS')
     service(:lambda,          'Lambda')
     service(:rds,             'RDS')
@@ -219,7 +221,7 @@ module Fog
 
     def self.json_response?(response)
       return false unless response && response.headers
-      response.get_header('Content-Type') =~ %r{application/json}i ? true : false
+      response.get_header('Content-Type') =~ %r{application/.*json.*}i ? true : false
     end
   end
 end

data/lib/fog/aws/errors.rb

@@ -17,9 +17,9 @@ module Fog
           begin
             full_msg_error = Fog::JSON.decode(error.response.body)
             if (full_msg_error.has_key?('Message') || full_msg_error.has_key?('message')) &&
-              error.response.headers.has_key?('x-amzn-ErrorType')
+                (error.response.headers.has_key?('x-amzn-ErrorType') || full_msg_error.has_key?('__type'))
               matched_error = {
-                :code    => error.response.headers['x-amzn-ErrorType'].split(':').first,
+                :code    => full_msg_error['__type'] || error.response.headers['x-amzn-ErrorType'].split(':').first,
                 :message => full_msg_error['Message'] || full_msg_error['message']
               }
               return matched_error
@@ -32,4 +32,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/kinesis.rb

@@ -0,0 +1,187 @@
+module Fog
+  module AWS
+    class Kinesis < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
+
+      class ExpiredIterator < Fog::Errors::Error; end
+      class LimitExceeded < Fog::Errors::Error; end
+      class ResourceInUse < Fog::Errors::Error; end
+      class ResourceNotFound < Fog::Errors::Error; end
+      class ExpiredIterator < Fog::Errors::Error; end
+      class InvalidArgument < Fog::Errors::Error; end
+      class ProvisionedThroughputExceeded < Fog::Errors::Error; end
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
+
+      request_path 'fog/aws/requests/kinesis'
+
+      request :add_tags_to_stream
+      request :create_stream
+      request :delete_stream
+      request :describe_stream
+      request :get_records
+      request :get_shard_iterator
+      request :list_streams
+      request :list_tags_for_stream
+      request :merge_shards
+      request :put_record
+      request :put_records
+      request :remove_tags_from_stream
+      request :split_shard
+
+      class Real
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+
+        def initialize(options={})
+          @use_iam_profile = options[:use_iam_profile]
+
+          @connection_options = options[:connection_options] || {}
+
+          @instrumentor           = options[:instrumentor]
+          @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.kinesis'
+
+          options[:region] ||= 'us-east-1'
+          @region     = options[:region]
+          @host       = options[:host] || "kinesis.#{options[:region]}.amazonaws.com"
+          @path       = options[:path]        || '/'
+          @persistent = options[:persistent]  || true
+          @port       = options[:port]        || 443
+          @scheme     = options[:scheme]      || 'https'
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @version    = "20131202"
+
+          setup_credentials(options)
+        end
+
+        private
+
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 'kinesis')
+        end
+
+        def request(params)
+          refresh_credentials_if_expired
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          date = Fog::Time.now
+          headers = {
+            'X-Amz-Target' => params['X-Amz-Target'],
+            'Content-Type' => 'application/x-amz-json-1.1',
+            'Host'         => @host,
+            'x-amz-date'   => date.to_iso8601_basic
+          }
+          headers['x-amz-security-token'] = @aws_session_token if @aws_session_token
+          body = MultiJson.dump(params[:body])
+          headers['Authorization'] = @signer.sign({:method => "POST", :headers => headers, :body => body, :query => {}, :path => @path}, date)
+
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(body, headers, idempotent, parser)
+            end
+          else
+            _request(body, headers, idempotent, parser)
+          end
+        end
+
+        def _request(body, headers, idempotent, parser)
+          @connection.request({
+                                :body       => body,
+                                :expects    => 200,
+                                :headers    => headers,
+                                :idempotent => idempotent,
+                                :method     => 'POST',
+                                :parser     => parser
+                              })
+        rescue Excon::Errors::HTTPStatusError => error
+          match = Fog::AWS::Errors.match_error(error)
+          raise if match.empty?
+          raise case match[:code]
+                when 'ExpiredIteratorException'
+                  Fog::AWS::Kinesis::ExpiredIterator.slurp(error, match[:message])
+                when 'LimitExceededException'
+                  Fog::AWS::Kinesis::LimitExceeded.slurp(error, match[:message])
+                when 'ResourceInUseException'
+                  Fog::AWS::Kinesis::ResourceInUse.slurp(error, match[:message])
+                when 'ResourceNotFoundException'
+                  Fog::AWS::Kinesis::ResourceNotFound.slurp(error, match[:message])
+                when 'ExpiredIteratorException'
+                  Fog::AWS::Kinesis::ExpiredIterator.slurp(error, match[:message])
+                when 'InvalidArgumentException'
+                  Fog::AWS::Kinesis::InvalidArgument.slurp(error, match[:message])
+                when 'ProvisionedThroughputExceededException'
+                  Fog::AWS::Kinesis::ProvisionedThroughputExceeded.slurp(error, match[:message])
+                else
+                  Fog::AWS::Kinesis::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                end
+        end
+
+      end
+
+      class Mock
+        def self.mutex
+          @mutex ||= Mutex.new
+        end
+        def mutex; self.class.mutex; end
+
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :kinesis_streams => {}
+              }
+            end
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @account_id        = Fog::AWS::Mock.owner_id
+          @aws_access_key_id = options[:aws_access_key_id]
+          @region            = options[:region] || 'us-east-1'
+
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+        end
+
+        def self.next_sequence_number
+          mutex.synchronize do
+            @sequence_number ||= -1
+            @sequence_number += 1
+            @sequence_number.to_s
+          end
+        end
+        def next_sequence_number; self.class.next_sequence_number; end
+
+        def self.next_shard_id
+          mutex.synchronize do
+            @shard_id ||= -1
+            @shard_id += 1
+            "shardId-#{@shard_id.to_s.rjust(12, "0")}"
+          end
+        end
+        def next_shard_id; self.class.next_shard_id; end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/lambda.rb

@@ -124,7 +124,8 @@ module Fog
 
           idempotent   = params.delete(:idempotent)
           parser       = params.delete(:parser)
-          request_path = "/#{@version}#{params.delete(:path)}"
+          path         = params.delete(:path)
+          request_path = "/#{@version}#{path}"
           query        = params.delete(:query)   || {}
           method       = params.delete(:method)  || 'POST'
           expects      = params.delete(:expects) || 200
@@ -132,6 +133,13 @@ module Fog
 
           headers.merge!(params[:headers] || {})
 
+          request_path_to_sign = case path
+          when %r{^/functions/([0-9a-zA-Z\:\-\_]+)(/.+)?$}
+            "/#{@version}/functions/#{Fog::AWS.escape($~[1])}#{$~[2]}"
+          else
+            request_path
+          end
+
           body, headers = AWS.signed_params_v4(
             params,
             headers,
@@ -140,7 +148,7 @@ module Fog
               :aws_session_token => @aws_session_token,
               :signer            => @signer,
               :host              => @host,
-              :path              => request_path,
+              :path              => request_path_to_sign,
               :port              => @port,
               :query             => query,
               :body              => params[:body]

data/lib/fog/aws/models/dns/zones.rb

@@ -10,8 +10,8 @@ module Fog
         model Fog::DNS::AWS::Zone
 
         def all(options = {})
-          options['marker']   ||= marker
-          options['maxitems'] ||= max_items
+          options[:marker]   ||= marker
+          options[:maxitems] ||= max_items
           data = service.list_hosted_zones(options).body['HostedZones']
           load(data)
         end

data/lib/fog/aws/parsers/compute/describe_route_tables.rb

@@ -7,7 +7,7 @@ module Fog
             @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false }
             @in_association_set = false
             @in_route_set = false
-            @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'state' => nil, 'origin' => nil }
+            @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil }
             @response = { 'routeTableSet' => [] }
             @tag = {}
             @route_table = { 'associationSet' => [], 'tagSet' => {}, 'routeSet' => [] }
@@ -54,11 +54,11 @@ module Fog
               end
             elsif @in_route_set
               case name
-              when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'state', 'origin'
+              when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'vpcPeeringConnectionId', 'state', 'origin'
                 @route[name] = value
               when 'item'
                 @route_table['routeSet'] << @route
-                @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'state' => nil, 'origin' => nil }
+                @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil }
               when 'routeSet'
                 @in_route_set = false
               end

data/lib/fog/aws/parsers/compute/describe_vpcs.rb

@@ -30,7 +30,7 @@ module Fog
               end
             else
               case name
-              when 'vpcId', 'state', 'cidrBlock', 'dhcpOptionsId', 'instanceTenancy'
+              when 'vpcId', 'state', 'cidrBlock', 'dhcpOptionsId', 'instanceTenancy', 'isDefault'
                 @vpc[name] = value
               when 'item'
                 @response['vpcSet'] << @vpc

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

@@ -23,6 +23,7 @@ module Fog
         #         * 'instanceId'<~String> - The ID of a NAT instance in your VPC.
         #         * 'instanceOwnerId'<~String> - The owner of the instance.
         #         * 'networkInterfaceId'<~String> - The network interface ID.
+        #         * 'vpcPeeringConnectionId'<~String> - The peering connection ID.
         #         * 'state'<~String> - The state of the route. The blackhole state indicates that the route's target isn't available.
         #         * 'origin'<~String> - Describes how the route was created.
         #       * 'associationSet'<~Array>:

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

@@ -1,6 +1,110 @@
 module Fog
   module DNS
     class AWS
+
+      def self.hosted_zone_for_alias_target(dns_name)
+        Hash[elb_hosted_zone_mapping.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
+
+      # 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
+
       class Real
         require 'fog/aws/parsers/dns/change_resource_record_sets'
 
@@ -61,84 +165,7 @@ module Fog
         #     change_resource_record_sets("ABCDEFGHIJKLMN", change_batch_options)
         #
         def change_resource_record_sets(zone_id, change_batch, 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]
-                %Q{<GeoLocation>#{change_item[:geo_location]}</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
-
-          body = %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/">#{changes}</ChangeResourceRecordSetsRequest>}
+          body = AWS.change_resource_record_sets_data(zone_id, change_batch, @version, options)
           request({
             :body       => body,
             :idempotent => true,
@@ -151,7 +178,9 @@ module Fog
       end
 
       class Mock
+
         SET_PREFIX = 'SET_'
+
         def record_exist?(zone,change,change_name)
           return false if zone[:records][change[:type]].nil?
           current_records = zone[:records][change[:type]][change_name]
@@ -187,15 +216,15 @@ module Fog
                 if !record_exist?(zone, change, change_name)
                   # raise change.to_s if change[:resource_records].nil?
                   new_record =
-                  if change[:alias_target]
-                    record = {
-                      :alias_target => change[:alias_target]
-                    }
-                  else
-                    record = {
-                      :ttl => change[:ttl].to_s,
-                    }
-                  end
+                    if change[:alias_target]
+                      record = {
+                        :alias_target => change[:alias_target]
+                      }
+                    else
+                      record = {
+                        :ttl => change[:ttl].to_s,
+                      }
+                    end
 
                   new_record = {
                     :change_id        => change_id,
@@ -251,26 +280,6 @@ module Fog
           end
         end
       end
-
-      def self.hosted_zone_for_alias_target(dns_name)
-        Hash[elb_hosted_zone_mapping.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
     end
   end
 end