terrafying-components 1.15.17 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076d1f76b139a10611bd8191d51e94bd64db67b76cfd726389a407475e40b1ec
-  data.tar.gz: ca690618063e33c220397c11384d44270a57e501d54d1834a2760721b1f7c379
+  metadata.gz: 71540ce13f2a767a6cd4473c6dbac6bbac39b8e3c3c513d9b7dd70fb48150263
+  data.tar.gz: fe1fb4871f8b7147bdc98a0e73e7a057b4063ddfccccd0202c6791a3faf959fd
 SHA512:
-  metadata.gz: f1f31265fa0a955b0054466c2bcd1e3190472141a2befc4fce844841d6a54e5da575ea87581b99972b8501f3379e067688815c2738fd031c68f11574225340e0
-  data.tar.gz: 77693345e3e878349545c85acfaee455be35a27f587ca11eee740c9ef15e6d03728aae2c4c8ae080b06169d33e17a695dfc6455bfa1c4b5d0a40053ca5d87125
+  metadata.gz: 71da83d4a07e356c104eaf6cce633e8b118c38ae4b5e5952c6c20b81a57ff738c60e35253b5ef910a7b67b143c9615c93bb05b3fde80af26e5d060ba63f9d944
+  data.tar.gz: 18f9aac3085b00129c5d94ff2bcbc11e501af5bbac428ba2125ec32adfdcc8d55cd675773ccca78b3da4c9edcfa7ad3f9e7cefe0f7262cce4416474abd5e6acd

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,8 +36,14 @@ module Terrafying
           instance_profile: nil,
           ports: [],
           tags: {},
-          security_groups: [],
-          depends_on: []
+          security_groups: nil,
+          metadata_options: nil,
+          depends_on: nil,
+          ipv6_cidr_blocks: nil,
+          prefix_list_ids: nil,
+          security_groups: nil,
+          self: nil,
+          description: nil,
         }.merge(options)
 
         ident = "#{tf_safe(vpc.name)}-#{name}"
@@ -55,7 +61,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: options[:ipv6_cidr_blocks],
+                                       prefix_list_ids: options[:prefix_list_ids],
+                                       security_groups: options[:security_groups],
+                                       self: options[:self],
+                                       description: options[:description]
                                      }
                                    ]
 
@@ -99,6 +110,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

@@ -172,7 +172,7 @@ module Terrafying
         cert_options = {}
         cert_options[:recursive_nameservers] = ['1.1.1.1:53', '8.8.8.8:53', '8.8.4.4:53'] if @use_external_dns
 
-        @renewing ? min_days_remaining = 0 : min_days_remaining = 21
+        @renewing ? min_days_remaining = -1 : min_days_remaining = 21
         # we don't want Terraform to renew certs if the certbot lambda is provisioned
         ctx.resource :acme_certificate, key_ident, {
                      provider: @acme_provider[:ref],
@@ -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,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest'
+require 'digest/bubblebabble'
 require 'terrafying/components/usable'
 require 'terrafying/generator'
 
@@ -217,7 +217,7 @@ module Terrafying
 
       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
+        return Digest::SHA256.bubblebabble(gen_id)[0..15] if @hex_ident || gen_id.size > 26
 
         gen_id[0..31]
       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

@@ -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.17'
+    VERSION = '2.0.0'
   end
 end

data/lib/terrafying/components/vpc.rb

@@ -184,7 +184,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 +197,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.15.17
+  version: 2.0.0
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-08-25 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