roadworker 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 392920823680868099f04b0e50244f453fe1375f
-  data.tar.gz: 0e3b6d6c6caf791974c4587ce7047302c9f486d9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjIzOTY2MjJjYmYzODVjMDE0NzFkZTIyMzhiNjRlNzJlZjYwMjljNA==
+  data.tar.gz: !binary |-
+    NWNiMzA2Nzk5YmE4NTllY2ZlMDFiMWNjZTYxYjYxYmM4MGEzNTRkMQ==
 SHA512:
-  metadata.gz: 2e99dc04e6f92adaa562e4347025ec181c3c9ecde97fc4ede6e71bff7b83e251f663603d356ac4d23e40206dc056b7146e90be71f5db0559ab6bf48913862d13
-  data.tar.gz: 82bce88e812bc4e6bffcd6acd2fff92efa84b3b34345ba8e7a63a01d1bcd328528244064d0e8a70a2f5dc4586e60aac53f37625d1091f675f91876d275aa5330
+  metadata.gz: !binary |-
+    MmU4Y2U0MTYyYThhYzcwZDBiODFlMmYzZWFkOTY0YWExMTVlM2ViNWVlYjUy
+    OGMzYzc2YzNlN2E1NjJjNGIwM2FmM2UxOTBlYTI4YjA4OTNiY2RlZThjOTZi
+    ZmYwNDUyMjVhMDQyNDhhNGU0MDVhYmRjMTU4NmI0Yzk4MjQ5OGI=
+  data.tar.gz: !binary |-
+    ZGYxMzFkZGY5M2M0YjM5YWYyZWJlODc1YmU0MzNmODE3ZWRjOWQyODhkZDEw
+    ZGZiMmIyNTFmOWFhNjJhMzgxMjZiNWRhMDMzNmYyNmY4MWNmMzM3MDcyNmZj
+    MjE2ZDUyMTVhNTM0NTA3YzUzMjA2NzM5MzM3NjNmOTE5OTdhZjA=

data/bin/roadwork

@@ -30,20 +30,21 @@ ARGV.options do |opt|
     access_key = nil
     secret_key = nil
 
-    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key                   = v       }
-    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key                   = v       }
-    opt.on('-a', '--apply')                 {|v| mode                         = :apply  }
-    opt.on('-f', '--file FILE')             {|v| file                         = v       }
-    opt.on('',   '--dry-run')               {|v| options[:dry_run]            = true    }
-    opt.on(''  , '--force')                 {    options[:force]              = true    }
-    opt.on('',   '--no-health-check-gc')    {|v| options[:no_health_check_gc] = true    }
-    opt.on('-e', '--export')                {|v| mode                         = :export }
-    opt.on('-o', '--output FILE')           {|v| output_file                  = v       }
-    opt.on('',   '--split')                 {|v| split                        = true    }
-    opt.on('',   '--with-soa-ns')           {|v| options[:with_soa_ns]        = true    }
-    opt.on('-t', '--test')                  {|v| mode                         = :test   }
-    opt.on(''  , '--no-color')              {    options[:color]              = false   }
-    opt.on(''  , '--debug')                 {    options[:debug]              = true    }
+    opt.on('-k', '--access-key ACCESS_KEY')      {|v| access_key                   = v       }
+    opt.on('-s', '--secret-key SECRET_KEY')      {|v| secret_key                   = v       }
+    opt.on('-a', '--apply')                      {    mode                         = :apply  }
+    opt.on('-f', '--file FILE')                  {|v| file                         = v       }
+    opt.on('',   '--dry-run')                    {    options[:dry_run]            = true    }
+    opt.on(''  , '--force')                      {    options[:force]              = true    }
+    opt.on('',   '--no-health-check-gc')         {    options[:no_health_check_gc] = true    }
+    opt.on('-e', '--export')                     {    mode                         = :export }
+    opt.on('-o', '--output FILE')                {|v| output_file                  = v       }
+    opt.on('',   '--split')                      {    split                        = true    }
+    opt.on('',   '--with-soa-ns')                {    options[:with_soa_ns]        = true    }
+    opt.on('-t', '--test')                       {    mode                         = :test   }
+    opt.on(''  , '--nameservers SERVERS', Array) {|v| options[:nameservers]        = v       }
+    opt.on(''  , '--no-color')                   {    options[:color]              = false   }
+    opt.on(''  , '--debug')                      {    options[:debug]              = true    }
     opt.parse!
 
     if access_key and secret_key

data/lib/roadworker/dsl-tester.rb

@@ -31,6 +31,8 @@ module Roadworker
 
       DEFAULT_NAMESERVERS = ['8.8.8.8', '8.8.4.4']
       ASTERISK_PREFIX = 'asterisk-of-wildcard'
+      RETRY = 3
+      RETRY_WAIT = 1
 
       class << self
         def test(dsl, options)
@@ -49,6 +51,16 @@ module Roadworker
         failures = 0
         error_messages = []
         warning_messages = []
+        a_records = {}
+
+        records.each do |key, rrs|
+          name, type = key
+          next unless type == "A"
+
+          a_records[name] = rrs.map do |record|
+            [(record.resource_records || []).map {|i| i[:value].strip }.sort, record.ttl]
+          end
+        end
 
         validate_record = lambda do |key, rrs, asterisk_answers|
           errors = []
@@ -59,7 +71,7 @@ module Roadworker
 
           log(:debug, 'Check DNS', :white, "#{name} #{type}")
 
-          response = query(name, type, warning_messages)
+          response = query(name, type, error_messages)
 
           unless response
             failures += 1
@@ -87,7 +99,7 @@ module Roadworker
             actual_message = actual_value.zip(actual_ttls).map {|v, t| "#{v}(#{t})" }.join(',')
             logmsg_expected = "expected=#{expected_message}"
             logmsg_actual = "actual=#{actual_message}"
-            log(:debug, "  #{logmsg_expected}\n  #{logmsg_actual}", :white, "#{name} #{type}")
+            log(:debug, "  #{logmsg_expected}\n  #{logmsg_actual}", :white)
 
             is_same = false
 
@@ -96,8 +108,14 @@ module Roadworker
               case record.dns_name.sub(/\.\Z/, '')
               when /\.elb\.amazonaws\.com/i
                 is_same = response.answer.all? {|a|
-                  query(a.value, 'PTR', warning_messages).answer.all? do |ptr|
-                    ptr.value =~ /\.compute\.amazonaws\.com\.\Z/
+                  response_query_ptr = query(a.value, 'PTR', error_messages)
+
+                  if response_query_ptr
+                    response_query_ptr.answer.all? do |ptr|
+                      ptr.value =~ /\.compute\.amazonaws\.com\.\Z/
+                    end
+                  else
+                    false
                   end
                 }
               when /\As3-website-(?:[^.]+)\.amazonaws\.com\Z/
@@ -110,7 +128,7 @@ module Roadworker
                     log(:debug, 'Retry Check', :white, "#{name} #{type}")
                   end
 
-                  dns_name_a = query(record.dns_name, 'A', warning_messages)
+                  dns_name_a = query(record.dns_name, 'A', error_messages)
                   s3_website_endpoint_ips = dns_name_a.answer.map {|i| i.value }
 
                   !s3_website_endpoint_ips.empty? && s3_website_endpoint_ips.any? {|ip|
@@ -119,13 +137,24 @@ module Roadworker
                 end
               when /\.cloudfront\.net\Z/
                 is_same = response.answer.all? {|a|
-                  query(a.value, 'PTR', warning_messages).answer.all? do |ptr|
-                    ptr.value =~ /\.cloudfront\.net\.\Z/
+                  response_query_ptr = query(a.value, 'PTR', error_messages)
+
+                  if response_query_ptr
+                    response_query_ptr.answer.all? do |ptr|
+                      ptr.value =~ /\.cloudfront\.net\.\Z/
+                    end
                   end
                 }
               else
-                warning_messages << "#{name} #{type}: Cannot check `#{record.dns_name}`"
-                is_same = true
+                if (alias_target_a_record = a_records[record.dns_name])
+                  expected_message = alias_target_a_record.map {|values, ttl| values.map {|i| "#{i}(#{ttl})" }.join(',') }.uniq.join (' or ')
+                  logmsg_expected = "expected=#{expected_message}"
+                  expected_ttl = alias_target_a_record.map {|values, ttl| ttl }.max
+                  is_same = alias_target_a_record.any? {|values, ttl| values == actual_value }
+                else
+                  warning_messages << "#{name} #{type}: Cannot check `#{record.dns_name}`"
+                  is_same = true
+                end
               end
             else
               is_same = (expected_value == actual_value)
@@ -195,7 +224,7 @@ module Roadworker
         puts unless @options.debug
 
         error_messages.each do |msg|
-          log(:warn, msg, :intense_red)
+          log(:error, msg, :intense_red)
         end
 
         warning_messages.each do |msg|
@@ -209,12 +238,16 @@ module Roadworker
 
       def create_resolver
         log_file = @options.debug ? Net::DNS::Resolver::Defaults[:log_file] : '/dev/null'
+        resolver_opts = {:log_file => log_file}
 
         if File.exist?(Net::DNS::Resolver::Defaults[:config_file])
-          Net::DNS::Resolver.new(:log_file => log_file)
+          resolver_opts[:nameservers] = @options.nameservers if @options.nameservers
+          Net::DNS::Resolver.new(resolver_opts)
         else
           Tempfile.open(File.basename(__FILE__)) do |f|
-            Net::DNS::Resolver.new(:config_file => f.path, :nameservers => DEFAULT_NAMESERVERS, :log_file => log_file)
+            resolver_opts.updated(:config_file => f.path, :nameservers => DEFAULT_NAMESERVERS)
+            resolver_opts[:nameservers] = @options.nameservers if @options.nameservers
+            Net::DNS::Resolver.new(resolver_opts)
           end
         end
       end
@@ -238,14 +271,21 @@ module Roadworker
         name.gsub('*', "#{ASTERISK_PREFIX}-#{rand_str}")
       end
 
-      def query(name, type, warning_messages = nil)
+      def query(name, type, error_messages = nil)
         ctype = Net::DNS.const_get(type)
         response = nil
 
-        begin
-          response = @resolver.query(name, ctype)
-        rescue => e
-          warning_messages << "#{name} #{type}: #{e.message}" if warning_messages
+        RETRY.times do |i|
+          begin
+            response = @resolver.query(name, ctype)
+            break
+          rescue => e
+            if (i + 1) < RETRY
+              sleep RETRY_WAIT
+            else
+              error_messages << "#{name} #{type}: #{e.message}" if error_messages
+            end
+          end
         end
 
         return response

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.14.1
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.7
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -142,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.