roadworker 0.5.9.beta7 → 0.5.9.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 707ba9abafc59de743d86538de2a4566dfa325fd
-  data.tar.gz: a7485c93fdbafc8108efe91192e7f42e4d97820c
+SHA256:
+  metadata.gz: 8b3e4a8978dd100d8c27b1dca7fb25405eddfc9d72ad8ef6a9e794c591b6fed6
+  data.tar.gz: 702e28502b895284f95df074180c6960b99cb4c4ea84302d39bfbab460ff2db9
 SHA512:
-  metadata.gz: a618ae5c559428fb579c254db1257c2b022ad9ab2c4516be7d64eb3a59935c27cf28b190515d9caf7b1f6620fe2cd278fd0f279e49dc74219300f18047283533
-  data.tar.gz: e696932bff763107137582d4a7c0ad571ee584c7d61b21950158ed18b31aeb76e9e2fbad03af5b528ce0b80c33b7a7ffd14c10bf1b1711620003ebb83451f636
+  metadata.gz: e9b69f9f92d7dae71edc710e9645ce847241e349f6f0d6b426d62df8c3b801890187e9b6bf603285245d3cc2f744144725d8bc771faab05bce51f059afe5cd50
+  data.tar.gz: 233d99f686c86292ab92e9e7c8c6a277f53fcf99980e6144acd5244db33ef0515d1e1b837e487401836a6f0af3e2d89f3e80a389facbfe66f2eb118efbf3fcd7

data/lib/roadworker/dsl-tester.rb

@@ -22,7 +22,7 @@ proc {
   end
 }.call
 
-require 'net/dns'
+require 'dnsruby'
 
 module Roadworker
   class DSL
@@ -30,6 +30,7 @@ module Roadworker
       include Roadworker::Log
       include Roadworker::Utils::Helper
 
+      DEFAULT_CONFIG_FILE = '/etc/resolv.conf'
       DEFAULT_NAMESERVERS = ['8.8.8.8', '8.8.4.4']
       ASTERISK_PREFIX = 'asterisk-of-wildcard'
       RETRY = 3
@@ -87,11 +88,9 @@ module Roadworker
             actual_value = response.answer.map {|i|
               case type
               when 'TXT', 'SPF'
-                i.txt
-              when 'SRV'
-                [i.priority, i.weight, i.port, fix_srv_host(name, i.host)].join(' ')
+                i.data
               else
-                i.value
+                i.rdata_to_string
               end
             }.map {|i| i.strip }.sort
             actual_ttls = response.answer.map {|i| i.ttl }
@@ -118,11 +117,13 @@ module Roadworker
             log(:debug, "  #{logmsg_expected}\n  #{logmsg_actual}", :white)
 
             is_same = false
+            check_ttl = true
 
             if fetch_dns_name(record.dns_name)
               # A(Alias)
               case fetch_dns_name(record.dns_name).sub(/\.\z/, '')
               when /\.elb\.amazonaws\.com/i
+                check_ttl = false
                 is_same = response.answer.all? {|a|
                   response_query_ptr = query(a.value, 'PTR', error_messages)
 
@@ -135,6 +136,7 @@ module Roadworker
                   end
                 }
               when /\As3-website-(?:[^.]+)\.amazonaws\.com\z/
+                check_ttl = false
                 response_answer_ip_1_2 = response.answer.map {|a| a.value.split('.').slice(0, 2) }.uniq
 
                 # try 3 times
@@ -152,6 +154,7 @@ module Roadworker
                   }
                 end
               when /\.cloudfront\.net\z/
+                check_ttl = false
                 is_same = response.answer.all? {|a|
                   response_query_ptr = query(a.value, 'PTR', error_messages)
 
@@ -176,7 +179,7 @@ module Roadworker
               is_same = (expected_value == actual_value)
             end
 
-            if is_same
+            if is_same && check_ttl
               unless actual_ttls.all? {|i| i <= expected_ttl }
                 is_same = false
               end
@@ -225,7 +228,7 @@ module Roadworker
           response = query(name, type)
 
           if response
-            asterisk_answers[key] = response.answer.map {|i| (%w(TXT SPF).include?(type) ? i.txt : i.value).strip }
+            asterisk_answers[key] = response.answer.map {|i| (%w(TXT SPF).include?(type) ? i.data : i.rdata_to_string).strip }
           end
         end
 
@@ -269,16 +272,14 @@ module Roadworker
         resolver_opts = {}
         resolver_opts[:port] = @options.port if @options.port
 
-        if File.exist?(Net::DNS::Resolver::Defaults[:config_file])
-          resolver_opts[:nameservers] = @options.nameservers if @options.nameservers
-          Net::DNS::Resolver.new(resolver_opts)
-        else
-          Tempfile.open(File.basename(__FILE__)) do |f|
-            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
+        unless File.exist?(DEFAULT_CONFIG_FILE)
+          resolver_opts[:nameservers] = DEFAULT_NAMESERVERS
         end
+
+        resolver_opts[:nameservers] = @options.nameservers if @options.nameservers
+        resolver = Dnsruby::Resolver.new(resolver_opts)
+        resolver.do_caching = false
+        resolver
       end
 
       def fetch_records(dsl)
@@ -303,12 +304,11 @@ module Roadworker
       end
 
       def query(name, type, error_messages = nil)
-        ctype = Net::DNS.const_get(type)
         response = nil
 
         RETRY.times do |i|
           begin
-            response = @resolver.query(name, ctype)
+            response = @resolver.query(name, type)
             break
           rescue => e
             if (i + 1) < RETRY

data/lib/roadworker/route53-ext.rb

@@ -66,6 +66,26 @@ module Aws
       'us-west-2'      => 'Z38NKT9BP95V3O',
     }
 
+    # https://docs.aws.amazon.com/general/latest/gr/rande.html#apigateway_region
+    API_GATEWAY_HOSTED_ZONE_NAME_IDS = {
+      "us-east-2"       => "ZOJJZC49E0EPZ",
+      "us-east-1"       => "Z1UJRXOUMOOFQ8",
+      "us-west-1"       => "Z2MUQ32089INYE",
+      "us-west-2"       => "Z2OJLYMUO9EFXC",
+      "ap-south-1"      => "Z3VO1THU9YC4UR",
+      "ap-northeast-3"  => "Z2YQB5RD63NC85",
+      "ap-northeast-2"  => "Z20JF4UZKIW1U8",
+      "ap-southeast-1"  => "ZL327KTPIQFUL",
+      "ap-southeast-2"  => "Z2RPCDW04V8134",
+      "ap-northeast-1"  => "Z1YSHQZHG15GKL",
+      "ca-central-1"    => "Z19DQILCV0OWEC",
+      "eu-central-1"    => "Z1U9ULNL0V5AJ3",
+      "eu-west-1"       => "ZLY8HYME6SFDD",
+      "eu-west-2"       =>  "ZJ5UAJN8Y3Z2Q",
+      "eu-west-3"       =>  "Z3KY65QIEKYHQQ",
+      "sa-east-1"       =>  "ZCMLWB8V5SYIT"
+    }
+
     class << self
       def normalize_dns_name_options(src)
         dst = {}
@@ -100,6 +120,8 @@ module Aws
         elsif name =~ /\.([^.]+)\.elasticbeanstalk\.com\z/i
           region = $1.downcase
           eb_dns_name_to_alias_target(name, region)
+        elsif name =~ /(\A|\.)\.execute-api\.([^.]+)\.amazonaws\.com\z/i
+          apigw_dns_name_to_alias_target(name, hosted_zone_id, options)
         else
           raise "Invalid DNS Name: #{name}"
         end
@@ -143,6 +165,14 @@ module Aws
         }
       end
 
+      def apigw_dns_name_to_alias_target(name, region, hosted_zone_id)
+        {
+          :hosted_zone_id         => API_GATEWAY_HOSTED_ZONE_NAME_IDS[region],
+          :dns_name               => name,
+          :evaluate_target_health => false, # XXX:
+        }
+      end
+
       def cf_dns_name_to_alias_target(name)
         {
           :hosted_zone_id         => CF_HOSTED_ZONE_ID,

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.9.beta7"
+  VERSION = "0.5.9.beta9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.9.beta7
+  version: 0.5.9.beta9
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-route53
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-dns2
+  name: dnsruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.