roadworker 0.5.8 → 0.5.9.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4cb03b4b9dc0f8864788b033a1a5c732f7df6ec
-  data.tar.gz: 979f70b0266f221c5883f32d81f173b9e6decf22
+  metadata.gz: 2afcbd25c22d7b95ec5fdcb8e95e264440218938
+  data.tar.gz: 05c461631556e21c101c4e2a35eacc7116e84372
 SHA512:
-  metadata.gz: e48a2676f367cf503826c24549de719e0bca579f1c2c83f5da9a918e63d74d373100d1ef42fde693c26ecbf00c730d220d3174250bb60cd786deb10e84615f21
-  data.tar.gz: 39ccb859d6c36958c8ac2cbec01903c046969ae029307f07b4e8d9bf0315042f50e86bff7ff135fd93965734ca608e94b15d87a0f3f4c82c242f8f2436a85f93
+  metadata.gz: 56f9e98bf00daaea24502faea1648390794cef2d18fecc7f83c4229e66896698bab1f2c0d5c8563a26545e1ba6e82bc55ff70e0c8c2ab1803f4bfd2a61ce33eb
+  data.tar.gz: 1ad2394fe42cf8dac72bd551eb9e14f630b91629de84c0efcd6d078d364a4393e7f06180061ba76e94c71b3f505e596d8899bd8b87afd6f7ff9ee64a7a70bdad

data/README.md

@@ -24,6 +24,8 @@ It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 * `>= 0.5.7`
   * Fix for `dualstack` prefix
   * Use constant for CanonicalHostedZoneNameID
+* `>= 0.5.9`
+  * Support CloudWatch Metrics Health Check
 
 ## Installation
 
@@ -163,6 +165,21 @@ rrset "zzz.info.winebarrel.jp", "A" do
 end
 ```
 
+### Cloudwatch Metric Health Checks
+
+```ruby
+rrset "zzz.info.winebarrel.jp", "A" do
+  set_identifier "Secondary"
+  failover "SECONDARY"
+  health_check :cloudwatch_metric => {:region=>"ap-northeast-1", :name=>"MyCheck"}, :inverted => false, :insufficient_data_health_status => "LastKnownStatus"
+  ttl 456
+  resource_records(
+    "127.0.0.3",
+    "127.0.0.4"
+  )
+end
+```
+
 ### Dynamic private DNS example
 
 ```ruby

data/lib/roadworker/dsl-converter.rb

@@ -36,6 +36,8 @@ module Roadworker
 
               if config[:calculated]
                 hc_args = ":calculated => #{config[:calculated].inspect}"
+              elsif config[:cloudwatch_metric]
+                hc_args = ":cloudwatch_metric => #{config[:cloudwatch_metric].inspect}"
               else
                 hc_args = config[:url].sub(/\A(https?)_str_match:/) { $1 + ':' }.inspect
               end
@@ -49,6 +51,7 @@ module Roadworker
                 :measure_latency,
                 :inverted,
                 :enable_sni,
+                :insufficient_data_health_status,
               ].each do |key|
                 unless config[key].nil?
                   hc_args << ", :#{key} => #{config[key].inspect}"

data/lib/roadworker/dsl.rb

@@ -178,6 +178,12 @@ module Roadworker
               config[:type] = 'CALCULATED'
               config[:child_health_checks] = url.delete(:calculated)
               options = url
+            elsif url.include?(:cloudwatch_metric)
+              config = Aws::Route53::Types::HealthCheckConfig.new
+              config[:type] = 'CLOUDWATCH_METRIC'
+              config[:alarm_identifier] = url.delete(:cloudwatch_metric)
+              config[:child_health_checks] = [] 
+              options = url
             else
               raise ArgumentError, "wrong arguments: #{url.inspect}"
             end
@@ -196,6 +202,7 @@ module Roadworker
             :inverted          => :inverted,
             :enable_sni        => :enable_sni,
             :regions           => :regions,
+            :insufficient_data_health_status => :insufficient_data_health_status,
           }.each do |option_key, config_key|
             config[config_key] = options[option_key] unless options[option_key].nil?
           end
@@ -206,7 +213,13 @@ module Roadworker
             config.type += '_STR_MATCH'
           end
 
-          if config[:type] != 'CALCULATED'
+          case config[:type]
+          when 'CALCULATED'
+            # nothing to do
+          when 'CLOUDWATCH_METRIC'
+            config[:inverted] ||= false
+            config[:insufficient_data_health_status] ||= 'LastKnownStatus'
+          else
             config[:request_interval]  ||= 30
             config[:failure_threshold] ||= 3
             config[:measure_latency]   ||= false

data/lib/roadworker/route53-health-check.rb

@@ -13,8 +13,11 @@ module Roadworker
       def config_to_hash(config)
         type = config[:type].downcase
 
-        if type == 'calculated'
+        case type
+        when 'calculated'
           hash = {:calculated => config[:child_health_checks]}
+        when 'cloudwatch_metric'
+          hash = {:cloudwatch_metric => config[:alarm_identifier].to_h}
         else
           ipaddr = config[:ip_address]
           port   = config[:port]
@@ -45,6 +48,7 @@ module Roadworker
           :measure_latency,
           :inverted,
           :enable_sni,
+          :insufficient_data_health_status,
         ].each do |key|
           hash[key] = config[key] unless config[key].nil?
         end

data/lib/roadworker/route53-wrapper.rb

@@ -222,6 +222,10 @@ module Roadworker
             true
           elsif expected and actual
             case attribute
+            when :health_check
+              if actual[:alarm_identifier]
+                actual[:alarm_identifier] = actual[:alarm_identifier].to_h
+              end
             when :dns_name
               expected[0] = expected[0].downcase.sub(/\.\z/, '')
               actual[0] = actual[0].downcase.sub(/\.\z/, '')
@@ -264,11 +268,11 @@ module Roadworker
 
           # XXX: Fix for diff
           if attribute == :health_check and actual
-            if actual[:child_health_checks].empty?
+            if (actual[:child_health_checks] || []).empty?
               actual[:child_health_checks] = []
             end
 
-            if actual[:regions].empty?
+            if (actual[:regions] || []).empty?
               actual[:regions] = []
             end
           end

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.8"
+  VERSION = "0.5.9.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9.beta
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -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.5.2