terrafying-components 1.14.4 → 1.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a218bd82579c325e41040507e71620e224d8f4d8904d7933b55bb10b557f2318
-  data.tar.gz: 11b0e4b72b006cb3c52875ec25ef54418f0eb50c49909756521b3f359d44b930
+  metadata.gz: 8fca07c0816615cc1f57e19b641aec5ab42e3d9663c69a357ff4f3a5793fad34
+  data.tar.gz: 1a654cca318f984dd39dfd6a30fa9c6198cca31b020e172ad21c760c92dc24d6
 SHA512:
-  metadata.gz: 7c8e3597864ba5fa7954d9586b815f74054d32dcdb12db4b84ab1cba8674da68e5a972bed6f6f3d97e1e19d969cfc4edecacda50b7d51f3d4b286c40e4e10d70
-  data.tar.gz: e6e2b218019db3afeded9ebb4c90dc2e4459b29b2f936ebea15242fa2bc16b99f35093b74b90fec1ca539fde8ebbb314b688298983b4fcfc3b693ed83fa610fe
+  metadata.gz: 5a0c2161f62f20fb914f02c6a1b074cd12d3010bf3f45475ff147133736418ba7b9dfb705faadc15585270f5f4d8e1a7c592290c6ba6f467a573bc0af65f0555
+  data.tar.gz: 0214fa43da5f25b99531bdd5433095b66a4ba4a3e444c7248f44f1f51b8cc8ae6ea81014820ec8621f6ce089c1d6fb35b0ab7f65baa7c9067ebcc76d3edf10b4

data/lib/terrafying/components/letsencrypt.rb

@@ -16,8 +16,8 @@ module Terrafying
       def self.find(name, bucket, options = {})
         LetsEncrypt.new.find name, bucket, options
       end
-      def self.renew(name, bucket, options = {})
-      LetsEncrypt.new.renew name, bucket, options
+      def self.renew(name, bucket, domains, options = {})
+        LetsEncrypt.new.renew name, bucket, domains, options
       end
 
       def initialize
@@ -176,6 +176,18 @@ module Terrafying
                      certificate_request_pem: output_of(:tls_cert_request, key_ident, :cert_request_pem)
                    }.merge(cert_options)
 
+        csr_version = "${sha256(tls_cert_request.#{key_ident}.cert_request_pem)}"
+
+        ctx.resource :aws_s3_bucket_object, "#{key_ident}-csr",
+                     bucket: @bucket,
+                     key: object_key(name, :csr, csr_version),
+                     content: output_of(:tls_cert_request, key_ident, :cert_request_pem)
+
+        ctx.resource :aws_s3_bucket_object, "#{key_ident}-csr-latest",
+                     bucket: @bucket,
+                     key: object_key(name, :csr, 'latest'),
+                     content: csr_version
+
         key_version = "${sha256(tls_private_key.#{key_ident}.private_key_pem)}"
 
         ctx.resource :aws_s3_bucket_object, "#{key_ident}-key",
@@ -188,23 +200,23 @@ module Terrafying
                      key: object_key(name, :key, 'latest'),
                      content: key_version
 
-       cert_version = "${sha256(acme_certificate.#{key_ident}.certificate_pem)}"
+        cert_version = "${sha256(acme_certificate.#{key_ident}.certificate_pem)}"
 
-       ctx.resource :aws_s3_bucket_object, "#{key_ident}-cert",
-                    bucket: @bucket,
-                    key: object_key(name, :cert, cert_version),
-                    content: output_of(:acme_certificate, key_ident, :certificate_pem).to_s + @ca_cert,
-                    lifecycle: { ignore_changes: [ "content" ] } # the lambda will be updating it
+        ctx.resource :aws_s3_bucket_object, "#{key_ident}-cert",
+                     bucket: @bucket,
+                     key: object_key(name, :cert, cert_version),
+                     content: output_of(:acme_certificate, key_ident, :certificate_pem).to_s + @ca_cert,
+                     lifecycle: { ignore_changes: [ "content" ] } # the lambda will be updating it
 
-       ctx.resource :aws_s3_bucket_object, "#{key_ident}-cert-latest",
-                    bucket: @bucket,
-                    key: object_key(name, :cert, 'latest'),
-                    content: cert_version
+        ctx.resource :aws_s3_bucket_object, "#{key_ident}-cert-latest",
+                     bucket: @bucket,
+                     key: object_key(name, :cert, 'latest'),
+                     content: cert_version
 
-       reference_keypair(ctx, name, key_version: key_version, cert_version: cert_version)
+        reference_keypair(ctx, name, key_version: key_version, cert_version: cert_version)
       end
 
-      def renew(name, bucket, options={})
+      def renew(name, bucket, domains, options={})
         options = {
           prefix: "",
           provider: :staging,
@@ -212,6 +224,7 @@ module Terrafying
 
         @name = name
         @bucket = bucket
+        @domains = domains
         @prefix = options[:prefix]
 
         resource :aws_lambda_function, "#{@name}_lambda", {
@@ -275,6 +288,20 @@ module Terrafying
                         "arn:aws:s3:::#{@bucket}"
                       ],
                       Effect: "Allow"
+                    },
+                    {
+                      Action: [
+                        "route53:ListHostedZones",
+                        "route53:GetChange",
+                        "route53:ChangeResourceRecordSets",
+                      ],
+                      Resource: [
+                        domains.map { | domain |
+                          "arn:aws:route53:::hostedzone/#{domain.zone.id}"
+                         },
+                        "arn:aws:route53:::change/*",
+                      ],
+                      Effect: "Allow"
                     }
                   ]
                 }

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '1.14.4'
+    VERSION = '1.14.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.14.4
+  version: 1.14.5
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake