terrafying-components 1.15.19 → 1.15.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccc6ca7657f88feaecd7116b68c4138a235f511b3bf24681b2adedcb1edf381
-  data.tar.gz: 3c785c1190cfb6f6200beed0e7b8056aee44df7e89e0c712c648e824eacf4500
+  metadata.gz: 065624fa7820b9041d5b8197c725d6d28b31e8d1a305e0ea5392ae5dc34249ea
+  data.tar.gz: 65f410d981a749ec65c5108ac4b96a9abe58f30f193251f606f1d9a7baafe799
 SHA512:
-  metadata.gz: c661cb8147e8a97672b8b982be89e61de122d60344a1b373c454dd21137f455045ddb433928024a92eab79d310516bc74ba23de12545cd087ca2113adde2bc79
-  data.tar.gz: 646485ad12d4b70b6668c5d885d7e6e94b2bb472b012b4ead4e74e3eddc92f6a1099fdb5b41406385029b187cec5ee564214dd654d507d73b547ac96343021ec
+  metadata.gz: 3f8a4922ae67518c2387aa118bcf4ad094677cb6dd7f91e4d862072ccd177fe46547388f258c53b32e1224d3c77960b7dd3a56f2376265c2227a280f7d8eb045
+  data.tar.gz: f92cc6b8f795495c280b10f141e1c78a3c3b5b814c22ae9c4b02d85c9b82589dd4756f19e0017b10dc912a57d52ccd366c894b49076e695b17cd0717285e80c5

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

@@ -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

@@ -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

@@ -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

@@ -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.19'
+    VERSION = '1.15.25'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.15.19
+  version: 1.15.25
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake