terrafying-components 2.0.10 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d751cc6be7a7a3a29dd3e588cc120ec3fa1d8b3ea3b0155888551d4c74a0f6d
-  data.tar.gz: a55c971cf8196a9ce42f3ae5b57d35219aa1b7d6e42a0b43107866095a1a4621
+  metadata.gz: 966a2db3106bd2897d8d98e26424ebb11d081e38b2108c4f7b52e29bc0fc359e
+  data.tar.gz: c131b8d1b401ca16e9b8f91caaac38c4fd667358c2498d1e751013ccdd5b1f4d
 SHA512:
-  metadata.gz: c2b2a37884426731df2c879547a3df0bf314e1314f2ec52c706606082b53520c0170cfdcfbfc64e1a3faf3c6bb720f2a76c2fcc74f106436d9f28f4030b4cc63
-  data.tar.gz: 4222b381c2056081c80c1a47f03376921e361129ff00979614ca52fbb6464934a565661778ba66ff4ff6bf7b73e71422b1221546ea3e73c5fa5cc3be4f1780a6
+  metadata.gz: dde0b6a2dff50531997882ce8dcda4ef5a2de1bebd9b4ca2a3f67ff70943ba326b56a6bbeade8b778b84a8e63e3bb54f5c685aa69bef2132743458050720e41c
+  data.tar.gz: 6364ccaab02c6192761247c4775127625f33a1bbb7363d4bd77ee22b36a2aac4952ea76922572d514c4c2adc8b57bc01533359c120feba34160b5da4da91cefb

data/lib/terrafying/components/letsencrypt.rb

@@ -47,7 +47,16 @@ module Terrafying
           curve: 'P384',
           rsa_bits: '3072',
           use_external_dns: false,
-          renewing: false
+          renewing: false,
+          renew_alert_options: {
+            protocol: nil,
+            endpoint: nil,
+            endpoint_auto_confirms: false,
+            confirmation_timeout_in_minutes: 1,
+            raw_message_delivery: false,
+            filter_policy: nil,
+            delivery_policy: nil
+          }
         }.merge(options)
 
         @name = name
@@ -56,9 +65,11 @@ module Terrafying
         @acme_provider = @acme_providers[options[:provider]]
         @use_external_dns = options[:use_external_dns]
         @renewing = options[:renewing]
+        @renew_alert_options = options[:renew_alert_options]
         @prefix_path = [@prefix, @name].reject(&:empty?).join("/")
 
         renew() if @renewing
+        renew_alert() if @renew_alert_options[:endpoint] != nil
 
         provider :tls, {}
 
@@ -324,7 +335,7 @@ module Terrafying
               )
             }
 
-        lamda_function = resource :aws_lambda_function, "#{@name}_lambda", {
+        lambda_function = resource :aws_lambda_function, "#{@name}_lambda", {
           function_name: "#{@name}_lambda",
           s3_bucket: "uswitch-certbot-lambda",
           s3_key: "certbot-lambda.zip",
@@ -355,20 +366,60 @@ module Terrafying
 
         resource :aws_cloudwatch_event_target, "#{@name}_lambda_event_target", {
           rule: event_rule["name"],
-          target_id: lamda_function["id"],
-          arn: lamda_function["arn"]
+          target_id: lambda_function["id"],
+          arn: lambda_function["arn"]
         }
 
         resource :aws_lambda_permission, "allow_cloudwatch_to_invoke_#{@name}_lambda", {
           statement_id: "AllowExecutionFromCloudWatch",
           action: "lambda:InvokeFunction",
-          function_name: lamda_function["function_name"],
+          function_name: lambda_function["function_name"],
           principal: "events.amazonaws.com",
           source_arn: event_rule["arn"]
         }
         self
       end
 
+      def renew_alert
+        topic = resource :aws_sns_topic, "#{@name}_lambda_cloudwatch_topic", {
+                 name: "#{@name}_lambda_cloudwatch_topic"
+        }
+
+        alarm = resource :aws_cloudwatch_metric_alarm, "#{@name}_lambda_failure_alarm", {
+                 alarm_name: "#{@name}-lambda-failure-alarm",
+                 comparison_operator: "GreaterThanOrEqualToThreshold",
+                 evaluation_periods: "1",
+                 period: "300",
+                 metric_name: "Errors",
+                 namespace: "AWS/Lambda",
+                 threshold: 1,
+                 statistic: "Maximum",
+                 alarm_description: "Alert generated if the #{@name} certbot lambda fails execution",
+                 actions_enabled: true,
+                 dimensions: {
+                           FunctionName: "${aws_lambda_function.#{@name}_lambda.function_name}"
+                         },
+                 alarm_actions: [
+                           "${aws_sns_topic.#{@name}_lambda_cloudwatch_topic.arn}"
+                         ],
+                 ok_actions: [
+                          "${aws_sns_topic.#{@name}_lambda_cloudwatch_topic.arn}"
+                        ]
+        }
+
+        subscription = resource :aws_sns_topic_subscription, "#{@name}_lambda_cloudwatch_subscription", {
+                 topic_arn: "${aws_sns_topic.#{@name}_lambda_cloudwatch_topic.arn}",
+                 protocol: @renew_alert_options[:protocol],
+                 endpoint: @renew_alert_options[:endpoint],
+                 endpoint_auto_confirms: @renew_alert_options[:endpoint_auto_confirms],
+                 confirmation_timeout_in_minutes: @renew_alert_options[:confirmation_timeout_in_minutes],
+                 raw_message_delivery: @renew_alert_options[:raw_message_delivery],
+                 filter_policy: @renew_alert_options[:filter_policy],
+                 delivery_policy: @renew_alert_options[:delivery_policy]
+        }
+        self
+      end
+
       def generate_alpha_num()
         result = @name.split("").each do |ch|
           alpha_num = ch.upcase.ord - 'A'.ord

data/lib/terrafying/components/loadbalancer.rb

@@ -127,15 +127,20 @@ module Terrafying
           port_ident = "#{ident}-#{port[:downstream_port]}"
           port_name = "#{@name}-#{port[:downstream_port]}"
 
+          actions = []
+
           default_action = port.key?(:action) ? port[:action] : forward_to_tg(port, port_ident, port_name, vpc)
 
+          actions.append(authenticate_oidc(port[:oidc_config])) if !port[:oidc_config].nil?
+          actions.append(default_action)
+
           ssl_options = alb_certs(port, port_ident)
 
           listener = resource :aws_lb_listener, port_ident, {
             load_balancer_arn: @id,
             port: port[:upstream_port],
             protocol: port[:type].upcase,
-            default_action: default_action
+            default_action: actions
           }.merge(ssl_options)
 
           register_target(default_action[:target_group_arn], listener) if default_action[:type] == 'forward'
@@ -163,6 +168,13 @@ module Terrafying
         }
       end
 
+      def authenticate_oidc(oidc_config)
+        {
+          type: "authenticate-oidc",
+          authenticate_oidc: oidc_config
+        }
+      end
+
       def register_target(target_group, listener)
         @targets << Struct::Target.new(
           target_group: target_group,

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '2.0.10'
+    VERSION = '2.3.0'
   end
 end

data/lib/terrafying/components/vpn_oidc.rb

@@ -268,7 +268,7 @@ module Terrafying
         optional_volumes << "/etc/ssl/#{ca.name}:/etc/ssl/#{ca.name}" if ca
 
         Ignition.container_unit(
-          'openvpn-authz', 'quay.io/uswitch/openvpn-authz:2.1',
+          'openvpn-authz', 'quay.io/uswitch/openvpn-authz:2.2',
           volumes: optional_volumes + [
             '/etc/ssl/openvpn:/etc/ssl/openvpn',
             '/var/openvpn-authz:/var/openvpn-authz'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.3.0
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake