roadworker 0.4.12 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18cf85508a90ec02fdea7a76237f02b57f9f84f0
-  data.tar.gz: 4b06aef141392019fd49424b5c4c21f5810d9003
+  metadata.gz: dc7cfa6e280e4ea6a6c8681638c62f850bd060cb
+  data.tar.gz: 1759745736aaa13e12da2bfd7f3ca2dba5ed8b3e
 SHA512:
-  metadata.gz: fb46ab01d4138372ea93f08a5797aa2f8e4ff60d9e5c9e9d8ada4fa7c917a70e89e987ee2a244c87b47e1cbef00c2cb450777c90d567386e1516a39e0763def7
-  data.tar.gz: 0f9ca876a42b2961401646d6abfd42da0de5c9b6d2dc4672306e1b27274468383a66cc0e60d42817a7d3cab418355389d14f9cc078911bfa4ed26dcce0871994
+  metadata.gz: 4690314969ec784a429bdb766894977e27a889daea3222e992897a19c699af1f150683459590457293f27b359ef936190063a83ce1fde7226e17b2bde01fffd5
+  data.tar.gz: 3281f25cf906fdcbb76db28d4af50202b2ec715d4f42ad3b28977fa8ff6ec78cee45a6d6e04ad2d90bf2a60b3d9d0576260e2a692a5762d13661d7a75e93e883

data/README.md

@@ -58,6 +58,7 @@ Usage: roadwork [options]
     -t, --test
         --nameservers SERVERS
         --port PORT
+        --target-zone REGEXP
         --no-color
         --debug
 ```
@@ -118,6 +119,20 @@ hosted_zone "info.winebarrel.jp." do
     )
   end
 end
+
+# Private HostedZone
+hosted_zone "winebarrel.local." do
+  vpc "us-east-1", "vpc-xxxxxxxx"
+  vpc "us-east-2", "vpc-xxxxxxxx"
+
+  rrset "winebarrel.local.", "A" do
+    ttl 300
+    resource_records(
+      "10.0.0.1",
+      "10.0.0.2"
+    )
+  end
+end
 ```
 
 ## Test

data/bin/roadwork

@@ -5,6 +5,8 @@ require 'roadworker'
 require 'optparse'
 require 'logger'
 
+Version = Roadworker::VERSION
+
 mode = nil
 file = 'Routefile'
 output_file = '-'
@@ -32,24 +34,25 @@ ARGV.options do |opt|
     profile_name = nil
     credentials_path = nil
 
-    opt.on('-p', '--profile PROFILE_NAME')       {|v| profile_name                 = v       }
-    opt.on(''  , '--credentials-path PATH')      {|v| credentials_path             = v       }
-    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')                      {    mode                         = :apply  }
-    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('-e', '--export')                     {    mode                         = :export }
-    opt.on('-o', '--output FILE')                {|v| output_file                  = v       }
-    opt.on('',   '--split')                      {    split                        = true    }
-    opt.on('',   '--with-soa-ns')                {    options[:with_soa_ns]        = true    }
-    opt.on('-t', '--test')                       {    mode                         = :test   }
-    opt.on(''  , '--nameservers SERVERS', Array) {|v| options[:nameservers]        = v       }
-    opt.on(''  , '--port PORT', Integer)         {|v| options[:port]               = v       }
-    opt.on(''  , '--no-color')                   {    options[:color]              = false   }
-    opt.on(''  , '--debug')                      {    options[:debug]              = true    }
+    opt.on('-p', '--profile PROFILE_NAME')       {|v| profile_name                 = v             }
+    opt.on(''  , '--credentials-path PATH')      {|v| credentials_path             = v             }
+    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')                      {    mode                         = :apply        }
+    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('-e', '--export')                     {    mode                         = :export       }
+    opt.on('-o', '--output FILE')                {|v| output_file                  = v             }
+    opt.on('',   '--split')                      {    split                        = true          }
+    opt.on('',   '--with-soa-ns')                {    options[:with_soa_ns]        = true          }
+    opt.on('-t', '--test')                       {    mode                         = :test         }
+    opt.on(''  , '--nameservers SERVERS', Array) {|v| options[:nameservers]        = v             }
+    opt.on(''  , '--port PORT', Integer)         {|v| options[:port]               = v             }
+    opt.on(''  , '--target-zone REGEXP')         {|v| options[:target_zone]        = Regexp.new(v) }
+    opt.on(''  , '--no-color')                   {    options[:color]              = false         }
+    opt.on(''  , '--debug')                      {    options[:debug]              = true          }
     opt.parse!
 
     aws_opts = {}

data/lib/roadworker/client.rb

@@ -77,15 +77,50 @@ module Roadworker
 
       expected.each do |keys, expected_zone|
         name = keys[0]
-        actual_zone = actual.delete(keys) || @route53.hosted_zones.create(name)
+
+        if @options.target_zone
+          next unless name =~ @options.target_zone
+        end
+
+        actual_zone = actual.delete(keys) || @route53.hosted_zones.create(name, :vpc => expected_zone.vpcs.first)
+        walk_vpcs(expected_zone, actual_zone)
         walk_rrsets(expected_zone, actual_zone)
       end
 
       actual.each do |keys, zone|
+        name = keys[0]
+
+        if @options.target_zone
+          next unless name =~ @options.target_zone
+        end
+
         zone.delete
       end
     end
 
+    def walk_vpcs(expected_zone, actual_zone)
+      expected_vpcs = expected_zone.vpcs || []
+      actual_vpcs = actual_zone.vpcs || []
+
+      if not expected_vpcs.empty? and actual_vpcs.empty?
+        log(:warn, "Cannot associate VPC to public zone", :yellow, expected_zone.name)
+      else
+        (expected_vpcs - actual_vpcs).each do |vpc|
+          actual_zone.associate_vpc(vpc)
+        end
+
+        unexpected_vpcs = actual_vpcs - expected_vpcs
+
+        if unexpected_vpcs.length.nonzero? and actual_vpcs.length - unexpected_vpcs.length < 1
+          log(:warn, "Private zone requires one or more of VPCs", :yellow, expected_zone.name)
+        else
+          unexpected_vpcs.each do |vpc|
+            actual_zone.disassociate_vpc(vpc)
+          end
+        end
+      end
+    end
+
     def walk_rrsets(expected_zone, actual_zone)
       expected = collection_to_hash(expected_zone.rrsets, :name, :type, :set_identifier)
       actual   = collection_to_hash(actual_zone.rrsets, :name, :type, :set_identifier)

data/lib/roadworker/dsl-converter.rb

@@ -69,14 +69,27 @@ module Roadworker
         def output_zone(zone)
           name = zone[:name].inspect
           rrsets = zone[:rrsets]
+          vpcs = output_vpcs(zone[:vpcs])
+          vpcs = "  #{vpcs}\n\n" if vpcs
 
           return(<<-EOS)
 hosted_zone #{name} do
-#{rrsets.map {|i| output_rrset(i) }.join("\n").chomp}
+#{vpcs
+}#{rrsets.map {|i| output_rrset(i) }.join("\n").chomp}
 end
           EOS
         end
 
+        def output_vpcs(vpcs)
+          return nil if (vpcs || []).empty?
+
+          vpcs.map {|vpc|
+            region = vpc[:vpc_region]
+            vpc_id = vpc[:vpc_id]
+            "vpc #{region.inspect}, #{vpc_id.inspect}"
+          }.join("\n  ")
+        end
+
     end # Converter
   end # DSL
 end # Roadworker

data/lib/roadworker/dsl.rb

@@ -38,9 +38,9 @@ module Roadworker
       routefile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@path), file))
 
       if File.exist?(routefile)
-        instance_eval(File.read(routefile))
+        instance_eval(File.read(routefile), routefile)
       elsif File.exist?(routefile + '.rb')
-        instance_eval(File.read(routefile + '.rb'))
+        instance_eval(File.read(routefile + '.rb'), routefile + '.rb')
       else
         Kernel.require(file)
       end
@@ -63,6 +63,7 @@ module Roadworker
 
         @result = OpenStruct.new({
           :name => name,
+          :vpcs => [],
           :resource_record_sets => rrsets,
           :rrsets => rrsets,
         })
@@ -72,6 +73,24 @@ module Roadworker
 
       private
 
+      def vpc(vpc_region, vpc_id)
+        unless vpc_region
+          raise "Invalid VPC Region: #{vpc_region.inspect}"
+        end
+
+        unless vpc_id
+          raise "Invalid VPC ID: #{vpc_id}"
+        end
+
+        vpc_h = {:vpc_region => vpc_region.to_s, :vpc_id => vpc_id.to_s}
+
+        if @result.vpcs.include?(vpc_h)
+          raise "VPC is already defined: #{vpc_h.inspect}"
+        end
+
+        @result.vpcs << vpc_h
+      end
+
       def resource_record_set(rrset_name, type, &block)
         if rrset_name.sub(/\.\Z/, '') !~ /#{Regexp.escape(@name.sub(/\.\Z/, ''))}\Z/i
           raise "Invalid ResourceRecordSet Name: #{rrset_name}"

data/lib/roadworker/route53-exporter.rb

@@ -31,7 +31,12 @@ module Roadworker
 
     def export_hosted_zones(hosted_zones)
       Collection.batch(@options.route53.hosted_zones) do |zone|
-        zone_h = item_to_hash(zone, :name)
+        zone_h = item_to_hash(zone, :name, :vpcs)
+
+        if @options.target_zone
+          next unless zone_h[:name] =~ @options.target_zone
+        end
+
         hosted_zones << zone_h
 
         rrsets = []

data/lib/roadworker/route53-ext.rb

@@ -1,6 +1,43 @@
-require 'aws-sdk'
+require 'aws-sdk-v1'
 
 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(yaml)
+          # XXX: Fix aws-sdk 1.5.8 bug
+          get_hosted_zone = yaml[:operations].find {|h| h[:name] == 'GetHostedZone' }
+          vpcs = get_hosted_zone[:outputs][:children]['VPCs']
+
+          if vpcs
+            vpc = vpcs[:children]['VPC']
+
+            if vpc[:rename] == :vp_cs
+              vpc[:rename] = :vpcs
+            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
@@ -9,6 +46,7 @@ module AWS
       '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',

data/lib/roadworker/route53-wrapper.rb

@@ -44,33 +44,46 @@ module Roadworker
 
       def each
         Collection.batch(@hosted_zones) do |zone|
-          yield(HostedZoneWrapper.new(zone, @options))
+          yield(HostedZoneWrapper.new(zone, zone.vpcs, @options))
         end
       end
 
       def create(name, opts = {})
-        log(:info, 'Create HostedZone', :cyan, name)
+        if vpc = opts[:vpc]
+          vpcs = [vpc]
+        else
+          vpcs = []
+          opts.delete(:vpc)
+        end
+
+        logmsg = 'Create HostedZone'
+        logmsg << " #{vpc.inspect}"
+        log(:info, logmsg, :cyan, name)
 
         if @options.dry_run
-          zone = OpenStruct.new({:name => name, :rrsets => []}.merge(opts))
+          opts.delete(:vpc)
+          zone = OpenStruct.new({:name => name, :rrsets => [], :vpcs => vpcs}.merge(opts))
         else
           zone = @hosted_zones.create(name, opts)
           @options.hosted_zone_name = name
           @options.updated = true
         end
 
-        HostedZoneWrapper.new(zone, @options)
+        HostedZoneWrapper.new(zone, vpcs, @options)
       end
     end # HostedZoneCollection
 
     class HostedZoneWrapper
       include Roadworker::Log
 
-      def initialize(hosted_zone, options)
+      def initialize(hosted_zone, vpcs, options)
         @hosted_zone = hosted_zone
+        @vpcs = vpcs
         @options = options
       end
 
+      attr_reader :vpcs
+
       def resource_record_sets
         ResourceRecordSetCollectionWrapper.new(@hosted_zone.rrsets, @hosted_zone, @options)
       end
@@ -93,6 +106,33 @@ module Roadworker
         end
       end
 
+      def delete
+        if @options.force
+          log(:info, 'Delete HostedZone', :red, @hosted_zone.name)
+
+          self.rrsets.each do |record|
+            record.delete
+          end
+
+          unless @options.dry_run
+            @hosted_zone.delete
+            @options.updated = true
+          end
+        else
+          log(:info, 'Undefined HostedZone (pass `--force` if you want to remove)', :yellow, @hosted_zone.name)
+        end
+      end
+
+      def associate_vpc(vpc)
+        log(:info, "Associate #{vpc.inspect}", :green, @hosted_zone.name)
+        @hosted_zone.associate_vpc(vpc) unless @options.dry_run
+      end
+
+      def disassociate_vpc(vpc)
+        log(:info, "Disassociate #{vpc.inspect}", :red, @hosted_zone.name)
+        @hosted_zone.disassociate_vpc(vpc) unless @options.dry_run
+      end
+
       private
 
       def method_missing(method_name, *args)

data/lib/roadworker/version.rb

@@ -1,5 +1,3 @@
 module Roadworker
-  VERSION = "0.4.12"
+  VERSION = "0.5.0"
 end
-
-Version = Roadworker::VERSION

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.5.0
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.55.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.58.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.55.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -146,16 +140,16 @@ dependencies:
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +174,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/roadwork
-- lib/roadworker.rb
 - lib/roadworker/client.rb
 - lib/roadworker/collection.rb
 - lib/roadworker/dsl-converter.rb
@@ -193,6 +186,7 @@ files:
 - lib/roadworker/route53-wrapper.rb
 - lib/roadworker/string-ext.rb
 - lib/roadworker/version.rb
+- lib/roadworker.rb
 homepage: https://github.com/winebarrel/roadworker
 licenses:
 - MIT
@@ -213,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.