terrafying-components 1.15.15 → 1.15.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47ff832fe6acbc3c4a2c849343764ca639cd8dd12f1c47da8573d9b9fc84df7
-  data.tar.gz: 05ee869beba117a59c1a5deb099489ae644e4d0d704a001d2d2abfc1ad87b3b8
+  metadata.gz: 93ddc1613e400a2c1329f9a16b841a55c4d6a03c891b17142181b30c737362f4
+  data.tar.gz: dd0aa20ef92b59ec1acd56d7cc377f645ec11b81b013ef55137b2d07986c253d
 SHA512:
-  metadata.gz: dfc052451cb8a9ff62df661d5e911039238c7d6be63604b7295a8224a23638f0e2e556fb4541121ef4a1dc9120582bcb13b7a11594eb9e524caf61a781987ccd
-  data.tar.gz: cd59d58cb636734fbd4ec20011ff07aebe42d806e1eaa54f36070b86392f0b9deba66b0255023b9a36179cdecfc7e5b702b1de15809a766deb405dd42fc3948a
+  metadata.gz: 0ce7ce6a50d2c9f82b8af20985ede1c8b5ee61c5eaeda1a07ece9b15ab59250d266c9178dc8b34d492b11987d30513125cbef347dd24bddc01a58c4d179b54d1
+  data.tar.gz: f5ba7a5db85c1ddcf12a1d387bcd7792aeba3fa6d4b8fcaffab74ed768a7a72671c9aa61a3ff99f79966a97f1b6ddc4091b3a3fda1ef8a3a89cd59501c34b163

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
@@ -271,6 +273,9 @@ module Terrafying
               - source_labels: [__meta_ec2_tag_envoy_cluster]
                 target_label: envoy_cluster
             <%- end -%>
+            <%- @prometheus_additional_scrape_configs.each do |conf| -%>
+            <%= conf %>
+            <%- end -%>
           END
         }
       end

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '1.15.15'
+    VERSION = '1.15.20'
   end
 end

data/lib/terrafying/components/vpn_oidc.rb

@@ -48,7 +48,7 @@ module Terrafying
         units: [],
         tags: {},
         service_options: {},
-        openvpn_image: 'kylemanna/openvpn:2.4'
+        openvpn_image: 'quay.io/uswitch/openvpn:2.4.8'
       )
         super()
         @vpc = vpc
@@ -209,7 +209,7 @@ module Terrafying
             [Unit]
             Description=Monitor the file for changes
             [Path]
-            PathChanged=/etc/ssl/#{@ca.name}
+            PathChanged=/etc/ssl/#{@ca.name}/#{@fqdn}/cert
             Unit=restart-openvpn-authz.service
             [Install]
             WantedBy=multi-user.target

metadata

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