terrafying-components 1.15.25 → 1.15.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065624fa7820b9041d5b8197c725d6d28b31e8d1a305e0ea5392ae5dc34249ea
-  data.tar.gz: 65f410d981a749ec65c5108ac4b96a9abe58f30f193251f606f1d9a7baafe799
+  metadata.gz: b1bfe78aadfcc91a0c8aa5bbfca445707fad35f5957a9dd4b0a32c7d524c2505
+  data.tar.gz: e3fee09e5c6ec1e105ed3ece2eacfa34bd8f9f10040fcaa12f5c1e198c1e8db6
 SHA512:
-  metadata.gz: 3f8a4922ae67518c2387aa118bcf4ad094677cb6dd7f91e4d862072ccd177fe46547388f258c53b32e1224d3c77960b7dd3a56f2376265c2227a280f7d8eb045
-  data.tar.gz: f92cc6b8f795495c280b10f141e1c78a3c3b5b814c22ae9c4b02d85c9b82589dd4756f19e0017b10dc912a57d52ccd366c894b49076e695b17cd0717285e80c5
+  metadata.gz: d785a85a3767b9c6aed35de5eb0f15033ea323d55cf7e165cbf266a85103f6789f5ace3d5af18569dff0ff6d20c93e19ad1921aee4c26c061da3809cea1f154d
+  data.tar.gz: bb418b96219c5ac53c5635d644f99807c4a4b66d423c988a073e3c75f58797b6524b2c6473f5138cdb3faa20ea2623749b82c2b43fce5f8f657f2a16730b8b9d

data/lib/terrafying/components/dynamicset.rb

@@ -44,9 +44,12 @@ 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
@@ -85,6 +88,7 @@ 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,6 +36,7 @@ module Terrafying
           instance_profile: nil,
           ports: [],
           tags: {},
+          metadata_options: nil,
           security_groups: [],
           depends_on: []
         }.merge(options)
@@ -55,7 +56,12 @@ module Terrafying
                                        from_port: 0,
                                        to_port: 0,
                                        protocol: -1,
-                                       cidr_blocks: ['0.0.0.0/0']
+                                       cidr_blocks: ['0.0.0.0/0'],
+                                       ipv6_cidr_blocks: nil,
+                                       prefix_list_ids: nil,
+                                       security_groups: nil,
+                                       self: nil,
+                                       description: nil
                                      }
                                    ]
 
@@ -99,6 +105,7 @@ 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'
+require 'digest/bubblebabble'
 require 'terrafying/components/usable'
 require 'terrafying/generator'
-
+require 'digest'
 require_relative './ports'
 
 module Terrafying
@@ -216,9 +216,14 @@ 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/prometheus.rb

@@ -22,7 +22,7 @@ module Terrafying
         thanos_name: 'thanos',
         thanos_version: 'v0.10.1',
         prom_name: 'prometheus',
-        prom_version: 'v2.15.2',
+        prom_version: 'v2.23.0',
         instances: 2,
         instance_type: 't3a.small',
         thanos_instance_type: 't3a.small',

data/lib/terrafying/components/service.rb

@@ -59,6 +59,7 @@ 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: []
@@ -96,6 +97,8 @@ 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
@@ -112,6 +115,7 @@ 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-2860fb52', owners = ['136393635417']),
+          ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
           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.25'
+    VERSION = '1.15.26'
   end
 end

data/lib/terrafying/components/vpc.rb

@@ -5,6 +5,7 @@ require 'netaddr'
 require 'terrafying/components/subnet'
 require 'terrafying/components/zone'
 require 'terrafying/generator'
+require 'digest/bubblebabble'
 
 module Terrafying
   module Components
@@ -184,7 +185,12 @@ module Terrafying
                                                     from_port: 22,
                                                     to_port: 22,
                                                     protocol: 'tcp',
-                                                    cidr_blocks: [@cidr]
+                                                    cidr_blocks: [@cidr],
+                                                    description: nil, 
+                                                    ipv6_cidr_blocks: nil, 
+                                                    prefix_list_ids: nil, 
+                                                    security_groups: nil,
+                                                    self: nil
                                                   }
                                                 ],
                                                 egress: [
@@ -192,7 +198,12 @@ module Terrafying
                                                     from_port: 22,
                                                     to_port: 22,
                                                     protocol: 'tcp',
-                                                    cidr_blocks: [@cidr]
+                                                    cidr_blocks: [@cidr],
+                                                    description: nil, 
+                                                    ipv6_cidr_blocks: nil, 
+                                                    prefix_list_ids: nil, 
+                                                    security_groups: nil,
+                                                    self: nil
                                                   }
                                                 ]
         self
@@ -233,7 +244,7 @@ module Terrafying
           subnets: @subnets.values.flatten
         }.merge(options)
 
-        ident = tf_safe(ip_address)
+        ident = tf_safe(Digest::SHA256.bubblebabble(ip_address)[0..11]+ip_address)
 
         if options[:tunnels].count > 2
           raise 'You can only define a max of two tunnels'
@@ -283,7 +294,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-#{ident}-peer-#{hash}",
+          resource :aws_route, "#{@name}-to-#{tf_safe(ip_address)}-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.25
+  version: 1.15.26
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake