terrafying-components 2.0.0 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71540ce13f2a767a6cd4473c6dbac6bbac39b8e3c3c513d9b7dd70fb48150263
-  data.tar.gz: fe1fb4871f8b7147bdc98a0e73e7a057b4063ddfccccd0202c6791a3faf959fd
+  metadata.gz: 82d21aa59af747b2463c10fab573348d579483f2e6f6ce78e8632d2accaacc7c
+  data.tar.gz: 0bbb3d8b15e0089e2f81e217a869337cc0081f6563bee2290861b1c711619a1f
 SHA512:
-  metadata.gz: 71da83d4a07e356c104eaf6cce633e8b118c38ae4b5e5952c6c20b81a57ff738c60e35253b5ef910a7b67b143c9615c93bb05b3fde80af26e5d060ba63f9d944
-  data.tar.gz: 18f9aac3085b00129c5d94ff2bcbc11e501af5bbac428ba2125ec32adfdcc8d55cd675773ccca78b3da4c9edcfa7ad3f9e7cefe0f7262cce4416474abd5e6acd
+  metadata.gz: f17fc4428503038066f3a9287be5d1d5a34a109d6812cd116999bf680e320fa8387603d49cd1060a5dae3f60c374a2f4b16beaa9ee20a54968b4b89ee93b5312
+  data.tar.gz: a9343d58ca92d4d5595bbbef4139a4c9159a32105bc0fe0f70941d27117f6d53bb166f2e3ad6d51790db228db736795b06594d1101fa4e9a69621d5a70073b14

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/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.0'
+    VERSION = '2.0.5'
   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
@@ -243,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'
@@ -293,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.0
+  version: 2.0.5
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake