terrafying-components 1.15.26 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bfe78aadfcc91a0c8aa5bbfca445707fad35f5957a9dd4b0a32c7d524c2505
-  data.tar.gz: e3fee09e5c6ec1e105ed3ece2eacfa34bd8f9f10040fcaa12f5c1e198c1e8db6
+  metadata.gz: 9983c19cd686106f44dbb89fc3b6183e9d0ae3901f5b12726047dadf1765bcfb
+  data.tar.gz: bf3276537d3f02d679e6125cd3d121ecdc066cde8378cf7c0fcd9432fac0a305
 SHA512:
-  metadata.gz: d785a85a3767b9c6aed35de5eb0f15033ea323d55cf7e165cbf266a85103f6789f5ace3d5af18569dff0ff6d20c93e19ad1921aee4c26c061da3809cea1f154d
-  data.tar.gz: bb418b96219c5ac53c5635d644f99807c4a4b66d423c988a073e3c75f58797b6524b2c6473f5138cdb3faa20ea2623749b82c2b43fce5f8f657f2a16730b8b9d
+  metadata.gz: 5c19b489486496916e5e2b23ecbdfc4459f5098e705621f3e752f849b91e20a3f29890452a05db06b89042ced288fe1619666f5521652af82a1b8c6d40a1a28b
+  data.tar.gz: 0ac3a558be454d86b75b9f28aa036eb2e057aff44d33664d8d9ffa8735ed22a21ff3ee3019b4b048eb0d05340f11c2b243272ec804c7147cdaa8c5e7a000c2f9

data/lib/terrafying/components/dynamicset.rb

@@ -33,7 +33,7 @@ module Terrafying
         options = {
           public: false,
           eip: false,
-          ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
+          ami: aws.ami('base-image-fc-b4b2c239', owners = ['477284023816']),
           instance_type: 't3a.micro',
           instances: { min: 1, max: 1, desired: 1, tags: {} },
           ports: [],
@@ -44,12 +44,9 @@ module Terrafying
           subnets: vpc.subnets.fetch(:private, []),
           depends_on: [],
           rolling_update: :simple,
-          metadata_options: nil,
           vpc_endpoints_egress: []
         }.merge(options)
 
-        metadata_options = options[:metadata_options]
-
         ident = "#{tf_safe(vpc.name)}-#{name}"
 
         @name = ident
@@ -88,7 +85,6 @@ module Terrafying
                                  lifecycle: {
                                    create_before_destroy: true
                                  },
-                                 metadata_options: options[:metadata_options],
                                  depends_on: resource_name_from(options[:instance_profile])
 
         if options[:instances][:track]
@@ -142,7 +138,7 @@ module Terrafying
                  protocol: -1,
                  prefix_list_ids: prefix_ids
       end
-      
+
       def default_egress_rule(ident, security_group)
         resource :aws_security_group_rule, "#{ident}-default-egress",
                  security_group_id: security_group,
@@ -163,7 +159,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
@@ -173,13 +169,14 @@ module Terrafying
 
       def autoscale_on_load_balancer(load_balancer, target_value:, disable_scale_in:)
         load_balancer.targets.each.with_index do |target, i|
+          policy_ident = "#{load_balancer.name}-#{@name}-#{i}".gsub(%r{^(\d)}, '_\1')
           policy_name = "#{load_balancer.name}-#{@name}-#{i}"
           lb_arn = load_balancer.id.to_s.gsub(/id/, 'arn_suffix')
           tg_arn = target.target_group.to_s.gsub(/id/, 'arn_suffix')
           listener = "aws_lb_listener.#{target.listener.to_s.split('.')[1]}"
-          autoscaling_attachment = "aws_autoscaling_attachment.#{policy_name}"
+          autoscaling_attachment = "aws_autoscaling_attachment.#{policy_ident}"
 
-          resource :aws_autoscaling_policy, policy_name,
+          resource :aws_autoscaling_policy, policy_ident,
                    name: policy_name,
                    autoscaling_group_name: @asg,
                    policy_type: 'TargetTrackingScaling',

data/lib/terrafying/components/instance.rb

@@ -36,7 +36,6 @@ module Terrafying
           instance_profile: nil,
           ports: [],
           tags: {},
-          metadata_options: nil,
           security_groups: [],
           depends_on: []
         }.merge(options)
@@ -56,12 +55,7 @@ module Terrafying
                                        from_port: 0,
                                        to_port: 0,
                                        protocol: -1,
-                                       cidr_blocks: ['0.0.0.0/0'],
-                                       ipv6_cidr_blocks: nil,
-                                       prefix_list_ids: nil,
-                                       security_groups: nil,
-                                       self: nil,
-                                       description: nil
+                                       cidr_blocks: ['0.0.0.0/0']
                                      }
                                    ]
 
@@ -105,7 +99,6 @@ module Terrafying
             vpc.internal_ssh_security_group
           ].push(*options[:security_groups]),
           user_data: options[:user_data],
-          metadata_options: options[:metadata_options],
           lifecycle: {
             create_before_destroy: true
           },

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/service.rb

@@ -41,7 +41,7 @@ module Terrafying
 
       def create_in(vpc, name, options = {})
         options = {
-          ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
+          ami: aws.ami('base-image-fc-b4b2c239', owners = ['477284023816']),
           instance_type: 't3a.micro',
           ports: [],
           instances: [{}],
@@ -59,7 +59,6 @@ module Terrafying
           subnets: vpc.subnets.fetch(:private, []),
           startup_grace_period: 300,
           depends_on: [],
-          metadata_options: nil,
           audit_role: "arn:aws:iam::#{aws.account_id}:role/auditd_logging",
           metrics_ports: [],
           vpc_endpoints_egress: []
@@ -97,8 +96,6 @@ module Terrafying
           @instance_profile = add! InstanceProfile.create(ident, statements: iam_statements)
         end
 
-        metadata_options = options[:metadata_options]
-
         tags = options[:tags].merge(service_name: name)
 
         set = options[:instances].is_a?(Hash) ? DynamicSet : StaticSet
@@ -115,7 +112,6 @@ module Terrafying
         instance_set_options = {
           instance_profile: @instance_profile,
           depends_on: depends_on,
-          metadata_options: metadata_options,
           tags: tags
         }
 
@@ -170,7 +166,7 @@ module Terrafying
         prom = Prometheus.find_in(vpc: vpc)
         ports.each do |port|
           sg_rule_ident = Digest::SHA256.hexdigest("#{vpc.name}-#{port}-#{security_group}-#{prom.security_group}")
-          resource :aws_security_group_rule, sg_rule_ident,
+          resource :aws_security_group_rule, sg_rule_ident.gsub(%r{^(\d)}, '_\1'),
                    security_group_id: security_group,
                    type: 'ingress',
                    from_port: port,

data/lib/terrafying/components/staticset.rb

@@ -38,7 +38,7 @@ module Terrafying
         options = {
           public: false,
           eip: false,
-          ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
+          ami: aws.ami('base-image-fc-b4b2c239', owners = ['136393635417']),
           instance_type: 't3a.micro',
           subnets: vpc.subnets.fetch(:private, []),
           ports: [],
@@ -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 = '1.15.26'
+    VERSION = '1.16.3'
   end
 end

data/lib/terrafying/components/vpc.rb

@@ -5,7 +5,6 @@ require 'netaddr'
 require 'terrafying/components/subnet'
 require 'terrafying/components/zone'
 require 'terrafying/generator'
-require 'digest/bubblebabble'
 
 module Terrafying
   module Components
@@ -185,12 +184,7 @@ module Terrafying
                                                     from_port: 22,
                                                     to_port: 22,
                                                     protocol: 'tcp',
-                                                    cidr_blocks: [@cidr],
-                                                    description: nil, 
-                                                    ipv6_cidr_blocks: nil, 
-                                                    prefix_list_ids: nil, 
-                                                    security_groups: nil,
-                                                    self: nil
+                                                    cidr_blocks: [@cidr]
                                                   }
                                                 ],
                                                 egress: [
@@ -198,12 +192,7 @@ module Terrafying
                                                     from_port: 22,
                                                     to_port: 22,
                                                     protocol: 'tcp',
-                                                    cidr_blocks: [@cidr],
-                                                    description: nil, 
-                                                    ipv6_cidr_blocks: nil, 
-                                                    prefix_list_ids: nil, 
-                                                    security_groups: nil,
-                                                    self: nil
+                                                    cidr_blocks: [@cidr]
                                                   }
                                                 ]
         self
@@ -244,7 +233,7 @@ module Terrafying
           subnets: @subnets.values.flatten
         }.merge(options)
 
-        ident = tf_safe(Digest::SHA256.bubblebabble(ip_address)[0..11]+ip_address)
+        ident = tf_safe(ip_address)
 
         if options[:tunnels].count > 2
           raise 'You can only define a max of two tunnels'
@@ -294,7 +283,7 @@ module Terrafying
         route_tables.product(cidrs).each do |route_table, cidr|
           hash = Digest::SHA2.hexdigest "#{route_table}-#{tf_safe(cidr)}"
 
-          resource :aws_route, "#{@name}-to-#{tf_safe(ip_address)}-peer-#{hash}",
+          resource :aws_route, "#{@name}-to-#{ident}-peer-#{hash}",
                    route_table_id: route_table,
                    destination_cidr_block: cidr,
                    gateway_id: vpn_gateway

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.15.26
+  version: 1.16.3
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake