terrafying-components 1.15.18 → 1.15.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7cd1e590b1cbd1863be5d56aa2af4735497e4796d38042aa26e118a447e6bd
-  data.tar.gz: 44ac80ad5a1b33da21125fef0aab38dd9f23414e2da3e1cc3687fd85c855fe0a
+  metadata.gz: 38c0abb6c26db58962498dbf9d7972f882961b3eea7ae15ea9e751006a20a8ec
+  data.tar.gz: eb67dc1708c7ea17c0ad765f497f880355f34ef66f24b6065db42a5508a400ad
 SHA512:
-  metadata.gz: 33bb4d1e48210e0e3c34c6d130a2b5ca15ec25ec99977800786d5c1f6a525466b580d63ed6a0bd7eb4be400d58b997f752ee4a1626afdc3e32501f1e777b108f
-  data.tar.gz: 4881b7a5098f49eb191728a616af830513a68bb213af6d0803cf42028fc5322fa57b51b7d2c87bd9a4a4ec094c0f23e3b6b6632e3c8e76a6a2cf1f66d880e412
+  metadata.gz: 68441af54da4b7245890c814210046a19907b359a2001f44213db873a1eea9c0081aa2b04371545887765c5859bd241edf2488d8b3c5b1222e81e91c05ef263c
+  data.tar.gz: 7e864776191dda38e812051ce5c2ee74cce3ae8a6de474698b57057ea77328c611475706c3619e14c5b522037b0b8615d94520fe0f6616ff864d2bd1d3ec3b9c

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,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/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

@@ -28,7 +28,8 @@ module Terrafying
         thanos_instance_type: 't3a.small',
         prometheus_tsdb_retention: '1d',
         prometheus_data_dir: '/var/lib/prometheus',
-        prometheus_data_size: 20
+        prometheus_data_size: 20,
+        prometheus_additional_scrape_configs: []
       )
         super()
         @vpc = vpc
@@ -42,6 +43,7 @@ module Terrafying
         @prometheus_tsdb_retention = prometheus_tsdb_retention
         @prometheus_data_dir = prometheus_data_dir
         @prometheus_data_size = prometheus_data_size
+        @prometheus_additional_scrape_configs = prometheus_additional_scrape_configs
       end
 
       def find
@@ -270,6 +272,11 @@ 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 %>
             <%- 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,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: [],
@@ -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 = '1.15.18'
+    VERSION = '1.15.23'
   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.18
+  version: 1.15.23
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: xxhash
   requirement: !ruby/object:Gem::Requirement