roadworker 0.5.5.beta4 → 0.5.5.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ae46855e297151d9ed6a2e5d95617fa0920c95
-  data.tar.gz: 46a820e11fca1c95ec17d2f0ef8ee6a0d6da37a5
+  metadata.gz: 292c907fb987acc0bbb3062ff2ebcb35142e7cf9
+  data.tar.gz: 2e45b43a43831f14fa42f6e127e7b6d98251d4ed
 SHA512:
-  metadata.gz: af8d10091014839e629a46bfc68ff85bfa5c35e876bb24e34008afac3aebdad1e1446a023558ea6fd554546db1f6c55ab93dc17c4b6c5fbfbb3ca2e12dfae997
-  data.tar.gz: a061d697dbc513e7be2c3b5c218e4a9e122b0c7382a96b4bfb8a44c8925aa6fa1d819665a586896191d0ee6d39a700e619f9567adcf1e1804a2472236db44adb
+  metadata.gz: b76aefef72d4d62356ba3bd6ea52f1eba5545b97bb765d9899e6d7aa81c3f900ff45153bb061672e81584525811683aae2740e0c4a34ff8ceab4e414080a7d19
+  data.tar.gz: 6e82becf01cc502f8d1ff35fbeb0b96ba8b59b1bcff1bcadea45376e8d639c794a839a9be89460c0f1ab3af59d306fb6e2aa44b553e73e5ee06532887dc09210

data/README.md

@@ -4,9 +4,9 @@ Roadworker is a tool to manage Route53.
 
 It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 
-[![Gem Version](https://badge.fury.io/rb/roadworker.png)](http://badge.fury.io/rb/roadworker)
+[![Gem Version](https://badge.fury.io/rb/roadworker.svg)](http://badge.fury.io/rb/roadworker)
 [![Build Status](https://travis-ci.org/winebarrel/roadworker.svg?branch=master)](https://travis-ci.org/winebarrel/roadworker)
-[![Coverage Status](https://coveralls.io/repos/winebarrel/roadworker/badge.png?branch=master)](https://coveralls.io/r/winebarrel/roadworker?branch=master)
+[![Coverage Status](https://coveralls.io/repos/winebarrel/roadworker/badge.svg?branch=master&service=github)](https://coveralls.io/github/winebarrel/roadworker?branch=master)
 
 **Notice**
 
@@ -14,6 +14,7 @@ It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 * `>= 0.4.3` compare resource records ignoring the order.
 * `>= 0.5.5`
   * **Disable Divided HostedZone**
+  * **Use aws-sdk v2** [PR#20](https://github.com/winebarrel/roadworker/pull/20)
 
 ## Installation
 

data/bin/roadwork

@@ -71,13 +71,13 @@ ARGV.options do |opt|
       credentials_opts = {}
       credentials_opts[:profile_name] = profile_name if profile_name
       credentials_opts[:path] = credentials_path if credentials_path
-      provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(credentials_opts)
+      provider = Aws::SharedCredentials.new(credentials_opts)
       aws_opts[:credential_provider] = provider
     elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
       puts opt.help
       exit 1
     end
-    AWS.config(aws_opts)
+    Aws.config.update(aws_opts)
   rescue => e
     $stderr.puts e
     exit 1
@@ -85,7 +85,7 @@ ARGV.options do |opt|
 end
 
 if options[:debug]
-  AWS.config(
+  Aws.config.update(
     :http_wire_trace => true,
     :logger => options[:logger]
   )

data/lib/roadworker/client.rb

@@ -7,7 +7,7 @@ module Roadworker
       @options = OpenStruct.new(options)
       @options.logger ||= Logger.new($stdout)
       String.colorize = @options.color
-      @options.route53 = AWS::Route53.new
+      @options.route53 = Aws::Route53::Client.new
       @health_checks = HealthCheck.health_checks(@options.route53, :extended => true)
       @options.health_checks = @health_checks
       @route53 = Route53Wrapper.new(@options)
@@ -20,10 +20,8 @@ module Roadworker
       if dsl.hosted_zones.empty? and not @options.force
         log(:warn, "Nothing is defined (pass `--force` if you want to remove)", :yellow)
       else
-        AWS.memoize {
-          walk_hosted_zones(dsl)
-          updated = @options.updated
-        }
+        walk_hosted_zones(dsl)
+        updated = @options.updated
       end
 
       if updated and not @options.no_health_check_gc
@@ -34,7 +32,7 @@ module Roadworker
     end
 
     def export
-      exported = AWS.memoize { @route53.export }
+      exported = @route53.export
 
       if block_given?
         yield(exported, DSL.method(:convert))

data/lib/roadworker/collection.rb

@@ -2,15 +2,9 @@ module Roadworker
   class Collection
 
     class << self
-      def batch(collection)
-        if collection.respond_to?(:each_batch)
-          collection.each_batch do |batch|
-            batch.each do |item|
-              yield(item)
-            end
-          end
-        else
-          collection.each do |item|
+      def batch(pageable_response, collection_name)
+        pageable_response.each do |response|
+          response.public_send(collection_name).each do |item|
             yield(item)
           end
         end

data/lib/roadworker/dsl.rb

@@ -70,7 +70,7 @@ module Roadworker
           raise "Invalid VPC ID: #{vpc_id}"
         end
 
-        vpc_h = {:vpc_region => vpc_region.to_s, :vpc_id => vpc_id.to_s}
+        vpc_h = Aws::Route53::Types::VPC.new(: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}"
@@ -120,7 +120,7 @@ module Roadworker
         end
 
         def dns_name(value, options = {})
-          options = AWS::Route53.normalize_dns_name_options(options)
+          options = Aws::Route53.normalize_dns_name_options(options)
           @result.dns_name = [value, options]
         end
 
@@ -159,12 +159,12 @@ module Roadworker
             end
           end
 
-          if config[:search_string]
-            config[:type] += '_STR_MATCH'
+          if config.search_string
+            config.type += '_STR_MATCH'
           end
 
-          config[:request_interval]  ||= 30
-          config[:failure_threshold] ||= 3
+          config.request_interval  ||= 30
+          config.failure_threshold ||= 3
 
           @result.health_check = config
         end
@@ -174,7 +174,7 @@ module Roadworker
             raise "Duplicate ResourceRecords: #{values.join(', ')}"
           end
 
-          @result.resource_records = [values].flatten.map {|i| {:value => i} }
+          @result.resource_records = [values].flatten.map {|i| Aws::Route53::Types::ResourceRecord.new(:value => i) }
         end
 
       end # ResourceRecordSet

data/lib/roadworker/route53-exporter.rb

@@ -26,15 +26,16 @@ module Roadworker
     private
 
     def export_hosted_zones(hosted_zones)
-      Collection.batch(@options.route53.hosted_zones) do |zone|
-        zone_h = item_to_hash(zone, :name, :vpcs)
+      Collection.batch(@options.route53.list_hosted_zones, :hosted_zones) do |zone|
         next unless matched_zone?(zone.name)
+        resp = @options.route53.get_hosted_zone(id: zone.id)
+        zone_h = { name: zone.name, vpcs: resp.vp_cs }
         hosted_zones << zone_h
 
         rrsets = []
         zone_h[:rrsets] = rrsets
 
-        Collection.batch(zone.rrsets) do |record|
+        Collection.batch(@options.route53.list_resource_record_sets(hosted_zone_id: zone.id), :resource_record_sets) do |record|
           if record.name == zone.name and %w(SOA NS).include?(record.type) and not @options.with_soa_ns
             next
           end
@@ -78,7 +79,7 @@ module Roadworker
       h = {}
 
       attrs.each do |attribute|
-        value = item.send(attribute)
+        value = item.public_send(attribute)
         h[attribute] = value if value
       end
 

data/lib/roadworker/route53-ext.rb

@@ -1,7 +1,7 @@
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
-module AWS
-  class Route53
+module Aws
+  module Route53
 
     # http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
     S3_WEBSITE_ENDPOINTS = {
@@ -59,10 +59,16 @@ module AWS
       private
 
       def elb_dns_name_to_alias_target(name, region)
-        elb = AWS::ELB.new(:region => region)
-
-        load_balancer = elb.load_balancers.find do |lb|
-          lb.dns_name == name
+        elb = Aws::ElasticLoadBalancing::Client.new(:region => region)
+
+        load_balancer = nil
+        elb.describe_load_balancers.each do |page|
+          page.load_balancer_descriptions.each do |lb|
+            if lb.dns_name == name
+              load_balancer = lb
+            end
+          end
+          break if load_balancer
         end
 
         unless load_balancer

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

@@ -49,7 +49,7 @@ module Roadworker
           path = nil
         end
 
-        config = {}
+        config = Aws::Route53::Types::HealthCheckConfig.new
 
         {
           :port          => url.port,
@@ -60,9 +60,9 @@ module Roadworker
         }
 
         if url.host =~ /\A\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\Z/
-          config[:ip_address] = url.host
+          config.ip_address = url.host
         else
-          config[:fully_qualified_domain_name] = url.host
+          config.fully_qualified_domain_name = url.host
         end
 
         return config
@@ -81,7 +81,7 @@ module Roadworker
 
       while is_truncated
         opts = next_marker ? {:marker => next_marker} : {}
-        response = @route53.client.list_health_checks(opts)
+        response = @route53.list_health_checks(opts)
 
         response[:health_checks].each do |check|
           check_list[check[:id]] = check[:health_check_config]
@@ -98,7 +98,7 @@ module Roadworker
           health_check_id, config = self.find {|hcid, elems| elems == attrs }
 
           unless health_check_id
-            response = @route53.client.create_health_check({
+            response = @route53.create_health_check({
               :caller_reference    => UUID.new.generate,
               :health_check_config => attrs,
             })
@@ -116,24 +116,22 @@ module Roadworker
     end
 
     def gc(options = {})
-      AWS.memoize {
-        check_list = health_checks
-        return if check_list.empty?
+      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
+      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
+      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)
         end
+      end
 
-        check_list.each do |health_check_id, config|
-          @route53.client.delete_health_check(:health_check_id  => health_check_id)
-        end
-      }
+      check_list.each do |health_check_id, config|
+        @route53.delete_health_check(:health_check_id  => health_check_id)
+      end
     end
 
   end # HealthCheck

data/lib/roadworker/route53-wrapper.rb

@@ -24,20 +24,21 @@ module Roadworker
     end
 
     def hosted_zones
-      HostedZoneCollectionWrapper.new(@options.route53.hosted_zones, @options)
+      HostedZoneCollectionWrapper.new(@options.route53.list_hosted_zones, @options)
     end
 
     class HostedZoneCollectionWrapper
       include Roadworker::Log
 
-      def initialize(hosted_zones, options)
-        @hosted_zones = hosted_zones
+      def initialize(hosted_zones_response, options)
+        @hosted_zones_response = hosted_zones_response
         @options = options
       end
 
       def each
-        Collection.batch(@hosted_zones) do |zone|
-          yield(HostedZoneWrapper.new(zone, zone.vpcs, @options))
+        Collection.batch(@hosted_zones_response, :hosted_zones) do |zone|
+          resp = @options.route53.get_hosted_zone(id: zone.id)
+          yield(HostedZoneWrapper.new(resp.hosted_zone, resp.vp_cs, @options))
         end
       end
 
@@ -57,7 +58,14 @@ module Roadworker
           opts.delete(:vpc)
           zone = OpenStruct.new({:name => name, :rrsets => [], :vpcs => vpcs}.merge(opts))
         else
-          zone = @hosted_zones.create(name, opts)
+          params = {
+            name: name,
+            caller_reference: "CreateHostedZone by roadworker #{Roadworker::VERSION}, #{name}, #{Time.now.httpdate}",
+          }
+          if vpc
+            params[:vpc] = vpc
+          end
+          zone = @options.route53.create_hosted_zone(params).hosted_zone
           @options.hosted_zone_name = name
           @options.updated = true
         end
@@ -78,7 +86,7 @@ module Roadworker
       attr_reader :vpcs
 
       def resource_record_sets
-        ResourceRecordSetCollectionWrapper.new(@hosted_zone.rrsets, @hosted_zone, @options)
+        ResourceRecordSetCollectionWrapper.new(@hosted_zone, @options)
       end
       alias rrsets resource_record_sets
 
@@ -91,24 +99,7 @@ module Roadworker
           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 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.route53.delete_hosted_zone(id: @hosted_zone.id)
             @options.updated = true
           end
         else
@@ -118,12 +109,22 @@ module Roadworker
 
       def associate_vpc(vpc)
         log(:info, "Associate #{vpc.inspect}", :green, @hosted_zone.name)
-        @hosted_zone.associate_vpc(vpc) unless @options.dry_run
+        unless @options.dry_run
+          @options.route53.associate_vpc_with_hosted_zone(
+            hosted_zone_id: @hosted_zone.id,
+            vpc: vpc,
+          )
+        end
       end
 
       def disassociate_vpc(vpc)
         log(:info, "Disassociate #{vpc.inspect}", :red, @hosted_zone.name)
-        @hosted_zone.disassociate_vpc(vpc) unless @options.dry_run
+        unless @options.dry_run
+          @options.route53.disassociate_vpc_from_hosted_zone(
+            hosted_zone_id: @hosted_zone.id,
+            vpc: vpc,
+          )
+        end
       end
 
       private
@@ -136,15 +137,16 @@ module Roadworker
     class ResourceRecordSetCollectionWrapper
       include Roadworker::Log
 
-      def initialize(resource_record_sets, hosted_zone, options)
-        @resource_record_sets = resource_record_sets
+      def initialize(hosted_zone, options)
         @hosted_zone = hosted_zone
         @options = options
       end
 
       def each
-        Collection.batch(@resource_record_sets) do |record|
-          yield(ResourceRecordSetWrapper.new(record, @hosted_zone, @options))
+        if @hosted_zone.id
+          Collection.batch(@options.route53.list_resource_record_sets(hosted_zone_id: @hosted_zone.id), :resource_record_sets) do |record|
+            yield(ResourceRecordSetWrapper.new(record, @hosted_zone, @options))
+          end
         end
       end
 
@@ -158,7 +160,10 @@ module Roadworker
         if @options.dry_run
           record = expected_record
         else
-          opts = {}
+          resource_record_set_params = {
+            name: name,
+            type: type,
+          }
 
           Route53Wrapper::RRSET_ATTRS.each do |attribute|
             value = expected_record.send(attribute)
@@ -168,20 +173,30 @@ module Roadworker
             when :dns_name
               attribute = :alias_target
               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)
+              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)
             end
 
-            opts[attribute] = value
+            resource_record_set_params[attribute] = value
           end
 
-          record = @resource_record_sets.create(name, type, opts)
+          @options.route53.change_resource_record_sets(
+            hosted_zone_id: @hosted_zone.id,
+            change_batch: {
+              changes: [
+                {
+                  action: 'CREATE',
+                  resource_record_set: resource_record_set_params,
+                },
+              ],
+            },
+          )
           @options.updated = true
         end
 
-        ResourceRecordSetWrapper.new(record, @hosted_zone, @options)
+        ResourceRecordSetWrapper.new(expected_record, @hosted_zone, @options)
       end
     end # ResourceRecordSetCollectionWrapper
 
@@ -196,10 +211,10 @@ module Roadworker
 
       def eql?(expected_record)
         Route53Wrapper::RRSET_ATTRS_WITH_TYPE.all? do |attribute|
-          expected = expected_record.send(attribute)
+          expected = expected_record.public_send(attribute)
           expected = expected.sort_by {|i| i.to_s } if expected.kind_of?(Array)
           expected = nil if expected.kind_of?(Array) && expected.empty?
-          actual = self.send(attribute)
+          actual = self.public_send(attribute)
           actual = actual.sort_by {|i| i.to_s } if actual.kind_of?(Array)
           actual = nil if actual.kind_of?(Array) && actual.empty?
 
@@ -228,6 +243,7 @@ module Roadworker
 
         log(:info, 'Update ResourceRecordSet', :green, &log_id_proc)
 
+        resource_record_set_prev = @resource_record_set.dup
         Route53Wrapper::RRSET_ATTRS_WITH_TYPE.each do |attribute|
           expected = expected_record.send(attribute)
           expected = expected.sort_by {|i| i.to_s } if expected.kind_of?(Array)
@@ -238,17 +254,35 @@ module Roadworker
 
           if (expected and !actual) or (!expected and actual)
             log(:info, "  set #{attribute}=#{expected.inspect}" , :green)
-            self.send(:"#{attribute}=", expected) unless @options.dry_run
+            unless @options.dry_run
+              self.send(:"#{attribute}=", expected)
+            end
           elsif expected and actual
             if expected != actual
               log(:info, "  set #{attribute}=#{expected.inspect}" , :green)
-              self.send(:"#{attribute}=", expected) unless @options.dry_run
+              unless @options.dry_run
+                self.send(:"#{attribute}=", expected)
+              end
             end
           end
         end
 
         unless @options.dry_run
-          @resource_record_set.update
+          @options.route53.change_resource_record_sets(
+            hosted_zone_id: @hosted_zone.id,
+            change_batch: {
+              changes: [
+                {
+                  action: 'DELETE',
+                  resource_record_set: resource_record_set_prev,
+                },
+                {
+                  action: 'CREATE',
+                  resource_record_set: @resource_record_set,
+                },
+              ],
+            },
+          )
           @options.updated = true
         end
       end
@@ -267,7 +301,17 @@ module Roadworker
         end
 
         unless @options.dry_run
-          @resource_record_set.delete
+          @options.route53.change_resource_record_sets(
+            hosted_zone_id: @hosted_zone.id,
+            change_batch: {
+              changes: [
+                {
+                  action: 'DELETE',
+                  resource_record_set: @resource_record_set,
+                },
+              ],
+            },
+          )
           @options.updated = true
         end
       end
@@ -284,7 +328,7 @@ module Roadworker
         if dns_name
           [
             dns_name,
-            AWS::Route53.normalize_dns_name_options(alias_target),
+            Aws::Route53.normalize_dns_name_options(alias_target),
           ]
         else
           nil
@@ -294,7 +338,7 @@ module Roadworker
       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)
+          @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,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.5.beta4"
+  VERSION = "0.5.5.beta5"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.5.beta4
+  version: 0.5.5.beta5
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.62.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.62.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.