terrafying-components 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d7a37c078d36a198f7fa4c962b0efc1866c2372e178d4aa4011ffaff9e83f5
-  data.tar.gz: f14456cf4ae27f2f04a3b1a1263911a01ba05d3e8e329130c6b19eb0a50a330e
+  metadata.gz: ee4074787f808bd89409e8b894451783ed8eec194a04f4f72beb88d2eb65423b
+  data.tar.gz: e33ac6dfd74898a03be89752a3cf1b51d2de91f5dce7d873d0385304916739f5
 SHA512:
-  metadata.gz: e7866109fc417b67150e1c607564039e78a6bc87b6901ed6cb430c5e9d09b086c56768eafdba7c40bb9f25e16285206449d9a15bb929e85f4e02e08dc5551cdc
-  data.tar.gz: e824409c34d34389993c87f89ff68880172f15e1e86f60b7660cde2e7a019f20da453a3580a1b922ce499897578e80519ad473376b7258893f241b4a99f3eba8
+  metadata.gz: 384ca6d019b261e3491a1aaaf875f2653c545d72fb34472b2f912a1521659ef5c19e1f842b75fb2eaf1976629c7fbb9d880e59ef2239ae761d6899d9e0adb239
+  data.tar.gz: 4b3568b174c99c9c8b7bb369dcefa0dd1178b302ba03db84484de5facad0fffc33ef494254744b3a4a0e1eb3d9bfa8eeeac4db58fa2f5aa11c737aa5da5ce4ea

data/lib/terrafying/components/letsencrypt.rb

@@ -64,7 +64,7 @@ module Terrafying
 
         resource :aws_s3_bucket_object, "#{@name}-account", {
           bucket: @bucket,
-          key: File.join(@prefix, @name, "account.key"),
+          key: File.join('', @prefix, @name, "account.key"),
           content: @account_key,
         }
 
@@ -76,7 +76,7 @@ module Terrafying
 
         resource :aws_s3_bucket_object, "#{@name}-cert", {
           bucket: @bucket,
-          key: File.join(@prefix, @name, "ca.cert"),
+          key: File.join('', @prefix, @name, "ca.cert"),
           content: @ca_cert,
           acl: @ca_cert_acl
         }
@@ -132,13 +132,13 @@ 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(acme_certificate.#{key_ident}.certificate_pem)}", "cert"),
                        content: output_of(:acme_certificate, key_ident, :certificate_pem).to_s + @ca_cert,
                      }
 

data/lib/terrafying/components/prometheus.rb

@@ -305,7 +305,8 @@ module Terrafying
           statistic: 'Minimum',
           alarm_description: "Monitoring #{name} target group host health",
           dimensions: dimensions,
-          alarm_actions: ['arn:aws:sns:eu-west-1:136393635417:prometheus_cloudwatch_topic']
+          alarm_actions: ['arn:aws:sns:eu-west-1:136393635417:prometheus_cloudwatch_topic'],
+          ok_actions: ['arn:aws:sns:eu-west-1:136393635417:prometheus_cloudwatch_topic'],
         }
       end
 

data/lib/terrafying/components/selfsignedca.rb

@@ -48,7 +48,7 @@ module Terrafying
           @ca_cert = options[:ca_cert]
           resource :aws_s3_bucket_object, "#{@name}-cert", {
                      bucket: @bucket,
-                     key: File.join(@prefix, @name, "ca.cert"),
+                     key: File.join('', @prefix, @name, "ca.cert"),
                      content: @ca_cert,
                      acl: cert_acl,
                    }
@@ -82,7 +82,7 @@ module Terrafying
 
         resource :aws_s3_bucket_object, "#{@name}-cert", {
                    bucket: @bucket,
-                   key: File.join(@prefix, @name, "ca.cert"),
+                   key: File.join('', @prefix, @name, "ca.cert"),
                    content: @ca_cert,
                    acl: cert_acl,
                  }
@@ -93,7 +93,7 @@ module Terrafying
       def keypair
         @ca_key_ref ||= resource :aws_s3_bucket_object, "#{@name}-key", {
                                    bucket: @bucket,
-                                   key: File.join(@prefix, @name, "ca.key"),
+                                   key: File.join('', @prefix, @name, "ca.key"),
                                    content: @ca_key,
                                  }
 
@@ -169,13 +169,13 @@ module Terrafying
 
         ctx.resource :aws_s3_bucket_object, "#{key_ident}-key", {
                        bucket: @bucket,
-                       key: File.join(@prefix, @name, name, "${sha256(tls_private_key.#{key_ident}.private_key_pem)}", "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, "${sha256(tls_locally_signed_cert.#{key_ident}.cert_pem)}", "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),
                      }
 

data/lib/terrafying/components/version.rb

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

metadata

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