Skip to content

Fix errors in Route53 provider #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amiryal wants to merge 3 commits into
base: revert-10-remove_r53
Choose a base branch
from
Open

Fix errors in Route53 provider #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8123ad7
Fix Ruby warnings in Route53 provider
amiryal Jun 13, 2017
3879737
Fix bugs in comparing Route53 resources against AWS responses
amiryal Jun 13, 2017
0f51d76
Improve debug/info messages in Route53 provider
amiryal Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions lib/puppet/provider/dns_record/route53.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ def route53
@@zone ||= Fog::DNS.new({ :provider => "aws",
:aws_access_key_id => @username,
:aws_secret_access_key => @password } )
end
end
end
end
end

Puppet::Type.type(:dns_record).provide(:route53) do
Expand All @@ -38,22 +38,26 @@ def route53

desc "Manage AWS Route 53 records."

mk_resource_methods

def create
@zone = route53.zones.get(resource[:zone_id])
@zone.records.all.each do |r|
if r.name == resource[:name]
Puppet.debug("Route53: Cannot modify records, must remove #{resource[:name]}.")
Puppet.debug("Comparing all records to #{resource[:name]} #{resource[:type]}")
@zone.records.all!.each do |r|
Puppet.debug("Existing record: #{r.name} #{r.type}")
if r.name.chomp('.') == resource[:name] && r.type == resource[:type]
Puppet.info("Route53: Cannot modify records, must remove #{resource[:name]}.")
r.destroy
end
end

begin
Puppet.debug("Attempting to create record type #{resource[:type]} for #{resource[:name]} as #{resource[:content]}")
record = @zone.records.create( :name => resource[:name],
@zone.records.create( :name => resource[:name],
:value => resource[:content],
:type => resource[:type],
:ttl => resource[:ttl] )
Puppet.info("Route53: Created #{resource[:type]} record for #{resource[:name]}.#{resource[:domain]}")
Puppet.info("Route53: Created #{resource[:type]} record for #{resource[:name]}")
rescue Excon::Errors::UnprocessableEntity
output = Nokogiri::XML( e.response.body ).xpath( "//xmlns:Message" ).text
Puppet.info("Route53: #{output}")
Expand All @@ -64,20 +68,22 @@ def exists?
@username, @password = resource[:username], resource[:password]
resource[:content] = resource[:content].is_a?(Array) ? resource[:content] : resource[:content].to_a
@zone = route53.zones.get(resource[:zone_id])
records = @zone.records.all
if records.detect { |r| r.name == resource[:name] and r.value == resource[:content] and r.ttl == resource[:ttl] }
records = @zone.records.all!
if records.detect { |r| r.name.chomp('.') == resource[:name] and r.value == resource[:content] and r.ttl == resource[:ttl].to_s }
Puppet.debug("Record #{resource[:name]} #{resource[:type]} with content #{resource[:content]} #{resource[:ttl]} found.")
return true
else
Puppet.debug("Record #{resource[:name]} #{resource[:type]} with content #{resource[:content]} #{resource[:ttl]} not found.")
return false
end
end

def destroy
@zone = route53.zones.get(resource[:zone_id])
@zone.records.all.each do |r|
if ( r.name == resource[:name] ) and ( r.type == resource[:type] )
@zone.records.all!.each do |r|
if ( r.name.chomp('.') == resource[:name] ) and ( r.type == resource[:type] )
Puppet.info("Route53: destroying #{resource[:type]} record for #{resource[:name]}")
r.destroy
Puppet.info("Route53: destroyed #{resource[:type]} record for #{resource[:name]}.#{resource[:domain]}")
end
end
end
Expand Down