terrafying 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af4653ed17899f16c1509603765cbb7a46df21a8
-  data.tar.gz: 4c80f22154d070d64f964bb24d2fe9b55be56fee
+  metadata.gz: a22e15cb8bade7db18b7a76f6a6c912b52476cfd
+  data.tar.gz: 71551b258663fd61a90374074cbab2c1016f2177
 SHA512:
-  metadata.gz: 28051808a96919423aa46e77a49b14ad41599a7b9525c31b23b78d0fbb8fe16715647757d76d9ee584c6c7a43b75cf852cb164b9ee7e35bcb59714f9d4653686
-  data.tar.gz: c57af13c2ea754312cb07f5028ca5eacdca8b515b5ef23af371e6e36bf91eff329f9a44b2bba9b12ca0af69e53aed912acc499521bbc9e599afc85ac566077e6
+  metadata.gz: d2e658117299c524fb658e489b95ba6289414a9c246600abdde4d30d18bbdb8dc177e3b5a3695ae1a9605772631c5ab4c9bf2cafde56da7a2fe9a00dac4405ac
+  data.tar.gz: f45615ee481693852540c32e90971d34d3f8a9348b1f3462399945fd89e10920290b392dfee261cf1ba23eeea078f3e7f29efa5eab2424eecfdc9e0c8d87dc97

data/lib/terrafying/aws.rb

@@ -9,8 +9,12 @@ module Terrafying
       attr_reader :region
 
       def initialize(region)
+        full_jitter = lambda { |c| Kernel.sleep(Kernel.rand(0..[2, (0.3 * 2**c.retries)].min)) }
+
         ::Aws.config.update({
-          region: region
+          region: region,
+          retry_limit: 5,
+          retry_backoff: full_jitter
         })
         @autoscaling_client = ::Aws::AutoScaling::Client.new
         @ec2_resource = ::Aws::EC2::Resource.new
@@ -353,15 +357,22 @@ module Terrafying
         @hosted_zones[tag] ||=
           begin
             STDERR.puts "looking for a hosted zone with tag '#{tag}'"
-            hosted_zones = @route53_client.list_hosted_zones().hosted_zones.select { |zone|
-              tags = @route53_client.list_tags_for_resource({resource_type: "hostedzone", resource_id: zone.id.split('/')[2]}).resource_tag_set.tags.select { |aws_tag|
-                tag.keys.any? { |key| String(key) == aws_tag.key && tag[key] == aws_tag.value }
+            @aws_hosted_zones ||= @route53_client.list_hosted_zones.hosted_zones.map do |zone|
+              {
+                zone: zone,
+                tags: @route53_client.list_tags_for_resource({resource_type: "hostedzone", resource_id: zone.id.split('/')[2]}).resource_tag_set.tags
               }
-              tags.any?
-            }
+            end
+
+            hosted_zones = @aws_hosted_zones.select do |z|
+              z[:tags].any? do |aws_tag|
+                tag.any? { |k, v| aws_tag.key = String(k) && aws_tag.value == v }
+              end
+            end
+
             case
             when hosted_zones.count == 1
-              hosted_zones.first
+              hosted_zones.first[:zone]
             when hosted_zones.count < 1
               raise "No hosted zone with tag '#{tag}' was found."
             when hosted_zones.count > 1

data/lib/terrafying/version.rb

@@ -1,4 +1,4 @@
 module Terrafying
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
   CLI_VERSION = "0.11.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler