terrafying-components 1.10.9 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f303a8423e640bee21733b0638918e7b0d69632267152a88d2ab56cb847bb0
-  data.tar.gz: 4c3f72e5c0ecb118b810ee8d86e1fd0f2d7c5fac4350c0e6e33f493b35dc6a2a
+  metadata.gz: 73d7a37c078d36a198f7fa4c962b0efc1866c2372e178d4aa4011ffaff9e83f5
+  data.tar.gz: f14456cf4ae27f2f04a3b1a1263911a01ba05d3e8e329130c6b19eb0a50a330e
 SHA512:
-  metadata.gz: 910f76257a39752b18a32569c9d5b46e606c33d6a1c202182305a1e0be32b69a93534373443e7c43209603221d0c95457e818e0b0b7852c3fbe9bb8d6db706ef
-  data.tar.gz: d01cba41b034310a476ec794748a61aee42a61b9b1a62d52260455479e2bbeee12bb94bf479a8a5dfd14519736fa3eb9e08c82a199ebe07dbb949d82cfea4cd2
+  metadata.gz: e7866109fc417b67150e1c607564039e78a6bc87b6901ed6cb430c5e9d09b086c56768eafdba7c40bb9f25e16285206449d9a15bb929e85f4e02e08dc5551cdc
+  data.tar.gz: e824409c34d34389993c87f89ff68880172f15e1e86f60b7660cde2e7a019f20da453a3580a1b922ce499897578e80519ad473376b7258893f241b4a99f3eba8

data/lib/terrafying/components/ca.rb

@@ -9,9 +9,11 @@ module Terrafying
         create_keypair_in(self, name, options)
       end
 
-      def reference_keypair(ctx, name)
-        key_ident = "#{@name}-#{tf_safe(name)}"
+      def path(object)
+        output_of(:aws_s3_bucket_object, object, :bucket).to_s + output_of(:aws_s3_bucket_object, object, :key).to_s
+      end
 
+      def reference_keypair(ctx, name, key, cert)
         ref = {
           name: name,
           ca: self,
@@ -20,12 +22,12 @@ module Terrafying
             key: File.join("/etc/ssl", @name, name, "key"),
           },
           source: {
-            cert: File.join("s3://", @bucket, @prefix, @name, name, "cert"),
-            key: File.join("s3://", @bucket, @prefix, @name, name, "key"),
+            cert: File.join("s3://", path(cert)),
+            key: File.join("s3://", path(key)),
           },
           resources: [
-            "aws_s3_bucket_object.#{key_ident}-key",
-            "aws_s3_bucket_object.#{key_ident}-cert"
+            "aws_s3_bucket_object.#{key}",
+            "aws_s3_bucket_object.#{cert}"
           ],
           iam_statement: {
             Effect: "Allow",
@@ -34,9 +36,9 @@ module Terrafying
               "s3:GetObject",
             ],
             Resource: [
-              "arn:aws:s3:::#{File.join(@bucket, @prefix, @name, "ca.cert")}",
-              "arn:aws:s3:::#{File.join(@bucket, @prefix, @name, name, "cert")}",
-              "arn:aws:s3:::#{File.join(@bucket, @prefix, @name, name, "key")}",
+              "arn:aws:s3:::#{path(@name + '-cert')}",
+              "arn:aws:s3:::#{path(cert)}",
+              "arn:aws:s3:::#{path(key)}",
             ]
           }
         }

data/lib/terrafying/components/dynamicset.rb

@@ -103,14 +103,16 @@ module Terrafying
         end
         tags = { Name: ident, service_name: name,}.merge(options[:tags]).merge(options[:instances].fetch(:tags, {})).map { |k,v| { Key: k, Value: v, PropagateAtLaunch: true }}
 
-        @stack = resource :aws_cloudformation_stack, ident, {
-                          name: ident,
-                          disable_rollback: true,
-                          template_body: generate_template(
-                            options[:health_check], options[:instances], launch_config,
-                            options[:subnets].map(&:id), tags, options[:rolling_update]
-                          ),
-                        }
+        resource :aws_cloudformation_stack, ident, {
+                   name: ident,
+                   disable_rollback: true,
+                   template_body: generate_template(
+                     options[:health_check], options[:instances], launch_config,
+                     options[:subnets].map(&:id), tags, options[:rolling_update]
+                   ),
+                 }
+
+        @stack = "arn:aws:cloudformation:#{aws.region}:#{aws.account_id}:stack/#{ident}/*"
 
         @asg = output_of(:aws_cloudformation_stack, ident, 'outputs["AsgName"]')
 

data/lib/terrafying/components/letsencrypt.rb

@@ -39,6 +39,7 @@ module Terrafying
           provider: :staging,
           email_address: "cloud@uswitch.com",
           public_certificate: false,
+          curve: "P384",
         }.merge(options)
 
         @name = name
@@ -50,7 +51,7 @@ module Terrafying
 
         resource :tls_private_key, "#{@name}-account", {
                    algorithm: "ECDSA",
-                   ecdsa_curve: "P384",
+                   ecdsa_curve: options[:curve],
                  }
 
         resource :acme_registration, "#{@name}-reg", {
@@ -80,7 +81,7 @@ module Terrafying
           acl: @ca_cert_acl
         }
 
-        @source = File.join("s3://", @bucket, @prefix, @name, "ca.cert")
+        @source = File.join("s3://", path("#{@name}-cert"))
 
         self
       end
@@ -98,13 +99,14 @@ module Terrafying
           dns_names: [],
           ip_addresses: [],
           min_days_remaining: 21,
+          curve: "P384",
         }.merge(options)
 
         key_ident = "#{@name}-#{tf_safe(name)}"
 
         ctx.resource :tls_private_key, key_ident, {
                        algorithm: "ECDSA",
-                       ecdsa_curve: "P384",
+                       ecdsa_curve: options[:curve],
                      }
 
         ctx.resource :tls_cert_request, key_ident, {
@@ -140,7 +142,7 @@ module Terrafying
                        content: output_of(:acme_certificate, key_ident, :certificate_pem).to_s + @ca_cert,
                      }
 
-        reference_keypair(ctx, name)
+        reference_keypair(ctx, name, "#{key_ident}-key", "#{key_ident}-cert")
       end
 
     end

data/lib/terrafying/components/loadbalancer.rb

@@ -113,7 +113,7 @@ module Terrafying
           internal: !options[:public],
           tags: @tags,
         }.merge(subnets_for(options[:subnets]))
-         .merge(application? ? { security_groups: [@security_group], idle_timeout: options[:idle_timeout] } : {})
+         .merge(application? ? { security_groups: [@security_group], idle_timeout: options[:idle_timeout], access_logs: options[:access_logs] } : {})
          .compact
 
         @targets = []

data/lib/terrafying/components/selfsignedca.rb

@@ -25,6 +25,7 @@ module Terrafying
           common_name: name,
           organization: "uSwitch Limited",
           public_certificate: false,
+          curve: "P384",
         }.merge(options)
 
         @name = name
@@ -40,7 +41,7 @@ module Terrafying
           cert_acl = "private"
         end
 
-        @source = File.join("s3://", @bucket, @prefix, @name, "ca.cert")
+        @source = File.join("s3://", path("#{@name}-cert"))
 
         if options[:ca_key] && options[:ca_cert]
           @ca_key = options[:ca_key]
@@ -58,7 +59,7 @@ module Terrafying
 
         resource :tls_private_key, @ident, {
                    algorithm: @algorithm,
-                   ecdsa_curve: "P384",
+                   ecdsa_curve: options[:curve],
                  }
 
         resource :tls_self_signed_cert, @ident, {
@@ -90,11 +91,11 @@ module Terrafying
       end
 
       def keypair
-        resource :aws_s3_bucket_object, "#{@name}-key", {
-                   bucket: @bucket,
-                   key: File.join(@prefix, @name, "ca.key"),
-                   content: @ca_key,
-                 }
+        @ca_key_ref ||= resource :aws_s3_bucket_object, "#{@name}-key", {
+                                   bucket: @bucket,
+                                   key: File.join(@prefix, @name, "ca.key"),
+                                   content: @ca_key,
+                                 }
 
         {
           ca: self,
@@ -103,8 +104,8 @@ module Terrafying
             key: File.join("/etc/ssl", @name, "ca.key"),
           },
           source: {
-            cert: File.join("s3://", @bucket, @prefix, @name, "ca.cert"),
-            key: File.join("s3://", @bucket, @prefix, @name, "ca.key"),
+            cert: File.join("s3://", path("#{@name}-cert")),
+            key: File.join("s3://", path("#{@name}-key")),
           },
           resources: [
             "aws_s3_bucket_object.#{@name}-key",
@@ -117,8 +118,8 @@ module Terrafying
               "s3:GetObject",
             ],
             Resource: [
-              "arn:aws:s3:::#{File.join(@bucket, @prefix, @name, "ca.cert")}",
-              "arn:aws:s3:::#{File.join(@bucket, @prefix, @name, "ca.key")}",
+              "arn:aws:s3:::#{path(@name + '-cert')}",
+              "arn:aws:s3:::#{path(@name + '-key')}",
             ]
           }
         }
@@ -136,13 +137,14 @@ module Terrafying
           ],
           dns_names: [],
           ip_addresses: [],
+          curve: "P384",
         }.merge(options)
 
         key_ident = "#{@name}-#{tf_safe(name)}"
 
         ctx.resource :tls_private_key, key_ident, {
                        algorithm: @algorithm,
-                       ecdsa_curve: "P384",
+                       ecdsa_curve: options[:curve],
                      }
 
         ctx.resource :tls_cert_request, key_ident, {
@@ -167,17 +169,17 @@ module Terrafying
 
         ctx.resource :aws_s3_bucket_object, "#{key_ident}-key", {
                        bucket: @bucket,
-                       key: File.join(@prefix, @name, name, "key"),
+                       key: File.join(@prefix, @name, name, "${sha256(tls_private_key.#{key_ident}.private_key_pem)}", "key"),
                        content: output_of(:tls_private_key, key_ident, :private_key_pem),
                      }
 
         ctx.resource :aws_s3_bucket_object, "#{key_ident}-cert", {
                        bucket: @bucket,
-                       key: File.join(@prefix, @name, name, "cert"),
+                       key: File.join(@prefix, @name, name, "${sha256(tls_locally_signed_cert.#{key_ident}.cert_pem)}", "cert"),
                        content: output_of(:tls_locally_signed_cert, key_ident, :cert_pem),
                      }
 
-        reference_keypair(ctx, name)
+        reference_keypair(ctx, name, "#{key_ident}-key", "#{key_ident}-cert")
       end
 
     end

data/lib/terrafying/components/version.rb

@@ -1,5 +1,5 @@
 module Terrafying
   module Components
-    VERSION = "1.10.9"
+    VERSION = "1.11.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.10.9
+  version: 1.11.0
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler