roadworker 0.5.6 → 0.5.7.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9d533fd95da3d00de4f209a6642802942e8aac
-  data.tar.gz: 4f027ff0221fd36e076a8e27093be368c746ac47
+  metadata.gz: df2616478603cce9612784bdc6632dcde6ea329f
+  data.tar.gz: 21b8701ffcdc6c4bef2c23d7f0d2947d848e6918
 SHA512:
-  metadata.gz: 824f208791c633e945d2065f55b4fb51f671bff3d8747ce77ca19541d0a61249cc1f024d7c61e6bc0bc68c7a699b72d79b9ca084c57bae7d454af12529b31a13
-  data.tar.gz: f8783015a66ba36b62cb9469e8b0205cf38f017d155140a4156fa3eb883138409b228282dd1591dd97519d2eb7d86a41dbe3c10bf4b761abc3820ca830313417
+  metadata.gz: 82872d5bfcf4fffdc5689c427dcc89a313776ad997cafaba8ae094739ea8479d4409e3c41f4d1ef65cfd1e21fb69356df99f8b19f9cf1218d4ddf6880e7dc735
+  data.tar.gz: 31144baa12f2f5eb32a43cf04c6ab360119fa733bbf07b20c2509ba21a606164418bd9667052d2a473506a4203f359eea7311e090e330d69b60c912007adb47c

data/README.md

@@ -21,6 +21,9 @@ It defines the state of Route53 using DSL, and updates Route53 according to DSL.
   * Support Calculated Health Checks
   * Support New Health Check attributes
   * Add template feature
+* `>= 0.5.7`
+  * Fix for `dualstack` prefix
+  * Use constant for CanonicalHostedZoneNameID
 
 ## Installation
 

data/bin/roadwork

@@ -111,7 +111,8 @@ begin
       client.export do |exported, converter|
         exported[:hosted_zones].each do |zone|
           route_file_basename = zone[:name].sub(/\.\Z/, '')
-          route_file_basename << '.private' unless zone[:vpcs].empty?
+          route_file_basename << ".private" unless zone[:vpcs].empty?
+          route_file_basename << ".#{zone[:vpcs].first.vpc_id}" unless zone[:vpcs].empty?
           route_file_basename << '.route'
 
           route_file = File.join(File.dirname(output_file), route_file_basename)

data/lib/roadworker/route53-ext.rb

@@ -5,20 +5,50 @@ module Aws
 
     # 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.eu-central-1.amazonaws.com'   => 'z21DNDUVLTQW6Q',
-      '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',
+      's3-website-ap-northeast-1.amazonaws.com' => 'Z2M4EHUR26P7ZW',
+      's3-website.ap-northeast-2.amazonaws.com' => 'Z3W03O7B5YMIYP',
+      's3-website.ap-south-1.amazonaws.com'     => 'Z11RGJOFQNVJUP',
+      's3-website-ap-southeast-1.amazonaws.com' => 'Z3O0J2DXBE1FTB',
+      's3-website-ap-southeast-2.amazonaws.com' => 'Z1WCIGYICN2BYD',
+      's3-website.eu-central-1.amazonaws.com'   => 'Z21DNDUVLTQW6Q',
+      's3-website-eu-west-1.amazonaws.com'      => 'Z1BKCTXD74EZPE',
+      's3-website-sa-east-1.amazonaws.com'      => 'Z7KQH4QJS55SO',
+      's3-website-us-east-1.amazonaws.com'      => 'Z3AQBSTGFYJSTF',
+      's3-website-us-gov-west-1.amazonaws.com'  => 'Z31GFT0UA1I2HV',
+      's3-website-us-west-1.amazonaws.com'      => 'Z2F56UZL2M1ACD',
+      's3-website-us-west-2.amazonaws.com'      => 'Z3BJ6K6RIION7M',
     }
 
+    CANONICAL_HOSTED_ZONE_NAME_IDS = {
+      'ap-northeast-1' => 'Z2YN17T5R711GT',
+      #'ap-northeast-2' => '',
+      #'ap-south-1'     => '',
+      'ap-southeast-1' => 'Z1WI8VXHPB1R38',
+      'ap-southeast-2' => 'Z2999QAZ9SRTIC',
+      'eu-central-1'   => 'Z215JYRZR1TBD5',
+      'eu-west-1'      => 'Z3NF1Z3NOM5OY2',
+      'sa-east-1'      => 'Z2ES78Y61JGQKS',
+      'us-east-1'      => 'Z3DZXE0Q79N41H',
+      'us-west-1'      => 'Z1M58G0W56PQJA',
+      'us-west-2'      => 'Z33MTJ483KN6FU',
+    }
+
+    DUALSTACK_CANONICAL_HOSTED_ZONE_NAME_IDS = {
+      'ap-northeast-1' => 'Z14GRHDCWA56QT',
+      'ap-northeast-2' => 'ZWKZPGTI48KDX',
+      'ap-south-1'     => 'ZP97RAFLXTNZK',
+      'ap-southeast-1' => 'Z1LMS91P8CMLE5',
+      'ap-southeast-2' => 'Z1GM3OXH4ZPM65',
+      'eu-central-1'   => 'Z215JYRZR1TBD5',
+      'eu-west-1'      => 'Z32O12XQLNTSW2',
+      'sa-east-1'      => 'Z2P70J7HTTTPLU',
+      'us-east-1'      => 'Z35SXDOTRQ7X7K',
+      'us-west-1'      => 'Z368ELLRRE2KJ0',
+      'us-west-2'      => 'Z1H1FL5HABSF5',
+   }
+
     # http://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html
-    CF_HOSTED_zONE_ID = 'Z2FDTNDATAQYW2'
+    CF_HOSTED_ZONE_ID = 'Z2FDTNDATAQYW2'
 
     class << self
       def normalize_dns_name_options(src)
@@ -66,25 +96,21 @@ module Aws
             :evaluate_target_health => false, # XXX:
           }
         else
-          elb = Aws::ElasticLoadBalancing::Client.new(:region => region)
-
-          load_balancer = nil
-          elb.describe_load_balancers.each do |page|
-            page.load_balancer_descriptions.each do |lb|
-              if lb.dns_name == name
-                load_balancer = lb
-              end
-            end
-            break if load_balancer
+          hosted_zone_id = nil
+
+          if name =~ /\Adualstack\./i
+            hosted_zone_id = DUALSTACK_CANONICAL_HOSTED_ZONE_NAME_IDS[region]
+          else
+            hosted_zone_id = CANONICAL_HOSTED_ZONE_NAME_IDS[region]
           end
 
-          unless load_balancer
-            raise "Cannot find ELB: #{name}"
+          unless hosted_zone_id
+            raise "Cannot find CanonicalHostedZoneNameID for `#{name}`. Please pass :hosted_zone_id"
           end
 
           {
-            :hosted_zone_id         => load_balancer.canonical_hosted_zone_name_id,
-            :dns_name               => load_balancer.dns_name,
+            :hosted_zone_id         => hosted_zone_id,
+            :dns_name               => name,
             :evaluate_target_health => false, # XXX:
           }
         end
@@ -100,7 +126,7 @@ module Aws
 
       def cf_dns_name_to_alias_target(name)
         {
-          :hosted_zone_id         => CF_HOSTED_zONE_ID,
+          :hosted_zone_id         => CF_HOSTED_ZONE_ID,
           :dns_name               => name,
           :evaluate_target_health => false, # XXX:
         }

data/lib/roadworker/route53-wrapper.rb

@@ -225,6 +225,16 @@ module Roadworker
             when :dns_name
               expected[0] = expected[0].downcase.sub(/\.\z/, '')
               actual[0] = actual[0].downcase.sub(/\.\z/, '')
+
+              if actual[0] =~ /\Adualstack\./i
+                log(:warn, "`dualstack` prefix is used in the actual DNS name", :yellow) do
+                  log_id = [self.name, self.type].join(' ')
+                  rrset_setid = self.set_identifier
+                  rrset_setid ? (log_id + " (#{rrset_setid})") : log_id
+                end
+
+                actual[0].sub!(/\Adualstack\./i, '')
+              end
             end
 
             (expected == actual)

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.6"
+  VERSION = "0.5.7.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7.beta
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
@@ -247,9 +247,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1