terrafying-components 1.6.7 → 1.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: faec475d282b6b0d64b4233889f861aab40a64a37a746d9dbe9433b3f76899b3
4
- data.tar.gz: e2e7bc41156404be15c4a542cbe9b86ad98c26193a8c08386a073357ca4385e2
3
+ metadata.gz: 20e4eff0f40489a6c553777bd9e57d1c44ea3e20eb23d3d8d36f13d56f7f5cc1
4
+ data.tar.gz: 557b2ec0b710d89a155fa1db9f41e792079faa0228b15703fc4ed0f5a0abe3ed
5
5
  SHA512:
6
- metadata.gz: f9f286c6a05b7b72827f8cf50f4391e4b6ac373566baf3fe597ea5390973fff7d770f35ba4b8d25d07afc717ab003e159d1cd0249718d7f5059b0eeb04f2fbf1
7
- data.tar.gz: 2314cda2677a34077ec0daf094b9b73f681374ed5bfc61d4dc783a21be3ef9de476aff6ca423b81bd6c2bed84d5a300b22b8b58d9b21f5879a8e1f82c549c408
6
+ metadata.gz: cb22670603ad66bf7630c5467c31eb407cc236eac0c404a263b6fcbdfb9381e81b13249d9ac274c27ad01357bb753a991880ce1d11f22accf4b5758cb124a22f
7
+ data.tar.gz: 4ea749390669b63a77b23f6f3bf02e1cc186690b59928700d52fbb15d46eda4a523aa3cae141d739f0c8c2a578b6cd246ead6b00bba93482dae1e685b1cf6376
@@ -69,14 +69,16 @@ module Terrafying
69
69
  @ca_cert_acl = options[:public_certificate] ? 'public-read' : 'private'
70
70
 
71
71
  open(@provider[:ca_cert], 'rb') do |cert|
72
- resource :aws_s3_bucket_object, "#{@name}-cert", {
73
- bucket: @bucket,
74
- key: File.join(@prefix, @name, "ca.cert"),
75
- content: cert.read,
76
- acl: @ca_cert_acl
77
- }
72
+ @ca_cert = cert.read
78
73
  end
79
74
 
75
+ resource :aws_s3_bucket_object, "#{@name}-cert", {
76
+ bucket: @bucket,
77
+ key: File.join(@prefix, @name, "ca.cert"),
78
+ content: @ca_cert,
79
+ acl: @ca_cert_acl
80
+ }
81
+
80
82
  @source = File.join("s3://", @bucket, @prefix, @name, "ca.cert")
81
83
 
82
84
  self
@@ -135,7 +137,7 @@ module Terrafying
135
137
  ctx.resource :aws_s3_bucket_object, "#{key_ident}-cert", {
136
138
  bucket: @bucket,
137
139
  key: File.join(@prefix, @name, name, "cert"),
138
- content: output_of(:acme_certificate, key_ident, :certificate_pem),
140
+ content: output_of(:acme_certificate, key_ident, :certificate_pem).to_s + '\n' + @ca_cert,
139
141
  }
140
142
 
141
143
  reference_keypair(ctx, name)
@@ -1,5 +1,5 @@
1
1
  module Terrafying
2
2
  module Components
3
- VERSION = "1.6.7"
3
+ VERSION = "1.6.8"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: terrafying-components
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.7
4
+ version: 1.6.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - uSwitch Limited
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-06 00:00:00.000000000 Z
11
+ date: 2018-06-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler