kotovalexarian-likes-github/fog--fog-aws
1
0
Fork 0
mirror of https://github.com/fog/fog-aws.git synced 2022-11-09 13:50:52 -05:00
Code Releases Activity

change_resource_record_sets_data needs the version

Browse source
This commit is contained in:
Decklin Foster 2015-07-08 14:30:16 -04:00
parent 1e8a499733
commit b4dc8b069a
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/fog/aws/requests/dns/change_resource_record_sets.rb
View file

@ -61,7 +61,7 @@ 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, options)
body = change_resource_record_sets_data(zone_id, change_batch, @version, options)
request({
:body => body,
:idempotent => true,
@ -74,7 +74,7 @@ module Fog
end
# Returns the xml request for a given changeset
def self.change_resource_record_sets_data(zone_id, change_batch, options = {})
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/', '')
@ -153,7 +153,7 @@ module Fog
changes += '</Changes></ChangeBatch>'
end
body = %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/">#{changes}</ChangeResourceRecordSetsRequest>}
%Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{version}/">#{changes}</ChangeResourceRecordSetsRequest>}
end
class Mock

5
tests/requests/dns/change_resource_record_sets_tests.rb
View file

@ -7,6 +7,7 @@ Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
zone_id == Fog::DNS::AWS.elb_hosted_zone_mapping['eu-west-1']
end
end
tests("#change_resource_record_sets_data formats geolocation properly") do
change_batch = [{
:action=>"CREATE",
@ -18,9 +19,11 @@ Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
:geo_location=>{"CountryCode"=>"US", "SubdivisionCode"=>"AR"},
}]
result = Fog::DNS::AWS.change_resource_record_sets_data('zone_id123', change_batch)
version = '2013-04-01'
result = Fog::DNS::AWS.change_resource_record_sets_data('zone_id123', change_batch, version)
doc = Nokogiri::XML(result)
returns("https://route53.amazonaws.com/doc/#{version}/") { doc.namespaces['xmlns'] }
returns(%w[US AR]) {
[
doc.css("GeoLocation CountryCode").text,