terrafying-components 2.0.7 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d27dba45000471cefaca8b0bb650380123f1ccdbdf52adc240689e4b260533d3
-  data.tar.gz: 9bc0cfa749d0060ff0f9213a12baa661e4c6383bc2d256fb4daea225a4c7cfc8
+  metadata.gz: 4c81c09c0e80313520196667c51e90d2341d085b7e1811ca355db7788d2584e3
+  data.tar.gz: baa1f3a03f45384b9563605849336af96fa0b529052fa5fbec55f31e63d27017
 SHA512:
-  metadata.gz: 17044b38860633249fd30a06ceff2c7db97cd8570900fa53c813cc2efd8fbd99463b3650f60180b0d181156ca11331394da1db89d8afaaea7321605c4e80b201
-  data.tar.gz: 0b5f7e9f9c23c4478d2255686de6e8412713b8ef36b5295b2955187be2978064e338c6f910c6220bf3611b3b1e4aa3a34da66ceaeb9b271373f18d2231f963dc
+  metadata.gz: 53189ee367e6cd7ebcbac7abb10228c2dc66b106ee87ace03dba1c52efa2292ea8c8db9cf63aa3b5e865af27c6044407b83cc2dec295b2b960eba8e20a1a96f6
+  data.tar.gz: 965e49137abe71f08b6d593004b7aa92b65e73551a97844be3e111af7456daf6df33da0e5b156bb8984d16c9e0f0cac433aaacd6ce669f88eaa02be53498329a

data/lib/terrafying/components/dynamicset.rb

@@ -163,7 +163,7 @@ module Terrafying
 
       def attach_load_balancer(load_balancer)
         load_balancer.targets.each.with_index do |target, i|
-          resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}",
+          resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}".gsub(%r{^(\d)}, '_\1'),
                    autoscaling_group_name: @asg,
                    alb_target_group_arn: target.target_group
         end
@@ -173,13 +173,14 @@ module Terrafying
 
       def autoscale_on_load_balancer(load_balancer, target_value:, disable_scale_in:)
         load_balancer.targets.each.with_index do |target, i|
+          policy_ident = "#{load_balancer.name}-#{@name}-#{i}".gsub(%r{^(\d)}, '_\1')
           policy_name = "#{load_balancer.name}-#{@name}-#{i}"
           lb_arn = load_balancer.id.to_s.gsub(/id/, 'arn_suffix')
           tg_arn = target.target_group.to_s.gsub(/id/, 'arn_suffix')
           listener = "aws_lb_listener.#{target.listener.to_s.split('.')[1]}"
-          autoscaling_attachment = "aws_autoscaling_attachment.#{policy_name}"
+          autoscaling_attachment = "aws_autoscaling_attachment.#{policy_ident}"
 
-          resource :aws_autoscaling_policy, policy_name,
+          resource :aws_autoscaling_policy, policy_ident,
                    name: policy_name,
                    autoscaling_group_name: @asg,
                    policy_type: 'TargetTrackingScaling',

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,59 @@ 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,
+                 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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'digest/bubblebabble'
 require 'terrafying/components/usable'
 require 'terrafying/generator'
 require 'digest'
@@ -36,14 +35,15 @@ module Terrafying
         rescue StandardError
           @type = 'application'
           ident = make_identifier(@type, vpc.name, name)
+          name = make_name(@type, vpc.name, name)
 
-          lb = aws.lb_by_name(ident)
+          lb = aws.lb_by_name(name)
 
-          @security_group = aws.security_group_by_tags(loadbalancer_name: ident)
+          @security_group = aws.security_group_by_tags(loadbalancer_name: name)
         end
 
         @id = lb.load_balancer_arn
-        @name = ident
+        @name = name
 
         target_groups = aws.target_groups_by_lb(@id)
 
@@ -93,14 +93,14 @@ module Terrafying
         @type = l4_ports.count == 0 ? 'application' : 'network'
 
         ident = make_identifier(@type, vpc.name, name)
-        @name = ident
+        @name = make_name(@type, vpc.name, name)
 
         if application?
           @security_group = resource :aws_security_group, ident,
-                                     name: "loadbalancer-#{ident}",
-                                     description: "Describe the ingress and egress of the load balancer #{ident}",
+                                     name: "loadbalancer-#{@name}",
+                                     description: "Describe the ingress and egress of the load balancer #{@name}",
                                      tags: @tags.merge(
-                                       loadbalancer_name: ident
+                                       loadbalancer_name: @name
                                      ),
                                      vpc_id: vpc.id
 
@@ -112,7 +112,7 @@ module Terrafying
         end
 
         @id = resource :aws_lb, ident, {
-          name: ident,
+          name: @name,
           load_balancer_type: type,
           internal: !options[:public],
           tags: @tags
@@ -125,8 +125,14 @@ module Terrafying
 
         @ports.each do |port|
           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)
 
-          default_action = port.key?(:action) ? port[:action] : forward_to_tg(port, port_ident, vpc)
+          actions.append(default_action)
+          actions.append(authenticate_oidc(port[:oidc_config])) if !port[:oidc_config].nil?
 
           ssl_options = alb_certs(port, port_ident)
 
@@ -134,7 +140,7 @@ module Terrafying
             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'
@@ -148,9 +154,9 @@ module Terrafying
         self
       end
 
-      def forward_to_tg(port, port_ident, vpc)
+      def forward_to_tg(port, port_ident, port_name, vpc)
         target_group = resource :aws_lb_target_group, port_ident, {
-          name: port_ident,
+          name: port_name,
           port: port[:downstream_port],
           protocol: port[:type].upcase,
           vpc_id: vpc.id
@@ -162,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,
@@ -215,17 +228,16 @@ module Terrafying
         set.autoscale_on_load_balancer(self, target_value: target_value, disable_scale_in: disable_scale_in)
       end
 
-      def make_identifier(type, vpc_name, name)
+      def make_name(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
 
-        gen_id = "#{type}-#{vpc_name}-#{name}"
-        hex = Digest::SHA2.hexdigest(gen_id)[0..24]
-        if hex[0..0] =~ /[a-z]/
-            return hex if @hex_ident || gen_id.size > 26
-        else return Digest::SHA256.bubblebabble(gen_id)[0..15]
-          end
-    
         gen_id[0..31]
       end
+
+      def make_identifier(type, vpc_name, name)
+        make_name(type, vpc_name, name).gsub(%r{^(\d)}, '_\1')
+      end
     end
   end
 end

data/lib/terrafying/components/prometheus.rb

@@ -20,7 +20,7 @@ module Terrafying
       def initialize(
         vpc:,
         thanos_name: 'thanos',
-        thanos_version: 'v0.10.1',
+        thanos_version: 'v0.17.2',
         prom_name: 'prometheus',
         prom_version: 'v2.23.0',
         instances: 2,

data/lib/terrafying/components/security/trail.rb

@@ -120,7 +120,7 @@ module Terrafying
                                                "logs:CreateLogStream"
                                              ],
                                              Resource: [
-                                               @log_group["arn"],
+                                               "#{@log_group["arn"]}:*",
                                              ]
                                            },
                                            {
@@ -130,7 +130,7 @@ module Terrafying
                                                "logs:PutLogEvents"
                                              ],
                                              Resource: [
-                                               @log_group["arn"],
+                                               "#{@log_group["arn"]}:*",
                                              ]
                                            }
                                          ]
@@ -152,7 +152,7 @@ module Terrafying
                      enable_log_file_validation: true,
                      kms_key_id: store.key_arn,
 
-                     cloud_watch_logs_group_arn: @log_group["arn"],
+                     cloud_watch_logs_group_arn: "#{@log_group["arn"]}:*",
                      cloud_watch_logs_role_arn: log_role["arn"],
 
                      event_selector: [

data/lib/terrafying/components/service.rb

@@ -170,7 +170,7 @@ module Terrafying
         prom = Prometheus.find_in(vpc: vpc)
         ports.each do |port|
           sg_rule_ident = Digest::SHA256.hexdigest("#{vpc.name}-#{port}-#{security_group}-#{prom.security_group}")
-          resource :aws_security_group_rule, sg_rule_ident,
+          resource :aws_security_group_rule, sg_rule_ident.gsub(%r{^(\d)}, '_\1'),
                    security_group_id: security_group,
                    type: 'ingress',
                    from_port: port,

data/lib/terrafying/components/staticset.rb

@@ -161,7 +161,7 @@ module Terrafying
 
       def attach_load_balancer(load_balancer)
         @instances.product(load_balancer.targets).each.with_index do |(instance, target), i|
-          resource :aws_lb_target_group_attachment, "#{load_balancer.name}-#{@name}-#{i}",
+          resource :aws_lb_target_group_attachment, "#{load_balancer.name}-#{@name}-#{i}".gsub(%r{^(\d)}, '_\1'),
                    target_group_arn: target.target_group,
                    target_id: instance.id
         end

data/lib/terrafying/components/usable.rb

@@ -16,7 +16,7 @@ module Terrafying
       end
 
       def path_mtu_setup!
-        resource :aws_security_group_rule, "#{@name}-path-mtu",
+        resource :aws_security_group_rule, "#{@name}-path-mtu".gsub(%r{^(\d)}, '_\1'),
                  security_group_id: egress_security_group,
                  type: 'ingress',
                  protocol: 1, # icmp
@@ -42,7 +42,7 @@ module Terrafying
           cidr_ident = cidr.tr('./', '-')
 
           @ports.select(&block).map do |port|
-            resource :aws_security_group_rule, "#{@name}-to-#{cidr_ident}-#{port[:name]}",
+            resource :aws_security_group_rule, "#{@name}-to-#{cidr_ident}-#{port[:name]}".gsub(%r{^(\d)}, '_\1'),
                      security_group_id: ingress_security_group,
                      type: 'ingress',
                      from_port: from_port(port[:upstream_port]),
@@ -92,7 +92,7 @@ module Terrafying
       def used_by(*other_resources, &block)
         other_resources.map do |other_resource|
           @ports.select(&block).map.map do |port|
-            resource :aws_security_group_rule, "#{@name}-to-#{other_resource.name}-#{port[:name]}",
+            resource :aws_security_group_rule, "#{@name}-to-#{other_resource.name}-#{port[:name]}".gsub(%r{^(\d)}, '_\1'),
                      security_group_id: ingress_security_group,
                      type: 'ingress',
                      from_port: from_port(port[:upstream_port]),
@@ -100,7 +100,7 @@ module Terrafying
                      protocol: port[:type] == 'udp' ? 'udp' : 'tcp',
                      source_security_group_id: other_resource.egress_security_group
 
-            resource :aws_security_group_rule, "#{other_resource.name}-to-#{@name}-#{port[:name]}",
+            resource :aws_security_group_rule, "#{other_resource.name}-to-#{@name}-#{port[:name]}".gsub(%r{^(\d)}, '_\1'),
                      security_group_id: other_resource.egress_security_group,
                      type: 'egress',
                      from_port: from_port(port[:downstream_port]),

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '2.0.7'
+    VERSION = '2.2.0'
   end
 end

metadata

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