terrafying-components 1.15.17 → 1.15.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076d1f76b139a10611bd8191d51e94bd64db67b76cfd726389a407475e40b1ec
-  data.tar.gz: ca690618063e33c220397c11384d44270a57e501d54d1834a2760721b1f7c379
+  metadata.gz: d316b2043928098181d2869b5eb0c598294373460c88874387d348b0e3ce5a9b
+  data.tar.gz: cc7d8f5f1d02ae0acfc880f15bb08a299a16e2862ce796c6e62c457e3d7dc4e4
 SHA512:
-  metadata.gz: f1f31265fa0a955b0054466c2bcd1e3190472141a2befc4fce844841d6a54e5da575ea87581b99972b8501f3379e067688815c2738fd031c68f11574225340e0
-  data.tar.gz: 77693345e3e878349545c85acfaee455be35a27f587ca11eee740c9ef15e6d03728aae2c4c8ae080b06169d33e17a695dfc6455bfa1c4b5d0a40053ca5d87125
+  metadata.gz: d90390f4fbc8d59e4cb5c8ccaa74a184e4a328886b79d17a3b609b41b1d2c88ecc3862e5c79bc6ffc4d84fe92e9e09797baaf54a441a97da4d258cdf63353899
+  data.tar.gz: 55805bb43972b03d550c6d1b40608209b4f64cad8c4cd160ef69274f7684fa9431c02e7de2fc8b68d60231e3db263613583659ef841b1a6a55150186ded0921c

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: [],

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/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: [{}],

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: [],

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '1.15.17'
+    VERSION = '1.15.22'
   end
 end

metadata

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