roadworker 0.3.2 → 0.3.3

data/lib/roadworker/dsl-tester.rb

@@ -15,7 +15,7 @@ module Roadworker
     class Tester
       include Roadworker::Log
 
-      DEFAULT_NAMESERVERS = '8.8.8.8'
+      DEFAULT_NAMESERVERS = ['8.8.8.8', '8.8.4.4']
       ASTERISK_PREFIX = 'asterisk-of-wildcard'
 
       class << self
@@ -31,6 +31,7 @@ module Roadworker
 
       def test(dsl)
         records = fetch_records(dsl)
+        records_length = records.length
         failures = 0
         error_messages = []
         warning_messages = []
@@ -78,11 +79,40 @@ module Roadworker
 
             if record.dns_name
               # A(Alias)
-              is_same = response.answer.all? {|a|
-                query(a.value, 'PTR', warning_messages).answer.all? do |ptr|
-                  ptr.value =~ /\.compute\.amazonaws\.com\.\Z/
+              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/
+                  end
+                }
+              when /\As3-website-(?:[^.]+)\.amazonaws\.com\Z/
+                response_answer_ip_1_2 = response.answer.map {|a| a.value.split('.').slice(0, 2) }.uniq
+
+                # try 3 times
+                is_same = (0...3).any? do |n|
+                  unless n.zero?
+                    sleep 3
+                    log(:debug, 'Retry Check', :white, "#{name} #{type}")
+                  end
+
+                  dns_name_a = query(record.dns_name, 'A', warning_messages)
+                  s3_website_endpoint_ips = dns_name_a.answer.map {|i| i.value }
+
+                  !s3_website_endpoint_ips.empty? && s3_website_endpoint_ips.any? {|ip|
+                    response_answer_ip_1_2.include?(ip.split('.').slice(0, 2))
+                  }
                 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/
+                  end
+                }
+              else
+                warning_messages << "#{name} #{type}: Cannot check `#{record.dns_name}`"
+                is_same = true
+              end
             else
               is_same = (expected_value == actual_value)
             end
@@ -158,7 +188,7 @@ module Roadworker
           log(:warn, "WARNING #{msg}", :intense_yellow)
         end
 
-        [records.length, failures]
+        [records_length, failures]
       end
 
       private

data/lib/roadworker/route53-ext.rb

@@ -3,30 +3,86 @@ require 'aws-sdk'
 module AWS
   class Route53
 
-    def dns_name_to_alias_target(name)
-      name = name.sub(/\.\Z/, '')
+    # http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
+    S3_WEBSITE_ENDPOINTS = {
+      's3-website-us-east-1.amazonaws.com'      => 'Z3AQBSTGFYJSTF',
+      's3-website-us-west-2.amazonaws.com'      => 'Z3BJ6K6RIION7M',
+      's3-website-us-west-1.amazonaws.com'      => 'Z2F56UZL2M1ACD',
+      's3-website-eu-west-1.amazonaws.com'      => 'Z1BKCTXD74EZPE',
+      's3-website-ap-southeast-1.amazonaws.com' => 'Z3O0J2DXBE1FTB',
+      's3-website-ap-southeast-2.amazonaws.com' => 'Z1WCIGYICN2BYD',
+      's3-website-ap-northeast-1.amazonaws.com' => 'Z2M4EHUR26P7ZW',
+      's3-website-sa-east-1.amazonaws.com'      => 'Z7KQH4QJS55SO',
+      's3-website-us-gov-west-1.amazonaws.com'  => 'Z31GFT0UA1I2HV',
+    }
 
-      unless name =~ /([^.]+)\.elb\.amazonaws.com\Z/i
-        raise "Invalid DNS Name: #{name}"
+    # http://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html
+    CF_HOSTED_ZONE_ID = 'Z2FDTNDATAQYW2'
+
+    class << self
+      def dns_name_to_alias_target(name, hosted_zone_id, hosted_zone_name)
+        hosted_zone_name = hosted_zone_name.sub(/\.\Z/, '')
+        name = name.sub(/\.\Z/, '')
+
+        if name =~ /([^.]+)\.elb\.amazonaws.com\Z/i
+          region = $1.downcase
+          elb_dns_name_to_alias_target(name, region)
+        elsif (s3_hosted_zone_id = S3_WEBSITE_ENDPOINTS[name.downcase]) and name =~ /\As3-website-([^.]+)\.amazonaws\.com\Z/i
+          region = $1.downcase
+          s3_dns_name_to_alias_target(name, region, s3_hosted_zone_id)
+        elsif name =~ /\.cloudfront\.net\Z/i
+          cf_dns_name_to_alias_target(name)
+        elsif name =~ /\.#{Regexp.escape(hosted_zone_name)}\Z/i
+          this_hz_dns_name_to_alias_target(name, hosted_zone_id)
+        else
+          raise "Invalid DNS Name: #{name}"
+        end
       end
 
-      region = $1.downcase
-      elb = AWS::ELB.new(:region => region)
+      private
+
+      def elb_dns_name_to_alias_target(name, region)
+        elb = AWS::ELB.new(:region => region)
+
+        load_balancer = elb.load_balancers.find do |lb|
+          lb.dns_name == name
+        end
 
-      load_balancer = elb.load_balancers.find do |lb|
-        lb.dns_name == name
+        unless load_balancer
+          raise "Cannot find ELB: #{name}"
+        end
+
+        {
+          :hosted_zone_id         => load_balancer.canonical_hosted_zone_name_id,
+          :dns_name               => load_balancer.dns_name,
+          :evaluate_target_health => false, # XXX:
+        }
+      end
+
+      def s3_dns_name_to_alias_target(name, region, hosted_zone_id)
+        {
+          :hosted_zone_id         => hosted_zone_id,
+          :dns_name               => name,
+          :evaluate_target_health => false, # XXX:
+        }
       end
 
-      unless load_balancer
-        raise "Cannot find ELB: #{name}"
+      def cf_dns_name_to_alias_target(name)
+        {
+          :hosted_zone_id         => CF_HOSTED_ZONE_ID,
+          :dns_name               => name,
+          :evaluate_target_health => false, # XXX:
+        }
       end
 
-      {
-        :hosted_zone_id         => load_balancer.canonical_hosted_zone_name_id,
-        :dns_name               => load_balancer.dns_name,
-        :evaluate_target_health => false, # XXX:
-      }
-    end
+      def this_hz_dns_name_to_alias_target(name, hosted_zone_id)
+        {
+          :hosted_zone_id         => hosted_zone_id,
+          :dns_name               => name,
+          :evaluate_target_health => false, # XXX:
+        }
+      end
+    end # of class method
 
   end # Route53
 end # Roadworker

data/lib/roadworker/route53-wrapper.rb

@@ -131,7 +131,7 @@ module Roadworker
             case attr
             when :dns_name
               attr = :alias_target
-              value = @options.route53.dns_name_to_alias_target(value)
+              value = AWS::Route53.dns_name_to_alias_target(value, @hosted_zone.id, @hosted_zone.name || @options.hosted_zone_name)
             when :health_check
               attr = :health_check_id
               value = @options.health_checks.find_or_create(value)
@@ -242,7 +242,7 @@ module Roadworker
 
       def dns_name=(name)
         if name
-          @resource_record_set.alias_target = @options.route53.dns_name_to_alias_target(name)
+          @resource_record_set.alias_target = AWS::Route53.dns_name_to_alias_target(name, @hosted_zone.id, @hosted_zone.name || @options.hosted_zone_name)
         else
           @resource_record_set.alias_target = nil
         end

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk