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

Merge pull request #870 from mgk/aws-dns-records-nil-options

Browse source 
[aws|dns] fix get, all, and all!
This commit is contained in:
Edward Muller 2012-04-22 12:35:09 -07:00
commit 38d3c33cd8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/fog/aws/models/dns/records.rb
View file

@ -23,9 +23,10 @@ module Fog
def all(options = {}) def all(options = {})
requires :zone requires :zone
options[:max_items] ||= max_items options[:max_items] ||= max_items
options[:name] ||= name options[:name] ||= zone.domain
options[:type] ||= type options[:type] ||= type
options[:identifier] ||= identifier options[:identifier] ||= identifier
options.delete_if {|key, value| value.nil?}
data = connection.list_resource_record_sets(zone.id, options).body data = connection.list_resource_record_sets(zone.id, options).body
# NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks. # NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks.
@ -49,6 +50,8 @@ module Fog
:type => next_record_type, :type => next_record_type,
:identifier => next_record_identifier :identifier => next_record_identifier
} }
options.delete_if {|key, value| value.nil?}
batch = connection.list_resource_record_sets(zone.id, options).body batch = connection.list_resource_record_sets(zone.id, options).body
# NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks. # NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks.
batch['NextRecordIdentifier'] = nil unless batch.has_key?('NextRecordIdentifier') batch['NextRecordIdentifier'] = nil unless batch.has_key?('NextRecordIdentifier')
@ -82,6 +85,7 @@ module Fog
:type => record_type, :type => record_type,
:identifier => record_identifier :identifier => record_identifier
} }
options.delete_if {|key, value| value.nil?}
data = connection.list_resource_record_sets(zone.id, options).body data = connection.list_resource_record_sets(zone.id, options).body
# Get first record # Get first record