roadworker 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f694d04bb0eda4bc71551dd53e709123d8d7f81
-  data.tar.gz: 3970732f55fc1f556cd65f1393480bd996feac05
+  metadata.gz: af3665677e4511d16efbe94f88b4be369f6e5cde
+  data.tar.gz: b61a6cf8b695aa77a9334ccb3353077f860eb3fb
 SHA512:
-  metadata.gz: c4133a0c6f348ac2dc5fbeaaf0150f446400af9c5f68ca65b4731eaf56d2d0b290c2ee40267cf0bbd77343de16742da877becdfbb3a6f981534863e49445ff97
-  data.tar.gz: a2deb137b51610117ef0792a71d5e72ab97525f85d0a29c95f038cc2e89528b9839b700f0c84f6672048470f26896ca4c85ef72f3d9a8f930d5d44b1364fcd42
+  metadata.gz: 1a214364df43143a33b4977c2f79bd348b87ea9e1f5b9198f771304ba307d2d181c1bcf390059014e889d11f6bca17ea52c69c437fa32a139abd3d29c6128642
+  data.tar.gz: 87707077040830d1627d45611d2b3cad50a168ce094353ab1ec9354783581c3b387ec3330d11df44f74d049659212693e59dc7083c6941fa6197921346efa078

data/README.md

@@ -65,6 +65,10 @@ hosted_zone "info.winebarrel.jp." do
     dns_name "elb-dns-name.elb.amazonaws.com"
   end
 
+  rrset "yyy.info.winebarrel.jp.", "A" do
+    dns_name "elb-dns-name2.elb.amazonaws.com", :evaluate_target_health => true
+  end
+
   rrset "zzz.info.winebarrel.jp", "A" do
     set_identifier "Primary"
     failover "PRIMARY"

data/lib/roadworker/dsl-converter.rb

@@ -42,6 +42,16 @@ module Roadworker
               end
 
               "health_check #{hc_args}"
+            when :dns_name
+              if value.kind_of?(Array) and value.length > 1
+                dns_name_opts = value.pop
+                value = value.inspect.sub(/\A\[/, '').sub(/\]\Z/, '')
+                dns_name_opts = dns_name_opts.inspect.sub(/\A\{/, '').sub(/\}\Z/, '')
+                "#{key} #{value}, #{dns_name_opts}"
+              else
+                value = [value].flatten.inspect.sub(/\A\[/, '').sub(/\]\Z/, '')
+                "#{key} #{value}"
+              end
             else
               "#{key} #{value.inspect}"
             end

data/lib/roadworker/dsl-tester.rb

@@ -22,7 +22,6 @@ proc {
 }.call
 
 require 'net/dns'
-require 'roadworker/net-dns-ext'
 
 module Roadworker
   class DSL

data/lib/roadworker/dsl.rb

@@ -112,8 +112,9 @@ module Roadworker
           @result.region = value
         end
 
-        def dns_name(value)
-          @result.dns_name = value
+        def dns_name(value, options = {})
+          options = AWS::Route53.normalize_dns_name_options(options)
+          @result.dns_name = [value, options]
         end
 
         def failover(value)

data/lib/roadworker/route53-exporter.rb

@@ -64,6 +64,13 @@ module Roadworker
 
           if (alias_target = record_h.delete(:alias_target))
             record_h[:dns_name] = alias_target[:dns_name]
+
+            if alias_target[:evaluate_target_health]
+              record_h[:dns_name] = [
+                record_h[:dns_name],
+                {:evaluate_target_health => alias_target[:evaluate_target_health]}
+              ]
+            end
           end
         end
       end

data/lib/roadworker/route53-ext.rb

@@ -1,45 +1,6 @@
 require 'aws-sdk'
 
 module AWS
-  module Core
-    class Client
-
-      # PTF:
-      class << self
-        alias load_api_config_orig load_api_config
-
-        def load_api_config(api_version)
-          yaml = load_api_config_orig(api_version)
-
-          if service_name == 'Route53'
-            rewrite_api(yaml)
-          end
-
-          return yaml
-        end
-
-        private
-
-        def rewrite_api(value)
-          case value
-          when Array
-            value.each {|v| rewrite_api(v) }
-          when Hash
-            value.each do |k, v|
-              case k
-              when :health_check_config
-                v[:members][:ip_address][:required] = false
-              end
-
-              rewrite_api(v)
-            end
-          end
-        end
-      end # of class method
-
-    end # Client
-  end # Core
-
   class Route53
 
     # http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
@@ -59,13 +20,29 @@ module AWS
     CF_HOSTED_ZONE_ID = 'Z2FDTNDATAQYW2'
 
     class << self
-      def dns_name_to_alias_target(name, hosted_zone_id, hosted_zone_name)
+      def normalize_dns_name_options(src)
+        dst = {}
+
+        {
+          :evaluate_target_health => false,
+        }.each do |key, defalut_value|
+          dst[key] = src[key] || false
+        end
+
+        return dst
+      end
+
+      def dns_name_to_alias_target(name, options, hosted_zone_id, hosted_zone_name)
         hosted_zone_name = hosted_zone_name.sub(/\.\Z/, '')
         name = name.sub(/\.\Z/, '')
+        options ||= {}
 
         if name =~ /([^.]+)\.elb\.amazonaws.com\Z/i
           region = $1.downcase
-          elb_dns_name_to_alias_target(name, region)
+          alias_target = elb_dns_name_to_alias_target(name, region)
+
+          # XXX:
+          alias_target.merge(options)
         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)

data/lib/roadworker/route53-wrapper.rb

@@ -133,7 +133,8 @@ module Roadworker
             case attribute
             when :dns_name
               attribute = :alias_target
-              value = AWS::Route53.dns_name_to_alias_target(value, @hosted_zone.id, @hosted_zone.name || @options.hosted_zone_name)
+              dns_name, dns_name_opts = value
+              value = AWS::Route53.dns_name_to_alias_target(dns_name, dns_name_opts, @hosted_zone.id, @hosted_zone.name || @options.hosted_zone_name)
             when :health_check
               attribute = :health_check_id
               value = @options.health_checks.find_or_create(value)
@@ -173,8 +174,8 @@ module Roadworker
           elsif expected and actual
             case attribute
             when :dns_name
-              expected = expected.downcase.sub(/\.\Z/, '')
-              actual = actual.downcase.sub(/\.\Z/, '')
+              expected[0] = expected[0].downcase.sub(/\.\Z/, '')
+              actual[0] = actual[0].downcase.sub(/\.\Z/, '')
             end
 
             (expected == actual)
@@ -243,12 +244,23 @@ module Roadworker
       end
 
       def dns_name
-        (@resource_record_set.alias_target || {})[:dns_name]
+        alias_target = @resource_record_set.alias_target || {}
+        dns_name = alias_target[:dns_name]
+
+        if dns_name
+          [
+            dns_name,
+            AWS::Route53.normalize_dns_name_options(alias_target),
+          ]
+        else
+          nil
+        end
       end
 
-      def dns_name=(name)
-        if name
-          @resource_record_set.alias_target = AWS::Route53.dns_name_to_alias_target(name, @hosted_zone.id, @hosted_zone.name || @options.hosted_zone_name)
+      def dns_name=(value)
+        if value
+          dns_name, dns_name_opts = value
+          @resource_record_set.alias_target = AWS::Route53.dns_name_to_alias_target(dns_name, dns_name_opts, @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.4.4"
+  VERSION = "0.4.5"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-26 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.39.0
+        version: 1.41.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 1.41.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-dns
+  name: net-dns2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,6 @@ files:
 - lib/roadworker/dsl-tester.rb
 - lib/roadworker/dsl.rb
 - lib/roadworker/log.rb
-- lib/roadworker/net-dns-ext.rb
 - lib/roadworker/route53-exporter.rb
 - lib/roadworker/route53-ext.rb
 - lib/roadworker/route53-health-check.rb
@@ -185,3 +184,4 @@ signing_key:
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.
 test_files: []
+has_rdoc: 

data/lib/roadworker/net-dns-ext.rb

@@ -1,27 +0,0 @@
-require 'net/dns'
-require 'net/dns/rr'
-
-module Net
-  module DNS
-    module QueryTypes
-      SPF = 99
-    end # QueryTypes
-
-    class RR
-      class Types
-        TYPES['SPF'] = 99
-      end # Types
-
-      class SPF < TXT
-        def spf
-          txt
-        end
-
-        private
-        def set_type
-          @type = Net::DNS::RR::Types.new("SPF")
-        end
-      end # SPF
-    end # RR
-  end # DNS
-end # Net