terrafying-components 1.6.10 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581f88f142821b376ca14bfbda682eccb11f2b4d738ec4a7731e6c85af0288b1
-  data.tar.gz: b77f1f2b37cd5a5d36f7d0007fdd62b328d572b3b14a6da01f5e73005acd641c
+  metadata.gz: 2c61c3324a1f21c6b8747ce9610f42329edc3d992cca7da6ef9c14fe60027f1a
+  data.tar.gz: 539cd3fd22567b21450819c07818addfb21b6c57f195968483e41fee02849104
 SHA512:
-  metadata.gz: caebbf6aafe2ecb1ce1d2a8213df7fa78cac83e417c001f78a83c96975ebf859a2379a8d1acacaf015e6d8c365bdc3b06315ae6d6c896ee82957c51e0ce3682e
-  data.tar.gz: 653db5fe7907ac055cae87366fd5f90e17ce2b1d3b418b46f7d957546956e15e92c4a9195908deea78a682a94a2e95ec1ec3ec498128fbef38213a1dccad8609
+  metadata.gz: 49d20c389161e93932126d1734d3c3083aba4bb0ad064c7575b7ac1f76cd52038442bc8affead4b9cd9c754787c83975316cd0cdc02594b0b253d840fd0c8c5f
+  data.tar.gz: ac91c4cf37d03e80345aeac4c11eaaa452a1d2529b81b65f2e00ff9215d0595944149f7c3159c82f2a5a626fbf909239bd859dc07227c65bc07f79b4c8b43d89

data/lib/terrafying/components/dynamicset.rb

@@ -107,7 +107,7 @@ module Terrafying
             },
           }.merge(options)
         end
-        tags = { Name: ident, service_name: name,}.merge(options[:tags]).merge(options[:instances][:tags]).map { |k,v| { Key: k, Value: v, PropagateAtLaunch: true }}
+        tags = { Name: ident, service_name: name,}.merge(options[:tags]).merge(options[:instances].fetch(:tags, {})).map { |k,v| { Key: k, Value: v, PropagateAtLaunch: true }}
 
         asg = resource :aws_cloudformation_stack, ident, {
                          name: ident,

data/lib/terrafying/components/endpoint.rb

@@ -32,7 +32,7 @@ module Terrafying
         }.merge(options)
 
         ident = "#{tf_safe(vpc.name)}-#{name}"
-        @name = name
+        @name = ident
 
         if options[:service]
           service_name = options[:service].service_name

data/lib/terrafying/components/loadbalancer.rb

@@ -99,6 +99,9 @@ module Terrafying
                          load_balancer_type: type,
                          internal: !options[:public],
                          subnets: options[:subnets].map(&:id),
+                         subnet_mapping: options[:subnets].map{ |subnet|
+                           {subnet_id: subnet.id}
+                         },
                          tags: options[:tags],
                        }.merge(@type == "application" ? { security_groups: [@security_group] } : {})
 

data/lib/terrafying/components/version.rb

@@ -1,5 +1,5 @@
 module Terrafying
   module Components
-    VERSION = "1.6.10"
+    VERSION = "1.7.0"
   end
 end

data/lib/terrafying/components/vpn.rb

@@ -80,10 +80,11 @@ module Terrafying
         keypairs = []
 
         if has_provider
-          vpn_hash = Digest::SHA2.digest(vpc.name + name + oauth2_provider[:client_secret] + oauth2_provider[:client_id])
-          cookie_secret = Base64.strict_encode64(vpn_hash.byteslice(0,16))
+          vpn_hash = Digest::SHA512.hexdigest(vpc.name + name + oauth2_provider[:client_secret] + oauth2_provider[:client_id])
+          oauth2_provider[:cookie_hash_key]  ||= Base64.strict_encode64(vpn_hash.byteslice(0,64))
+          oauth2_provider[:cookie_block_key] ||= Base64.strict_encode64(vpn_hash.byteslice(64,96))
 
-          units.push(oauth2_proxy_service(oauth2_provider, cookie_secret))
+          units.push(oauth2_proxy_service(oauth2_provider))
         end
 
         if options.has_key?(:ca)
@@ -192,31 +193,22 @@ module Terrafying
         )
       end
 
-      def oauth2_proxy_service(oauth2_provider, cookie_secret)
-        optional_arguments = []
-
-        if oauth2_provider.has_key?(:permit_groups)
-          optional_arguments << "-permit-groups '#{oauth2_provider[:permit_groups].join(",")}'"
-        end
-
+      def oauth2_proxy_service(oauth2_provider)
         Ignition.container_unit(
-          "oauth2_proxy", "quay.io/uswitch/oauth2_proxy:stable",
+          'authnz', 'registry.usw.co/cloud/authnz-http-proxy:0.1',
           {
             host_networking: true,
             arguments: [
-              "-client-id='#{oauth2_provider[:client_id]}'",
-              "-client-secret='#{oauth2_provider[:client_secret]}'",
-              "-email-domain='*'",
-              "-cookie-secret='#{cookie_secret}'",
-              "-provider=#{oauth2_provider[:type]}",
-              "-http-address='0.0.0.0:4180'",
-              "-redirect-url='https://#{@fqdn}/oauth2/callback'",
-              "-upstream='http://localhost:8080'",
-              "-approval-prompt=''",
-              "-cookie-secure",
-              "-pass-access-token=true",
-              "-pass-groups",
-            ] + optional_arguments
+              '--addr=0.0.0.0:4180',
+              '--backend-url=http://localhost:8080',
+              "--oauth-client-id='#{oauth2_provider[:client_id]}'",
+              "--oauth-client-secret='#{oauth2_provider[:client_secret]}'",
+              "--cookie-hash-key='#{oauth2_provider[:cookie_hash_key]}'",
+              "--cookie-block-key=''#{oauth2_provider[:cookie_block_key]}'"
+            ],
+            volumes: [
+              '/usr/share/ca-certificates:/etc/ssl/certs:ro'
+            ]
           }
         )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.7.0
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler