terrafying-components 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d27dba45000471cefaca8b0bb650380123f1ccdbdf52adc240689e4b260533d3
-  data.tar.gz: 9bc0cfa749d0060ff0f9213a12baa661e4c6383bc2d256fb4daea225a4c7cfc8
+  metadata.gz: bbaa667823250a0ea8cbf2a14e2aade8c9a1662486b6348cc77b96117a803fd4
+  data.tar.gz: 76469e319d9769d9fababcdaac1a3e765b799709d27673ae3bd30fb759fbd3ad
 SHA512:
-  metadata.gz: 17044b38860633249fd30a06ceff2c7db97cd8570900fa53c813cc2efd8fbd99463b3650f60180b0d181156ca11331394da1db89d8afaaea7321605c4e80b201
-  data.tar.gz: 0b5f7e9f9c23c4478d2255686de6e8412713b8ef36b5295b2955187be2978064e338c6f910c6220bf3611b3b1e4aa3a34da66ceaeb9b271373f18d2231f963dc
+  metadata.gz: e91162e62ce4b562d850e0a770985bb7712d415657b4bd04f0f32c35a209ddefadf1f8f621b08360597d399e943bfcbd47016a9e8335b5e5c3ed10a78bd0195b
+  data.tar.gz: acc04e0cf409950d9760fe2918ce3c2fa98a03ade81682f9445a19bec0f3e863bf4d5ef8a79f85bc6e691bd63ccbc53c07a677bf1a3755ffc92b75546d5c3ca3

data/lib/terrafying/components/dynamicset.rb

@@ -163,7 +163,7 @@ module Terrafying
 
       def attach_load_balancer(load_balancer)
         load_balancer.targets.each.with_index do |target, i|
-          resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}",
+          resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}".gsub(%r{^(\d)}, '_\1'),
                    autoscaling_group_name: @asg,
                    alb_target_group_arn: target.target_group
         end

data/lib/terrafying/components/loadbalancer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'digest/bubblebabble'
 require 'terrafying/components/usable'
 require 'terrafying/generator'
 require 'digest'
@@ -36,14 +35,15 @@ module Terrafying
         rescue StandardError
           @type = 'application'
           ident = make_identifier(@type, vpc.name, name)
+          name = make_name(@type, vpc.name, name)
 
-          lb = aws.lb_by_name(ident)
+          lb = aws.lb_by_name(name)
 
-          @security_group = aws.security_group_by_tags(loadbalancer_name: ident)
+          @security_group = aws.security_group_by_tags(loadbalancer_name: name)
         end
 
         @id = lb.load_balancer_arn
-        @name = ident
+        @name = name
 
         target_groups = aws.target_groups_by_lb(@id)
 
@@ -93,14 +93,14 @@ module Terrafying
         @type = l4_ports.count == 0 ? 'application' : 'network'
 
         ident = make_identifier(@type, vpc.name, name)
-        @name = ident
+        @name = make_name(@type, vpc.name, name)
 
         if application?
           @security_group = resource :aws_security_group, ident,
-                                     name: "loadbalancer-#{ident}",
-                                     description: "Describe the ingress and egress of the load balancer #{ident}",
+                                     name: "loadbalancer-#{@name}",
+                                     description: "Describe the ingress and egress of the load balancer #{@name}",
                                      tags: @tags.merge(
-                                       loadbalancer_name: ident
+                                       loadbalancer_name: @name
                                      ),
                                      vpc_id: vpc.id
 
@@ -112,7 +112,7 @@ module Terrafying
         end
 
         @id = resource :aws_lb, ident, {
-          name: ident,
+          name: @name,
           load_balancer_type: type,
           internal: !options[:public],
           tags: @tags
@@ -125,8 +125,9 @@ module Terrafying
 
         @ports.each do |port|
           port_ident = "#{ident}-#{port[:downstream_port]}"
+          port_name = "#{@name}-#{port[:downstream_port]}"
 
-          default_action = port.key?(:action) ? port[:action] : forward_to_tg(port, port_ident, vpc)
+          default_action = port.key?(:action) ? port[:action] : forward_to_tg(port, port_ident, port_name, vpc)
 
           ssl_options = alb_certs(port, port_ident)
 
@@ -148,9 +149,9 @@ module Terrafying
         self
       end
 
-      def forward_to_tg(port, port_ident, vpc)
+      def forward_to_tg(port, port_ident, port_name, vpc)
         target_group = resource :aws_lb_target_group, port_ident, {
-          name: port_ident,
+          name: port_name,
           port: port[:downstream_port],
           protocol: port[:type].upcase,
           vpc_id: vpc.id
@@ -215,17 +216,16 @@ module Terrafying
         set.autoscale_on_load_balancer(self, target_value: target_value, disable_scale_in: disable_scale_in)
       end
 
-      def make_identifier(type, vpc_name, name)
+      def make_name(type, vpc_name, name)
+        gen_id = "#{type}-#{tf_safe(vpc_name)}-#{name}"
+        return Digest::SHA2.hexdigest(gen_id)[0..24] if @hex_ident || gen_id.size > 26
 
-        gen_id = "#{type}-#{vpc_name}-#{name}"
-        hex = Digest::SHA2.hexdigest(gen_id)[0..24]
-        if hex[0..0] =~ /[a-z]/
-            return hex if @hex_ident || gen_id.size > 26
-        else return Digest::SHA256.bubblebabble(gen_id)[0..15]
-          end
-    
         gen_id[0..31]
       end
+
+      def make_identifier(type, vpc_name, name)
+        make_name(type, vpc_name, name).gsub(%r{^(\d)}, '_\1')
+      end
     end
   end
 end

data/lib/terrafying/components/security/trail.rb

@@ -120,7 +120,7 @@ module Terrafying
                                                "logs:CreateLogStream"
                                              ],
                                              Resource: [
-                                               @log_group["arn"],
+                                               "#{@log_group["arn"]}:*",
                                              ]
                                            },
                                            {
@@ -130,7 +130,7 @@ module Terrafying
                                                "logs:PutLogEvents"
                                              ],
                                              Resource: [
-                                               @log_group["arn"],
+                                               "#{@log_group["arn"]}:*",
                                              ]
                                            }
                                          ]
@@ -152,7 +152,7 @@ module Terrafying
                      enable_log_file_validation: true,
                      kms_key_id: store.key_arn,
 
-                     cloud_watch_logs_group_arn: @log_group["arn"],
+                     cloud_watch_logs_group_arn: "#{@log_group["arn"]}:*",
                      cloud_watch_logs_role_arn: log_role["arn"],
 
                      event_selector: [

data/lib/terrafying/components/staticset.rb

@@ -161,7 +161,7 @@ module Terrafying
 
       def attach_load_balancer(load_balancer)
         @instances.product(load_balancer.targets).each.with_index do |(instance, target), i|
-          resource :aws_lb_target_group_attachment, "#{load_balancer.name}-#{@name}-#{i}",
+          resource :aws_lb_target_group_attachment, "#{load_balancer.name}-#{@name}-#{i}".gsub(%r{^(\d)}, '_\1'),
                    target_group_arn: target.target_group,
                    target_id: instance.id
         end

data/lib/terrafying/components/usable.rb

@@ -16,7 +16,7 @@ module Terrafying
       end
 
       def path_mtu_setup!
-        resource :aws_security_group_rule, "#{@name}-path-mtu",
+        resource :aws_security_group_rule, "#{@name}-path-mtu".gsub(%r{^(\d)}, '_\1'),
                  security_group_id: egress_security_group,
                  type: 'ingress',
                  protocol: 1, # icmp
@@ -42,7 +42,7 @@ module Terrafying
           cidr_ident = cidr.tr('./', '-')
 
           @ports.select(&block).map do |port|
-            resource :aws_security_group_rule, "#{@name}-to-#{cidr_ident}-#{port[:name]}",
+            resource :aws_security_group_rule, "#{@name}-to-#{cidr_ident}-#{port[:name]}".gsub(%r{^(\d)}, '_\1'),
                      security_group_id: ingress_security_group,
                      type: 'ingress',
                      from_port: from_port(port[:upstream_port]),
@@ -92,7 +92,7 @@ module Terrafying
       def used_by(*other_resources, &block)
         other_resources.map do |other_resource|
           @ports.select(&block).map.map do |port|
-            resource :aws_security_group_rule, "#{@name}-to-#{other_resource.name}-#{port[:name]}",
+            resource :aws_security_group_rule, "#{@name}-to-#{other_resource.name}-#{port[:name]}".gsub(%r{^(\d)}, '_\1'),
                      security_group_id: ingress_security_group,
                      type: 'ingress',
                      from_port: from_port(port[:upstream_port]),
@@ -100,7 +100,7 @@ module Terrafying
                      protocol: port[:type] == 'udp' ? 'udp' : 'tcp',
                      source_security_group_id: other_resource.egress_security_group
 
-            resource :aws_security_group_rule, "#{other_resource.name}-to-#{@name}-#{port[:name]}",
+            resource :aws_security_group_rule, "#{other_resource.name}-to-#{@name}-#{port[:name]}".gsub(%r{^(\d)}, '_\1'),
                      security_group_id: other_resource.egress_security_group,
                      type: 'egress',
                      from_port: from_port(port[:downstream_port]),

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '2.0.7'
+    VERSION = '2.0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake