roadworker 0.2.5 → 0.3.0

data/README.md

@@ -6,7 +6,6 @@ It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 
 **Notice**
 
-* HealthCheck is not supported.
 * Cannot update TTL of two or more same records (with different SetIdentifier) after creation.
 
 ## Installation
@@ -61,6 +60,28 @@ hosted_zone "info.winebarrel.jp." do
   rrset "xxx.info.winebarrel.jp.", "A" do
     dns_name "elb-dns-name.elb.amazonaws.com"
   end
+
+  rrset "zzz.info.winebarrel.jp", "A" do
+    set_identifier "Primary"
+    failover "PRIMARY"
+    health_check "http://192.0.43.10:80/path", "example.com"
+    ttl 456
+    resource_records(
+      "127.0.0.1",
+      "127.0.0.2"
+    )
+  end
+
+  rrset "zzz.info.winebarrel.jp", "A" do
+    set_identifier "Secondary"
+    failover "SECONDARY"
+    health_check "tcp://192.0.43.10:3306"
+    ttl 456
+    resource_records(
+      "127.0.0.3",
+      "127.0.0.4"
+    )
+  end
 end
 ```
 

data/bin/roadwork

@@ -29,19 +29,20 @@ ARGV.options do |opt|
   access_key = nil
   secret_key = nil
 
-  opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key            = v       }
-  opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key            = v       }
-  opt.on('-a', '--apply')                 {|v| mode                  = :apply  }
-  opt.on('-f', '--file FILE')             {|v| file                  = v       }
-  opt.on('',   '--dry-run')               {|v| options[:dry_run]     = true    }
-  opt.on(''  , '--force')                 {    options[:force]       = true    }
-  opt.on('-e', '--export')                {|v| mode                  = :export }
-  opt.on('-o', '--output FILE')           {|v| output_file           = v       }
-  opt.on('',   '--split')                 {|v| split                 = true    }
-  opt.on('',   '--with-soa-ns')           {|v| options[:with_soa_ns] = true    }
-  opt.on('-t', '--test')                  {|v| mode                  = :test   }
-  opt.on(''  , '--no-color')              {    options[:color]       = false   }
-  opt.on(''  , '--debug')                 {    options[:debug]       = true    }
+  opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key                   = v       }
+  opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key                   = v       }
+  opt.on('-a', '--apply')                 {|v| mode                         = :apply  }
+  opt.on('-f', '--file FILE')             {|v| file                         = v       }
+  opt.on('',   '--dry-run')               {|v| options[:dry_run]            = true    }
+  opt.on(''  , '--force')                 {    options[:force]              = true    }
+  opt.on('',   '--no-health-check-gc')    {|v| options[:no_health_check_gc] = true    }
+  opt.on('-e', '--export')                {|v| mode                         = :export }
+  opt.on('-o', '--output FILE')           {|v| output_file                  = v       }
+  opt.on('',   '--split')                 {|v| split                        = true    }
+  opt.on('',   '--with-soa-ns')           {|v| options[:with_soa_ns]        = true    }
+  opt.on('-t', '--test')                  {|v| mode                         = :test   }
+  opt.on(''  , '--no-color')              {    options[:color]              = false   }
+  opt.on(''  , '--debug')                 {    options[:debug]              = true    }
   opt.parse!
 
   if access_key and secret_key
@@ -76,13 +77,19 @@ begin
       output_file = 'Routefile' if output_file == '-'
       requires = []
 
-      client.export do |hosted_zones, converter|
-        hosted_zones.each do |zone|
+      client.export do |exported, converter|
+        exported[:hosted_zones].each do |zone|
           route_file = File.join(File.dirname(output_file), "#{zone[:name].sub(/\.\Z/, '')}.route")
           requires << route_file
 
           logger.info("  write `#{route_file}`")
-          open(route_file, 'wb') {|f| f.puts converter.call([zone]) }
+
+          open(route_file, 'wb') do |f|
+            f.puts converter.call({
+              :hosted_zones => [zone],
+              :health_checks => exported[:health_checks],
+            })
+          end
         end
       end
 

data/lib/roadworker/client.rb

@@ -15,6 +15,8 @@ module Roadworker
       @options.logger ||= Logger.new($stdout)
       String.colorize = @options.color
       @options.route53 = AWS::Route53.new
+      @health_checks = HealthCheck.health_checks(@options.route53, :extended => true)
+      @options.health_checks = @health_checks
       @route53 = Route53Wrapper.new(@options)
     end
 
@@ -31,6 +33,10 @@ module Roadworker
         }
       end
 
+      if updated and not @options.no_health_check_gc
+        HealthCheck.gc(@options.route53, :logger => @options.logger)
+      end
+
       return updated
     end
 

data/lib/roadworker/dsl-converter.rb

@@ -3,24 +3,40 @@ module Roadworker
     class Converter
 
       class << self
-        def convert(hosted_zones)
-          hosted_zones.map {|i| output_zone(i) }.join("\n")
+        def convert(exported)
+          self.new(exported).convert
         end
+      end # of class method
+
+      def initialize(exported)
+        @health_checks = exported[:health_checks]
+        @hosted_zones = exported[:hosted_zones]
+      end
 
-        private
+      def convert
+        @hosted_zones.map {|i| output_zone(i) }.join("\n")
+      end
+
+      private
 
         def output_rrset(recrod)
           name = recrod.delete(:name).inspect
           type = recrod.delete(:type).inspect
 
           attrs = recrod.map {|key, value|
-            if value.kind_of?(Array)
+            case key
+            when :resource_records
               if value.empty?
                 nil
               else
                 value = value.map {|i| i.inspect }.join(",\n      ")
                 "#{key}(\n      #{value}\n    )"
               end
+            when :health_check_id
+              config = HealthCheck.config_to_hash(@health_checks[value])
+              hc_args = config[:url].inspect
+              hc_args << ", #{config[:host_name].inspect}" if config[:host_name]
+              "health_check #{hc_args}"
             else
               "#{key} #{value.inspect}"
             end
@@ -43,7 +59,6 @@ hosted_zone #{name} do
 end
           EOS
         end
-      end # of class method
 
     end # Converter
   end # DSL

data/lib/roadworker/dsl.rb

@@ -1,7 +1,9 @@
 require 'roadworker/dsl-converter'
 require 'roadworker/dsl-tester'
+require 'roadworker/route53-health-check'
 
 require 'ostruct'
+require 'uri'
 
 module Roadworker
   class DSL
@@ -111,6 +113,16 @@ module Roadworker
           @result.dns_name = value
         end
 
+        def failover(value)
+          @result.failover = value
+        end
+
+        def health_check(url, host_name = nil)
+          config = HealthCheck.parse_url(url)
+          config[:fully_qualified_domain_name] = host_name if host_name
+          @result.health_check = config
+        end
+
         def resource_records(*values)
           if values.uniq.length != values.length
             raise "Duplicate ResourceRecords: #{values.join(', ')}"

data/lib/roadworker/route53-exporter.rb

@@ -1,4 +1,5 @@
 require 'roadworker/collection'
+require 'roadworker/route53-health-check'
 
 require 'ostruct'
 
@@ -16,11 +17,22 @@ module Roadworker
     end
 
     def export
-      result = []
+      result = {
+        :health_checks => HealthCheck.health_checks(@options.route53),
+      }
 
+      hosted_zones = result[:hosted_zones] = []
+      export_hosted_zones(hosted_zones)
+
+      return result
+    end
+
+    private
+
+    def export_hosted_zones(hosted_zones)
       Collection.batch(@options.route53.hosted_zones) do |zone|
         zone_h = item_to_hash(zone, :name)
-        result << zone_h
+        hosted_zones << zone_h
 
         rrsets = []
         zone_h[:rrsets] = rrsets
@@ -39,6 +51,8 @@ module Roadworker
             :resource_records,
             :alias_target,
             :region,
+            :failover,
+            :health_check_id,
           ]
 
           record_h = item_to_hash(record, *attrs)
@@ -53,12 +67,8 @@ module Roadworker
           end
         end
       end
-
-      return result
     end
 
-    private
-
     def item_to_hash(item, *attrs)
       h = {}
 

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

@@ -0,0 +1,120 @@
+require 'uri'
+require 'uuid'
+
+module Roadworker
+  class HealthCheck
+
+    class << self
+      def health_checks(route53, options = {})
+        self.new(route53).health_checks(options)
+      end
+
+      def gc(route53, options = {})
+        self.new(route53).gc(options)
+      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].downcase
+
+        url = "#{type}://#{ipaddr}:#{port}"
+        url << path if path && path != '/'
+
+        {:url => url, :host_name => fqdn}
+      end
+
+      def parse_url(url)
+        url = URI.parse(url)
+        path = url.path
+
+        if path.nil? or path.empty? or path == '/'
+          path = nil
+        end
+
+        config = {}
+
+        {
+          :ip_address    => url.host,
+          :port          => url.port,
+          :type          => url.scheme.upcase,
+          :resource_path => path,
+        }.each {|key, value|
+          config[key] = value if value
+        }
+
+        return config
+      end
+    end # of class method
+
+    def initialize(route53)
+      @route53 = route53
+    end
+
+    def health_checks(options = {})
+      check_list = {}
+
+      is_truncated = true
+      next_marker = nil
+
+      while is_truncated
+        opts = next_marker ? {:marker => next_marker} : {}
+        response = @route53.client.list_health_checks(opts)
+
+        response[:health_checks].each do |check|
+          check_list[check[:id]] = check[:health_check_config]
+        end
+
+        is_truncated = response[:is_truncated]
+        next_marker = response[:next_marker]
+      end
+
+      if options[:extended]
+        check_list.instance_variable_set(:@route53, @route53)
+
+        def check_list.find_or_create(attrs)
+          health_check_id, config = self.find {|hcid, elems| elems == attrs }
+
+          unless health_check_id
+            response = @route53.client.create_health_check({
+              :caller_reference    => UUID.new.generate,
+              :health_check_config => attrs,
+            })
+
+            health_check_id = response[:health_check][:id]
+            config = response[:health_check][:health_check_config]
+            self[health_check_id] = config
+          end
+
+          return health_check_id
+        end
+      end
+
+      return check_list
+    end
+
+    def gc(options = {})
+      AWS.memoize {
+        check_list = health_checks
+        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)')
+        end
+
+        @route53.hosted_zones.each do |zone|
+          zone.rrsets.each do |record|
+            check_list.delete(record.health_check_id)
+          end
+        end
+
+        check_list.each do |health_check_id, config|
+          @route53.client.delete_health_check(:health_check_id  => health_check_id)
+        end
+      }
+    end
+
+  end # HealthCheck
+end # Roadworker

data/lib/roadworker/route53-wrapper.rb

@@ -14,7 +14,9 @@ module Roadworker
       :ttl,
       :resource_records,
       :dns_name,
-      :region
+      :region,
+      :failover,
+      :health_check,
     ]
 
     def initialize(options)
@@ -130,6 +132,9 @@ module Roadworker
             when :dns_name
               attr = :alias_target
               value = @options.route53.dns_name_to_alias_target(value)
+            when :health_check
+              attr = :health_check_id
+              value = @options.health_checks.find_or_create(value)
             end
 
             opts[attr] = value
@@ -231,6 +236,10 @@ module Roadworker
         value ? value.gsub("\\052", '*') : value
       end
 
+      def dns_name
+        (@resource_record_set.alias_target || {})[:dns_name]
+      end
+
       def dns_name=(name)
         if name
           @resource_record_set.alias_target = @options.route53.dns_name_to_alias_target(name)
@@ -239,8 +248,13 @@ module Roadworker
         end
       end
 
-      def dns_name
-        (@resource_record_set.alias_target || {})[:dns_name]
+      def health_check
+        @options.health_checks[@resource_record_set.health_check_id]
+      end
+
+      def health_check=(check)
+        health_check_id = check ? @options.health_checks.find_or_create(check) : nil
+        @resource_record_set.health_check_id = health_check_id
       end
 
       private

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +141,7 @@ files:
 - lib/roadworker/log.rb
 - lib/roadworker/route53-exporter.rb
 - lib/roadworker/route53-ext.rb
+- lib/roadworker/route53-health-check.rb
 - lib/roadworker/route53-wrapper.rb
 - lib/roadworker/string-ext.rb
 - lib/roadworker/version.rb