terrafying-components 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed9e1ca845d8806f8a66b55a0c24b7659d75f9927fb8963bce56565c5d324ef
-  data.tar.gz: '09e2d9661b9a2041a62ca36bb3251962eef12af484499fe6a0cea649a7d83c26'
+  metadata.gz: 531068834c168dad0b71d0a3c4f4b932a5eed123080e4067dd89d93019c8f44e
+  data.tar.gz: 319ea675df31d948d5c848d770063ba99ee3fe260b693bc33b9b75bdcaa45383
 SHA512:
-  metadata.gz: b3655d57e5bfcf6efe36a8cf2bc8b8b6bf384721435bf10f5beb457cdf3f344e7a3ae7ea244a81a24441e72a183cf472b5ef6dd274a7aa866e259f2cacd363e8
-  data.tar.gz: a8b13ddd1d36a9d8d5b9fbcf99345fb3ac4093af16d4711664dae80772a2a8aa0623595d2950d7c4d9c0b8f1f358b5660843ad65cabf75dfa0d7ed0682df1827
+  metadata.gz: f8f6832c4d666801d7340e57b9c4ca2ef01aee8ade2b0984dc65ca7d4862087181bc677c6fc9695709b9453b825535f38787588a171bf2ac3022ff30e1e062eb
+  data.tar.gz: 0d0e950b58598feb5e552e6be39e7360a7cac0ac7389548515bae45d5dd17070d2c0b985f3a9725c187741faa4dc71c9a36680e8d7dd890526dba9040abc6786

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

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