terrafying-components 1.15.26 → 1.15.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bfe78aadfcc91a0c8aa5bbfca445707fad35f5957a9dd4b0a32c7d524c2505
-  data.tar.gz: e3fee09e5c6ec1e105ed3ece2eacfa34bd8f9f10040fcaa12f5c1e198c1e8db6
+  metadata.gz: c4aa8556484984beeff3e8516069c2f4c19ed362dc40cb9c5e1388b7db6b3a30
+  data.tar.gz: 8496a24598cb73692342fb02891d061c492fb5c4e6de6a236ab268551d7c3b58
 SHA512:
-  metadata.gz: d785a85a3767b9c6aed35de5eb0f15033ea323d55cf7e165cbf266a85103f6789f5ace3d5af18569dff0ff6d20c93e19ad1921aee4c26c061da3809cea1f154d
-  data.tar.gz: bb418b96219c5ac53c5635d644f99807c4a4b66d423c988a073e3c75f58797b6524b2c6473f5138cdb3faa20ea2623749b82c2b43fce5f8f657f2a16730b8b9d
+  metadata.gz: 1e30aafb4b832acfc1a01e282feab7929ba43a646ef4524bd1cf109062cd31ebcbbbd53f848e541abb8c248535e682b30911072c1939b3ab35c41d29e47030b8
+  data.tar.gz: 4e7c93e9ddf5beff6bd06b7960936f96e940f79ca089d2a092c8ab4108bac1092e213727907979741c09d29d20fb6b75e1f5cef4be792bba1945d9fd29c7d55d

data/lib/terrafying/components/dynamicset.rb

@@ -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]

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,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'digest/bubblebabble'
+require 'digest'
 require 'terrafying/components/usable'
 require 'terrafying/generator'
-require 'digest'
+
 require_relative './ports'
 
 module Terrafying
@@ -216,14 +216,9 @@ module Terrafying
       end
 
       def make_identifier(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
     end

data/lib/terrafying/components/service.rb

@@ -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
         }
 

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-2860fb52', owners = ['136393635417']),
           instance_type: 't3a.micro',
           subnets: vpc.subnets.fetch(:private, []),
           ports: [],

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '1.15.26'
+    VERSION = '1.15.27'
   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.15.27
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake