terrafying-components 2.2.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7902e7044571042057afc58eea33ab7fca3487e2eb8e8ee448787365e39c9ed
-  data.tar.gz: 967baf4fea085a5e60eddd66c04c6468d841e469aa76ce28e7df737560324e2d
+  metadata.gz: 3eb7bfb91a4656cc6fdfb225a33c2449190e003a2bbf5555efa33f8e19f2deed
+  data.tar.gz: e89cbf80d6595077531b406aeaaa7adfbc81b50307640da46ce203b8b6a944ab
 SHA512:
-  metadata.gz: 39dc9b962c81d371190faa2160610915b0ce038a2af989edeb060aa5f9efc4794a9e2988b111d06a38d9f7a8e8c8ab45389e48898031fe6a2c51e006fe349fc5
-  data.tar.gz: af961597af0205b3b4eb3dd97e32234ce13dd7936003c2f69286ca40d554cf6d5b61756d753e73ec4419a4aa52170416afe386063f35661157e87d3ef76241d9
+  metadata.gz: e1e67a2338212c3a2bd629061e38afea4284064f6c8ef7200a4500cb1a222a41118cd25d7444685d4de000eeb8b21635cd48efab412094f5c765dd30191e7fc0
+  data.tar.gz: 9d4719fc68fcca1c53655c613607c5d1ddb2cfd884c28888aed8fb42248193412009d09c0d0afc8d4f8aa9b50b4204e8426c403ff2a954c2c298844b75250bb1

data/lib/terrafying/components/dynamicset.rb

@@ -33,7 +33,7 @@ module Terrafying
         options = {
           public: false,
           eip: false,
-          ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
+          ami: aws.ami('base-image-fc-b4b2c239', owners = ['477284023816']),
           instance_type: 't3a.micro',
           instances: { min: 1, max: 1, desired: 1, tags: {} },
           ports: [],
@@ -142,7 +142,7 @@ module Terrafying
                  protocol: -1,
                  prefix_list_ids: prefix_ids
       end
-      
+
       def default_egress_rule(ident, security_group)
         resource :aws_security_group_rule, "#{ident}-default-egress",
                  security_group_id: security_group,

data/lib/terrafying/components/loadbalancer.rb

@@ -131,8 +131,8 @@ module Terrafying
 
           default_action = port.key?(:action) ? port[:action] : forward_to_tg(port, port_ident, port_name, vpc)
 
-          actions.append(default_action)
           actions.append(authenticate_oidc(port[:oidc_config])) if !port[:oidc_config].nil?
+          actions.append(default_action)
 
           ssl_options = alb_certs(port, port_ident)
 

data/lib/terrafying/components/prometheus.rb

@@ -377,7 +377,7 @@ module Terrafying
       def create_thanos_cloudwatch_alert(service)
         service.load_balancer.targets.each_with_index do |target, i|
           cloudwatch_alarm "#{service.name}_#{i}", 'AWS/NetworkELB',
-                           LoadBalancer: output_of('aws_lb', service.load_balancer.name, 'arn_suffix'),
+                           LoadBalancer: output_of('aws_lb', service.load_balancer.name.gsub(%r{^(\d)}, '_\1'), 'arn_suffix'),
                            TargetGroup: target.target_group.to_s.gsub(/id/, 'arn_suffix')
         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-3c48f829', owners = ['477284023816']),
+          ami: aws.ami('base-image-fc-b4b2c239', 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-3c48f829', owners = ['477284023816']),
+          ami: aws.ami('base-image-fc-b4b2c239', 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 = '2.2.1'
+    VERSION = '2.3.3'
   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.2.1
+  version: 2.3.3
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake