terrafying-components 1.15.19 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccc6ca7657f88feaecd7116b68c4138a235f511b3bf24681b2adedcb1edf381
-  data.tar.gz: 3c785c1190cfb6f6200beed0e7b8056aee44df7e89e0c712c648e824eacf4500
+  metadata.gz: 531068834c168dad0b71d0a3c4f4b932a5eed123080e4067dd89d93019c8f44e
+  data.tar.gz: 319ea675df31d948d5c848d770063ba99ee3fe260b693bc33b9b75bdcaa45383
 SHA512:
-  metadata.gz: c661cb8147e8a97672b8b982be89e61de122d60344a1b373c454dd21137f455045ddb433928024a92eab79d310516bc74ba23de12545cd087ca2113adde2bc79
-  data.tar.gz: 646485ad12d4b70b6668c5d885d7e6e94b2bb472b012b4ead4e74e3eddc92f6a1099fdb5b41406385029b187cec5ee564214dd654d507d73b547ac96343021ec
+  metadata.gz: f8f6832c4d666801d7340e57b9c4ca2ef01aee8ade2b0984dc65ca7d4862087181bc677c6fc9695709b9453b825535f38787588a171bf2ac3022ff30e1e062eb
+  data.tar.gz: 0d0e950b58598feb5e552e6be39e7360a7cac0ac7389548515bae45d5dd17070d2c0b985f3a9725c187741faa4dc71c9a36680e8d7dd890526dba9040abc6786

data/lib/terrafying/components/dynamicset.rb

@@ -44,9 +44,12 @@ module Terrafying
           subnets: vpc.subnets.fetch(:private, []),
           depends_on: [],
           rolling_update: :simple,
+          metadata_options: {},
           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/letsencrypt.rb

@@ -345,11 +345,12 @@ module Terrafying
           policy_arn: "${aws_iam_policy.#{@name}_lambda_execution_policy.arn}"
         }
 
-        rand_hour = rand(0..23).to_s
+        alpha_num = generate_alpha_num().to_s
+
         event_rule = resource :aws_cloudwatch_event_rule, "once_per_day", {
           name: "once-per-day",
           description: "Fires once per day",
-          schedule_expression: "cron(0 #{rand_hour} * * ? *)"
+          schedule_expression: "cron(0 #{alpha_num} * * ? *)"
         }
 
         resource :aws_cloudwatch_event_target, "#{@name}_lambda_event_target", {
@@ -368,6 +369,14 @@ module Terrafying
         self
       end
 
+      def generate_alpha_num()
+        result = @name.split("").each do |ch|
+          alpha_num = ch.upcase.ord - 'A'.ord
+          return alpha_num.abs if (alpha_num.abs < 24)
+        end
+        result.is_a?(Integer) ? result : 6
+      end
+
     end
   end
 end

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

@@ -272,6 +272,8 @@ module Terrafying
                 target_label: instance_id
               - source_labels: [__meta_ec2_tag_envoy_cluster]
                 target_label: envoy_cluster
+              - source_labels: [__meta_ec2_tag_service_name]
+                target_label: service_name
             <%- end -%>
             <%- @prometheus_additional_scrape_configs.each do |conf| -%>
             <%= conf %>

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: {},
           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/version.rb

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