terrafying-components 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e17ae473ab3bb13ee3c9e59a9a21ca52e7fa475ac82fa10dfba999df184a936c
-  data.tar.gz: 94e1251f7f41160c1585ac0a90557df41a43ee51180372893158a72da16d9084
+  metadata.gz: f6c3a26183611276c66ff87fca478593f4ea518aadc777c01cdc82ad2cada834
+  data.tar.gz: 18febee5dc3610671991ff9cf99e12790565aee35deb731e93e850f718f2a07e
 SHA512:
-  metadata.gz: 65061c32d01671493933b6186ecaf598ad3d259eed7e21438e61080c7af9a30537f3eff6f4f3f10f1502aa4a54b9726de78056d67078f138f154b93ae17c0a07
-  data.tar.gz: f273e1ce10eb6e6b0b45d524b83ff640f6c1f00d8425ecf22f2dd20d1ee8e3af91854ca1925cc2bfe099ad17129d7d99a0ae5db8326dfbda2285b80bc230ca17
+  metadata.gz: adc75d83583d4075799ff76449b0e947131540a6b8c630930984a263809d54a9764b6cc03eb16d3940357d01441cadcdf5c71529fd4659e449c400a65daabdda
+  data.tar.gz: dc26c3124a592de98ea80571d1b9a378a6a6f8c50c15fbf14911b2886511fa52f8b50b9ac66a0edf9bc25c87165b51205d3659c61a6a629aeca70895fe0ac561

data/lib/terrafying/components/dynamicset.rb

@@ -132,10 +132,10 @@ module Terrafying
       end
 
       def attach_load_balancer(load_balancer)
-        load_balancer.target_groups.each.with_index { |target_group, i|
+        load_balancer.targets.each.with_index { |target, i|
           resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}", {
                      autoscaling_group_name: @asg,
-                     alb_target_group_arn: target_group
+                     alb_target_group_arn: target.target_group
                    }
         }
 
@@ -143,10 +143,11 @@ module Terrafying
       end
 
       def autoscale_on_load_balancer(load_balancer, target_value:, disable_scale_in:)
-        load_balancer.target_groups.each.with_index { |target_group, i|
+        load_balancer.targets.each.with_index do |target, i|
           policy_name = "#{load_balancer.name}-#{@name}-#{i}"
           lb_arn = load_balancer.id.to_s.gsub(/id/, 'arn_suffix')
-          tg_arn = target_group.to_s.gsub(/id/, 'arn_suffix')
+          tg_arn = target.target_group.to_s.gsub(/id/, 'arn_suffix')
+          listener = target.listener.to_s.gsub(/\.id/, '')
 
           resource :aws_autoscaling_policy, policy_name, {
             name: policy_name,
@@ -160,9 +161,10 @@ module Terrafying
               },
               target_value: target_value,
               disable_scale_in: disable_scale_in
-            }
+            },
+            depends_on: [listener]
           }
-        }
+        end
       end
 
       def generate_template(health_check, instances, launch_config, subnets,tags, rolling_update)

data/lib/terrafying/components/loadbalancer.rb

@@ -5,12 +5,12 @@ require 'terrafying/generator'
 require_relative './ports'
 
 module Terrafying
-
   module Components
-
     class LoadBalancer < Terrafying::Context
 
-      attr_reader :id, :name, :type, :security_group, :ports, :target_groups, :alias_config
+      attr_reader :id, :name, :type, :security_group, :ports, :targets, :alias_config
+
+      Struct.new('Target', :target_group, :listener, keyword_init: true)
 
       include Usable
 
@@ -46,7 +46,13 @@ module Terrafying
 
         target_groups = aws.target_groups_by_lb(@id)
 
-        @target_groups = target_groups.map(&:target_group_arn)
+        @targets = target_groups.map { |tg|
+          Struct::Target.new(
+            target_group: tg.target_group_arn,
+            listener: nil
+          )
+        }
+
         @ports = enrich_ports(target_groups.map(&:port).sort.uniq)
 
         @alias_config = {
@@ -108,7 +114,7 @@ module Terrafying
         }.merge(subnets_for(options[:subnets]))
          .merge(application? ? { security_groups: [@security_group] } : {})
 
-        @target_groups = []
+        @targets = []
 
         @ports.each { |port|
           port_ident = "#{ident}-#{port[:downstream_port]}"
@@ -122,7 +128,7 @@ module Terrafying
 
           ssl_options = alb_certs(port, port_ident)
 
-          resource :aws_lb_listener, port_ident, {
+          listener = resource :aws_lb_listener, port_ident, {
                      load_balancer_arn: @id,
                      port: port[:upstream_port],
                      protocol: port[:type].upcase,
@@ -132,7 +138,10 @@ module Terrafying
                      },
                    }.merge(ssl_options)
 
-          @target_groups << target_group
+          @targets << Struct::Target.new(
+            target_group: target_group,
+            listener: listener
+          )
         }
 
         @alias_config = {

data/lib/terrafying/components/staticset.rb

@@ -136,9 +136,9 @@ module Terrafying
       end
 
       def attach_load_balancer(load_balancer)
-        @instances.product(load_balancer.target_groups).each.with_index { |(instance, target_group), i|
+        @instances.product(load_balancer.targets).each.with_index { |(instance, target), i|
           resource :aws_lb_target_group_attachment, "#{load_balancer.name}-#{@name}-#{i}", {
-                     target_group_arn: target_group,
+                     target_group_arn: target.target_group,
                      target_id: instance.id,
                    }
         }

data/lib/terrafying/components/version.rb

@@ -1,5 +1,5 @@
 module Terrafying
   module Components
-    VERSION = "1.9.1"
+    VERSION = "1.9.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler