roadworker 0.0.4 → 0.1.0

data/README.md

@@ -1,11 +1,14 @@
 # Roadworker
 
-**notice: still unstable**
-
 Roadworker is a tool to manage Route53.
 
 It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 
+**Notice**
+
+* HealthCheck is not supported.
+* Cannot update TTL of two or more same records (with different SetIdentifier) after creation.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/roadworker/client.rb

@@ -61,10 +61,6 @@ module Roadworker
       end
 
       actual.each do |keys, zone|
-        zone.rrsets.each do |record|
-          record.delete(:cascaded => true)
-        end
-
         zone.delete
       end
     end
@@ -98,7 +94,11 @@ module Roadworker
       hash = {}
 
       collection.each do |item|
-        key_list = keys.map {|k| item.send(k) }
+        key_list = keys.map do |k|
+          value = item.send(k)
+          (k == :name && value) ? value.downcase.gsub(/\.\Z/, '') : value
+        end
+
         hash[key_list] = item
       end
 

data/lib/roadworker/log.rb

@@ -3,7 +3,7 @@ module Roadworker
 
     def log(level, message, color, log_id = nil)
       log_id = yield if block_given?
-      message = "#{message}: #{log_id}"
+      message = "#{message}: #{log_id}" if log_id
       message << ' (dry-run)' if @options.dry_run
       @options.logger.send(level, message.send(color))
     end

data/lib/roadworker/route53-exporter.rb

@@ -38,6 +38,7 @@ module Roadworker
           ]
 
           record_h = item_to_hash(record, *attrs)
+          record_h[:name].gsub!("\\052", '*') if record_h[:name]
           rrsets << record_h
 
           rrs = record_h.delete(:resource_records)

data/lib/roadworker/route53-wrapper.rb

@@ -74,6 +74,10 @@ module Roadworker
         if @options.force
           log(:info, 'Delete HostedZone', :red, @hosted_zone.name)
 
+          self.rrsets.each do |record|
+            record.delete
+          end
+
           unless @options.dry_run
             @hosted_zone.delete
             @options.updated = true
@@ -156,9 +160,9 @@ module Roadworker
             true
           elsif expected and actual
             case attr
-            when :resource_records
-              expected = expected.sort_by {|i| i[:value] }
-              actual = actual.sort_by {|i| i[:value] }
+            when :dns_name
+              expected = expected.downcase.gsub(/\.\Z/, '')
+              actual = actual.downcase.gsub(/\.\Z/, '')
             end
 
             (expected == actual)
@@ -169,12 +173,14 @@ module Roadworker
       end
 
       def update(expected_record)
-        log(:info, 'Update ResourceRecordSet', :green) do
-          log_id = [@resource_record_set.name, @resource_record_set.type].join(' ')
-          rrset_setid = @resource_record_set.set_identifier
+        log_id_proc = proc do
+          log_id = [self.name, self.type].join(' ')
+          rrset_setid = self.set_identifier
           rrset_setid ? (log_id + " (#{rrset_setid})") : log_id
         end
 
+        log(:info, 'Update ResourceRecordSet', :green, &log_id_proc)
+
         Route53Wrapper::RRSET_ATTRS.each do |attr|
           expected = expected_record.send(attr)
           expected = nil if expected.kind_of?(Array) && expected.empty?
@@ -182,27 +188,11 @@ module Roadworker
           actual = nil if actual.kind_of?(Array) && actual.empty?
 
           if (expected and !actual) or (!expected and actual)
-            log(:info, "  set #{attr}=#{expected.inspect}" , :green) do
-              log_id = [@resource_record_set.name, @resource_record_set.type].join(' ')
-              rrset_setid = @resource_record_set.set_identifier
-              rrset_setid ? (log_id + " (#{rrset_setid})") : log_id
-            end
-
+            log(:info, "  set #{attr}=#{expected.inspect}" , :green, &log_id_proc)
             self.send(:"#{attr}=", expected) unless @options.dry_run
           elsif expected and actual
-            case attr
-            when :resource_records
-              expected = expected.sort_by {|i| i[:value] }
-              actual = actual.sort_by {|i| i[:value] }
-            end
-
             if expected != actual
-              log(:info, "  set #{attr}=#{expected.inspect}" , :green) do
-                log_id = [@resource_record_set.name, @resource_record_set.type].join(' ')
-                rrset_setid = @resource_record_set.set_identifier
-                rrset_setid ? (log_id + " (#{rrset_setid})") : log_id
-              end
-
+              log(:info, "  set #{attr}=#{expected.inspect}" , :green, &log_id_proc)
               self.send(:"#{attr}=", expected) unless @options.dry_run
             end
           end
@@ -214,14 +204,13 @@ module Roadworker
         end
       end
 
-      def delete(opts = {})
+      def delete
         return if type =~ /\A(SOA|NS)\Z/i
-        if not opts[:cascaded] or @options.force
-          log(:info, 'Delete ResourceRecordSet', :red) do
-            log_id = [@resource_record_set.name, @resource_record_set.type].join(' ')
-            rrset_setid = @resource_record_set.set_identifier
-            rrset_setid ? (log_id + " (#{rrset_setid})") : log_id
-          end
+
+        log(:info, 'Delete ResourceRecordSet', :red) do
+          log_id = [self.name, self.type].join(' ')
+          rrset_setid = self.set_identifier
+          rrset_setid ? (log_id + " (#{rrset_setid})") : log_id
         end
 
         unless @options.dry_run
@@ -230,6 +219,11 @@ module Roadworker
         end
       end
 
+      def name
+        value = @resource_record_set.name
+        value ? value.gsub("\\052", '*') : value
+      end
+
       def dns_name=(name)
         if name
           @resource_record_set.alias_target = @options.route53.dns_name_to_alias_target(name)

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: