roadworker 0.5.9.beta5 → 0.5.9.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d74f6860010879a7fbd98866c9ff2915a8b392a7
-  data.tar.gz: 4a46f9a63ff010a97f613168d51116c9d79341b2
+  metadata.gz: f1eb8c3a93ef58551d55534c8a67cb588e7e85ca
+  data.tar.gz: e34029aac5acf924a1898f74856069ee5e8e00e6
 SHA512:
-  metadata.gz: 30198c307930eb489d90138ecb6f8ea012940a26db4905f38e1e1982e452627a8003bd161dc55292f200a13ff494ce5b9521a21200dfcef4fb779c8510132159
-  data.tar.gz: 9335b7bf22ce6bc0e918e9763bd565017f9d7c89f44dce1ea2a40c0c9871c657ec24c80b4f9966965403fa55f3df45631427915f46f7a83966bb8818ecd583e8
+  metadata.gz: f03d84f50cd76e0f9f6f4e861e3e521c2ac0eea19bcfa7ce1167b764cec2fa7ad2f0fbae5383a49770788be2026bf4c4ef32785fc0adc6f27be5df093b06379a
+  data.tar.gz: 07da904da92920d8be762e6cb090a960195d3ec28b77feef76b10bac579ef5deae12f97a469c42fc0810d7eebce0de0e4e084f4a5965e50e90181beeec060329

data/README.md

@@ -183,13 +183,23 @@ end
 ### Dynamic private DNS example
 
 ```ruby
+require 'aws-sdk'
+
 hosted_zone "us-east-1.my.local." do
   vpc "us-east-1", "vpc-xxxxxxxx"
 
-  AWS::EC2.new(region: "us-east-1").vpcs["vpc-xxxxxxxx"].instances.each {|instance|
-    rrset "#{instance.tags.Name}.us-east-1.my.local.", "A" do
+  resp = Aws::EC2::Client.new(region: "us-east-1").describe_instances(filters:[{ name: 'vpc-id', values: ["vpc-xxxxxxxx"] }])
+  instances = resp.reservations.each_with_object({}) do |reservation, reservations|
+    reservations.merge!(reservation.instances.each_with_object({}) do |instance, instances|
+      tag_name = instance.tags.find {|tag| tag['key'] == 'Name' }
+      instances[instance.private_ip_address] = tag_name['value'] if tag_name and tag_name['value'] != ''
+    end)
+  end
+
+  instances.each {|private_ip_address, tag_name|
+    rrset "#{tag_name}.us-east-1.my.local.", "A" do
       ttl 300
-      resource_records instance.private_ip_address
+      resource_records private_ip_address
     end
   }
 end

data/lib/roadworker/client.rb

@@ -63,13 +63,23 @@ module Roadworker
     end
 
     def walk_hosted_zones(dsl)
-      expected = collection_to_hash(dsl.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.map(&:vpc_id).sort] }
-      actual   = collection_to_hash(@route53.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.map(&:vpc_id).sort] }
+      expected = collection_to_hash(dsl.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.empty?, normalize_id(i.id)] }
+      actual   = collection_to_hash(@route53.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.empty?, normalize_id(i.id)] }
 
       expected.each do |keys, expected_zone|
-        name = keys[0]
+        name, private_zone, id = keys
         next unless matched_zone?(name)
-        actual_zone = actual.delete(keys)
+        if id
+          actual_zone = actual.delete(keys)
+          unless actual_zone
+            log(:warn, "Hosted zone not found", :yellow, "#{name} (#{id})")
+            next
+          end
+        else
+          actual_keys, actual_zone = actual.find {|(n, p, _), _| n == name && p == private_zone }
+          actual.delete(actual_keys) if actual_keys
+        end
+
         actual_zone ||= @route53.hosted_zones.create(name, :vpc => expected_zone.vpcs.first)
 
         walk_vpcs(expected_zone, actual_zone)
@@ -171,5 +181,9 @@ module Roadworker
       name.downcase.sub(/\.\z/, '')
     end
 
+    def normalize_id(id)
+      id.sub(%r!^/hostedzone/!, '') if id
+    end
+
   end # Client
 end # Roadworker

data/lib/roadworker/dsl-converter.rb

@@ -88,12 +88,13 @@ module Roadworker
 
         def output_zone(zone)
           name = zone[:name].inspect
+          id = zone[:id].sub(%r!^/hostedzone/!, '').inspect
           rrsets = zone[:rrsets]
           vpcs = output_vpcs(zone[:vpcs])
           vpcs = "  #{vpcs}\n\n" if vpcs
 
           return(<<-EOS)
-hosted_zone #{name} do
+hosted_zone #{name}#{zone[:vpcs].empty? ? '' : ", #{id}"} do
 #{vpcs
 }#{rrsets.map {|i| output_rrset(i) }.join("\n").chomp}
 end

data/lib/roadworker/dsl.rb

@@ -50,8 +50,8 @@ module Roadworker
       end
     end
 
-    def hosted_zone(name, &block)
-      @result.hosted_zones << Hostedzone.new(@context, name, [], &block).result
+    def hosted_zone(name, id = nil, &block)
+      @result.hosted_zones << Hostedzone.new(@context, name, id, [], &block).result
     end
 
     class Hostedzone
@@ -59,11 +59,12 @@ module Roadworker
 
       attr_reader :result
 
-      def initialize(context, name, rrsets = [], &block)
+      def initialize(context, name, id, rrsets = [], &block)
         @name = name
         @context = context.merge(:hosted_zone_name => name)
 
         @result = OpenStruct.new({
+          :id => id,
           :name => name,
           :vpcs => [],
           :resource_record_sets => rrsets,

data/lib/roadworker/route53-exporter.rb

@@ -29,7 +29,7 @@ module Roadworker
       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 }
+        zone_h = { id: zone.id, name: zone.name, vpcs: resp.vp_cs }
         hosted_zones << zone_h
 
         rrsets = []

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.9.beta5"
+  VERSION = "0.5.9.beta6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.9.beta5
+  version: 0.5.9.beta6
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk