roadworker 0.5.5 → 0.5.6.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020301db639766ed6efa723d241627914add396b
-  data.tar.gz: 8c8242e53aeb94c4f2f61ce182b673aaaaa7f094
+  metadata.gz: 40f0aef1281b27f381e6b60cda6e47ffa0e07026
+  data.tar.gz: 2ab08cb9125e4dd16107e6b55b8a084ddfc633fb
 SHA512:
-  metadata.gz: 456805190817cb751f87a3f8e8628ad8dc553c447bd68ef5fb7aaa0d1b7e7def8b0d188bba8dad2bd830cc6441335995d4b0ae6e917c7d196a5f54975fe3b06f
-  data.tar.gz: ea121962bf0a34c2b8b766e63441e375cb1aa1877cf6994863457613b6eb8ce4e511e3d747b972cf59788b061c02fc4d9bfd1ab3b728416cae29db8fd05a843f
+  metadata.gz: 13bdec92a634305574206353c211b92f9ea88d889820b6456cf21c3c22a8a1d1bb4f04795fd587eb9cae30d9a9363e878bd70fa3b44c2b4f1aa13d644eb4ba6d
+  data.tar.gz: abfd581e1f6335183053bd67a410f25dd41f17a67892cc780eae2ab5379341716c14907f3cfd7e3c87a26d72737e65af98daaf6331866e6cd9694916ad03333e

data/README.md

@@ -16,6 +16,10 @@ It defines the state of Route53 using DSL, and updates Route53 according to DSL.
   * **Disable Divided HostedZone**
   * **Use aws-sdk v2** [PR#20](https://github.com/winebarrel/roadworker/pull/20)
   * Support Cross Account ELB Alias [PR#21](https://github.com/winebarrel/roadworker/pull/21)
+* `>= 0.5.6`
+  * Disable HealthCheck GC (pass `--health-check-gc` option if enable)
+  * Support Calculated Health Checks
+  * Support New Health Check attributes
 
 ## Installation
 
@@ -54,7 +58,7 @@ Usage: roadwork [options]
     -f, --file FILE
         --dry-run
         --force
-        --no-health-check-gc
+        --health-check-gc
     -e, --export
     -o, --output FILE
         --split
@@ -140,6 +144,21 @@ hosted_zone "winebarrel.local." do
 end
 ```
 
+### Calculated Health Checks
+
+```ruby
+rrset "zzz.info.winebarrel.jp", "A" do
+  set_identifier "Secondary"
+  failover "SECONDARY"
+  health_check :calculated => ["07c03a45-5b69-4044-9ec3-016cd8e5f74b", "bba4d1ea-27c2-4d0c-a249-c857a3e46d88"], :health_threshold => 1, :inverted => false
+  ttl 456
+  resource_records(
+    "127.0.0.3",
+    "127.0.0.4"
+  )
+end
+```
+
 ### Dynamic private DNS example
 
 ```ruby

data/bin/roadwork

@@ -49,7 +49,7 @@ ARGV.options do |opt|
     opt.on('-f', '--file FILE')                  {|v| file                         = v             }
     opt.on('',   '--dry-run')                    {    options[:dry_run]            = true          }
     opt.on(''  , '--force')                      {    options[:force]              = true          }
-    opt.on('',   '--no-health-check-gc')         {    options[:no_health_check_gc] = true          }
+    opt.on('',   '--health-check-gc')            {    options[:health_check_gc]    = true          }
     opt.on('-e', '--export')                     {    mode                         = :export       }
     opt.on('-o', '--output FILE')                {|v| output_file                  = v             }
     opt.on('',   '--split')                      {    split                        = true          }
@@ -72,7 +72,7 @@ ARGV.options do |opt|
       credentials_opts[:profile_name] = profile_name if profile_name
       credentials_opts[:path] = credentials_path if credentials_path
       provider = Aws::SharedCredentials.new(credentials_opts)
-      aws_opts[:credential_provider] = provider
+      aws_opts[:credentials] = provider
     elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
       puts opt.help
       exit 1

data/lib/roadworker/client.rb

@@ -24,7 +24,7 @@ module Roadworker
         updated = @options.updated
       end
 
-      if updated and not @options.no_health_check_gc
+      if updated and @options.health_check_gc
         HealthCheck.gc(@options.route53, :logger => @options.logger)
       end
 

data/lib/roadworker/dsl-converter.rb

@@ -33,10 +33,23 @@ module Roadworker
               end
             when :health_check_id
               config = HealthCheck.config_to_hash(@health_checks[value])
-              hc_args = config[:url].sub(/\A(https?)_str_match:/) { $1 + ':' }.inspect
 
-              [:host, :search_string, :request_interval, :failure_threshold].each do |key|
-                if config[key]
+              if config[:calculated]
+                hc_args = ":calculated => #{config[:calculated].inspect}"
+              else
+                hc_args = config[:url].sub(/\A(https?)_str_match:/) { $1 + ':' }.inspect
+              end
+
+              [
+                :host,
+                :search_string,
+                :request_interval,
+                :health_threshold,
+                :failure_threshold,
+                :measure_latency,
+                :inverted,
+              ].each do |key|
+                unless config[key].nil?
                   hc_args << ", :#{key} => #{config[key].inspect}"
                 end
               end

data/lib/roadworker/dsl.rb

@@ -132,39 +132,47 @@ module Roadworker
           @result.failover = value
         end
 
-        def health_check(url, *options)
-          config = HealthCheck.parse_url(url)
-
-          if options.length == 1 and options.first.kind_of?(Hash)
-            options = options.first
-
-            {
-              :host              => :fully_qualified_domain_name,
-              :search_string     => :search_string,
-              :request_interval  => :request_interval,
-              :failure_threshold => :failure_threshold,
-            }.each do |option_key, config_key|
-              config[config_key] = options[option_key] if options[option_key]
+        def health_check(url, options = {})
+          unless options.kind_of?(Hash)
+            raise TypeError, "wrong argument type #{options.inspect} (expected Hash)"
+          end
+
+          if url.kind_of?(Hash)
+            if url.include?(:calculated)
+              config = Aws::Route53::Types::HealthCheckConfig.new
+              config[:type] = 'CALCULATED'
+              config[:child_health_checks] = url.delete(:calculated)
+              options = url
+            else
+              raise ArgumentError, "wrong arguments: #{url.inspect}"
             end
           else
-            options.each_with_index do |value, i|
-              key = [
-                :fully_qualified_domain_name,
-                :search_string,
-                :request_interval,
-                :failure_threshold,
-              ][i]
-
-              config[key] = value
-            end
+            config = HealthCheck.parse_url(url)
+            config[:child_health_checks] = []
+          end
+
+          {
+            :host              => :fully_qualified_domain_name,
+            :search_string     => :search_string,
+            :request_interval  => :request_interval,
+            :health_threshold  => :health_threshold,
+            :failure_threshold => :failure_threshold,
+            :measure_latency   => :measure_latency,
+            :inverted          => :inverted
+          }.each do |option_key, config_key|
+            config[config_key] = options[option_key] unless options[option_key].nil?
           end
 
           if config.search_string
             config.type += '_STR_MATCH'
           end
 
-          config.request_interval  ||= 30
-          config.failure_threshold ||= 3
+          if config[:type] != 'CALCULATED'
+            config[:request_interval]  ||= 30
+            config[:failure_threshold] ||= 3
+            config[:measure_latency]   ||= false
+            config[:inverted]          ||= false
+          end
 
           @result.health_check = config
         end

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

@@ -11,41 +11,56 @@ module Roadworker
       end
 
       def config_to_hash(config)
-        ipaddr = config[:ip_address]
-        port   = config[:port]
-        type   = config[:type].downcase
-        path   = config[:resource_path]
-        fqdn   = config[:fully_qualified_domain_name]
-        fqdn   = fqdn.downcase if fqdn
-        search_string     = config[:search_string]
-        request_interval  = config[:request_interval]
-        failure_threshold = config[:failure_threshold]
-
-        ulr = nil
-
-        if ipaddr
-          url = "#{type}://#{ipaddr}:#{port}"
+        type = config[:type].downcase
+
+        if type == 'calculated'
+          hash = {:calculated => config[:child_health_checks]}
         else
-          url = "#{type}://#{fqdn}:#{port}"
-          fqdn = nil
+          ipaddr = config[:ip_address]
+          port   = config[:port]
+          path   = config[:resource_path]
+          fqdn   = config[:fully_qualified_domain_name]
+          fqdn   = fqdn.downcase if fqdn
+
+          if ipaddr
+            url = "#{type}://#{ipaddr}:#{port}"
+          else
+            url = "#{type}://#{fqdn}:#{port}"
+            fqdn = nil
+          end
+
+          url << path if path && path != '/'
+
+          hash = {
+            :url  => url,
+            :host => fqdn,
+          }
         end
 
-        url << path if path && path != '/'
+        [
+          :search_string,
+          :request_interval,
+          :health_threshold,
+          :failure_threshold,
+          :measure_latency,
+          :inverted,
+        ].each do |key|
+          hash[key] = config[key] unless config[key].nil?
+        end
 
-        {
-          :url               => url,
-          :host              => fqdn,
-          :search_string     => search_string,
-          :request_interval  => request_interval,
-          :failure_threshold => failure_threshold,
-        }
+        hash
       end
 
       def parse_url(url)
         url = URI.parse(url)
+        type = url.scheme.upcase
         path = url.path
 
-        if path.nil? or path.empty? or path == '/'
+        if type =~ /\AHTTP/
+          if path.nil? or path.empty?
+            path = '/'
+          end
+        else
           path = nil
         end
 
@@ -53,7 +68,7 @@ module Roadworker
 
         {
           :port          => url.port,
-          :type          => url.scheme.upcase,
+          :type          => type,
           :resource_path => path,
         }.each {|key, value|
           config[key] = value if value
@@ -98,8 +113,12 @@ module Roadworker
           health_check_id, config = self.find {|hcid, elems| elems == attrs }
 
           unless health_check_id
+            if attrs[:child_health_checks] and attrs[:child_health_checks].empty?
+              attrs[:child_health_checks] = nil
+            end
+
             response = @route53.create_health_check({
-              :caller_reference    => UUID.new.generate,
+              :caller_reference    => "roadworker #{Roadworker::VERSION} #{UUID.new.generate}",
               :health_check_config => attrs,
             })
 
@@ -120,16 +139,22 @@ module Roadworker
       return if check_list.empty?
 
       if (logger = options[:logger])
-        logger.info('Clean HealthChecks (pass `--no-health-check-gc` if you do not want to clean)')
+        logger.info('Clean HealthChecks')
       end
 
       Collection.batch(@route53.list_hosted_zones, :hosted_zones) do |zone|
         Collection.batch(@route53.list_resource_record_sets(hosted_zone_id: zone.id), :resource_record_sets) do |record|
-          check_list.delete(record.health_check_id)
+          health_check = check_list.delete(record.health_check_id)
+
+          if health_check and health_check.type == 'CALCULATED'
+            health_check.child_health_checks.each do |child|
+              check_list.delete(child)
+            end
+          end
         end
       end
 
-      check_list.each do |health_check_id, config|
+      check_list.sort_by {|hc_id, hc| hc.type == 'CALCULATED' ? 0 : 1 }.each do |health_check_id, config|
         @route53.delete_health_check(:health_check_id  => health_check_id)
       end
     end

data/lib/roadworker/route53-wrapper.rb

@@ -59,8 +59,8 @@ module Roadworker
           zone = OpenStruct.new({:name => name, :rrsets => [], :vpcs => vpcs}.merge(opts))
         else
           params = {
-            name: name,
-            caller_reference: "CreateHostedZone by roadworker #{Roadworker::VERSION}, #{name}, #{Time.now.httpdate}",
+            :name => name,
+            :caller_reference => "roadworker #{Roadworker::VERSION} #{UUID.new.generate}",
           }
           if vpc
             params[:vpc] = vpc

data/lib/roadworker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6.beta
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.23
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/roadwork
+- lib/roadworker.rb
 - lib/roadworker/client.rb
 - lib/roadworker/collection.rb
 - lib/roadworker/dsl-converter.rb
@@ -214,9 +215,9 @@ files:
 - lib/roadworker/route53-wrapper.rb
 - lib/roadworker/string-ext.rb
 - lib/roadworker/struct-ext.rb
+- lib/roadworker/template_helper.rb
 - lib/roadworker/utils.rb
 - lib/roadworker/version.rb
-- lib/roadworker.rb
 homepage: http://roadworker.codenize.tools/
 licenses:
 - MIT
@@ -232,12 +233,12 @@ 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.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.