terrafying-components 2.0.1 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed9e1ca845d8806f8a66b55a0c24b7659d75f9927fb8963bce56565c5d324ef
-  data.tar.gz: '09e2d9661b9a2041a62ca36bb3251962eef12af484499fe6a0cea649a7d83c26'
+  metadata.gz: 381091960226ad013643c23ecf9ffe470f97e7e963a3da0963d7b9c6d544823a
+  data.tar.gz: 98d43798fdfda73ed4c53b7c98d7b810dbce670bf02d0ee02f2cf70a63d2d48f
 SHA512:
-  metadata.gz: b3655d57e5bfcf6efe36a8cf2bc8b8b6bf384721435bf10f5beb457cdf3f344e7a3ae7ea244a81a24441e72a183cf472b5ef6dd274a7aa866e259f2cacd363e8
-  data.tar.gz: a8b13ddd1d36a9d8d5b9fbcf99345fb3ac4093af16d4711664dae80772a2a8aa0623595d2950d7c4d9c0b8f1f358b5660843ad65cabf75dfa0d7ed0682df1827
+  metadata.gz: 5aa09410da8a3e78c1a6a0d049d581803a3095be56124339dbf91ab7ad5b4d31ad2f5dc2fe8fae25a64a8bd76beb98b997361c490e2b3026a74bce44c62664ed
+  data.tar.gz: d6e0d709aaaa48a20ba219e2b5d7fee17185b2d14440df3c1e4322f35bc5720e0ef5a075e7b38f129d9c100682038544cd6bb4e4903d9a4800377641bf32ead2

data/lib/terrafying/components/dynamicset.rb

@@ -33,7 +33,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',
           instances: { min: 1, max: 1, desired: 1, tags: {} },
           ports: [],
@@ -44,7 +44,7 @@ module Terrafying
           subnets: vpc.subnets.fetch(:private, []),
           depends_on: [],
           rolling_update: :simple,
-          metadata_options: {},
+          metadata_options: nil,
           vpc_endpoints_egress: []
         }.merge(options)
 

data/lib/terrafying/components/instance.rb

@@ -36,14 +36,9 @@ module Terrafying
           instance_profile: nil,
           ports: [],
           tags: {},
-          security_groups: nil,
           metadata_options: nil,
-          depends_on: nil,
-          ipv6_cidr_blocks: nil,
-          prefix_list_ids: nil,
-          security_groups: nil,
-          self: nil,
-          description: nil,
+          security_groups: [],
+          depends_on: []
         }.merge(options)
 
         ident = "#{tf_safe(vpc.name)}-#{name}"
@@ -62,11 +57,11 @@ module Terrafying
                                        to_port: 0,
                                        protocol: -1,
                                        cidr_blocks: ['0.0.0.0/0'],
-                                       ipv6_cidr_blocks: options[:ipv6_cidr_blocks],
-                                       prefix_list_ids: options[:prefix_list_ids],
-                                       security_groups: options[:security_groups],
-                                       self: options[:self],
-                                       description: options[:description]
+                                       ipv6_cidr_blocks: nil,
+                                       prefix_list_ids: nil,
+                                       security_groups: nil,
+                                       self: nil,
+                                       description: nil
                                      }
                                    ]
 

data/lib/terrafying/components/loadbalancer.rb

@@ -3,7 +3,7 @@
 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::SHA256.bubblebabble(gen_id)[0..15] 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/security/config_aggregator.rb

@@ -42,7 +42,7 @@ module Terrafying
                      provider: @provider,
                      role: role["name"],
                      policy_arn: "arn:aws:iam::aws:policy/service-role/AWSConfigRoleForOrganizations",
-                   }
+                  }.compact
 
           source = {}
 

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-2860fb52', owners = ['136393635417']),
+          ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
           instance_type: 't3a.micro',
           ports: [],
           instances: [{}],
@@ -59,7 +59,7 @@ module Terrafying
           subnets: vpc.subnets.fetch(:private, []),
           startup_grace_period: 300,
           depends_on: [],
-          metadata_options: {},
+          metadata_options: nil,
           audit_role: "arn:aws:iam::#{aws.account_id}:role/auditd_logging",
           metrics_ports: [],
           vpc_endpoints_egress: []

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: [],
@@ -63,7 +63,7 @@ module Terrafying
                                    description: "Describe the ingress and egress of the static set #{ident}",
                                    tags: options[:tags],
                                    vpc_id: vpc.id
-        
+
         vpc_endpoints_egress = options[:vpc_endpoints_egress]
         if vpc_endpoints_egress.empty?
           default_egress_rule(ident, @security_group)
@@ -102,7 +102,7 @@ module Terrafying
                    type: 'ingress',
                    from_port: from_port(port[:upstream_port]),
                    to_port: to_port(port[:upstream_port]),
-                   protocol: port[:type],
+                   protocol: port[:type] == 'udp' ? 'udp' : 'tcp',
                    self: true
         end
 

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '2.0.1'
+    VERSION = '2.0.6'
   end
 end

data/lib/terrafying/components/vpc.rb

@@ -294,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: 2.0.1
+  version: 2.0.6
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake