terrafying-components 1.10.2 → 1.10.3

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: 738988a64d8d93b30940766c5ae4d2401e44defd9396fa310f297eec83bab3ab
4
- data.tar.gz: eae7e283ab57f015df4db4f8e0d30322f922da0e55f36b72c9d62619a8837e0c
3
+ metadata.gz: 6e13a061db709d39d15acf3e59de1f7b385dad897a44d029d93151dc70d17487
4
+ data.tar.gz: 2c7ce83ff0a6dd3f4f0e280c8a0b48278f60b014448a5088677e560928893c8c
5
5
  SHA512:
6
- metadata.gz: afafffc6228fbac8060c89cc65b3f8ffd0bcc3be7e2e391f64f7ec8df56b1652bb0fee72354c0bff106d1b5d27dc4816de51f05e2e01689d8e33080a65ccf0e9
7
- data.tar.gz: eb868e2f11d9bd5a38be7f21a6cc479ba172b097868eace375487e352514c9c2ff793e9710ced9a071e4349bc02d4e0d8755423a559afa14c344d888e52f3672
6
+ metadata.gz: b43a868a8a79b076ac006bdb5a8ef9c98f89b7eb6da45747d42062f220c80977b911761ed820ab0edb43a964c7d959aa2695df7b980e96a5b385f94c604b66d4
7
+ data.tar.gz: 65e576b2383e610c9702444e10c60cf855e48254b7b3fb0003134271a49f9ae1b6ccd4766c4dbad422e66f363cf4101bf47392c3e4ac26600b24f997c30b1e26
@@ -34,6 +34,24 @@ module Terrafying
34
34
 
35
35
  @ident = "#{name}-ca"
36
36
 
37
+ if options[:public_certificate]
38
+ cert_acl = "public-read"
39
+ else
40
+ cert_acl = "private"
41
+ end
42
+
43
+ if options[:ca_key] && options[:ca_cert]
44
+ @ca_key = options[:ca_key]
45
+ @ca_cert = options[:ca_cert]
46
+ resource :aws_s3_bucket_object, "#{@name}-cert", {
47
+ bucket: @bucket,
48
+ key: File.join(@prefix, @name, "ca.cert"),
49
+ content: @ca_cert,
50
+ acl: cert_acl,
51
+ }
52
+ return self
53
+ end
54
+
37
55
  provider :tls, {}
38
56
 
39
57
  resource :tls_private_key, @ident, {
@@ -61,12 +79,6 @@ module Terrafying
61
79
  @ca_key = output_of(:tls_private_key, @ident, :private_key_pem)
62
80
  @ca_cert = output_of(:tls_self_signed_cert, @ident, :cert_pem)
63
81
 
64
- if options[:public_certificate]
65
- cert_acl = "public-read"
66
- else
67
- cert_acl = "private"
68
- end
69
-
70
82
  resource :aws_s3_bucket_object, "#{@name}-cert", {
71
83
  bucket: @bucket,
72
84
  key: File.join(@prefix, @name, "ca.cert"),
@@ -1,5 +1,5 @@
1
1
  module Terrafying
2
2
  module Components
3
- VERSION = "1.10.2"
3
+ VERSION = "1.10.3"
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.10.2
4
+ version: 1.10.3
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-12-07 00:00:00.000000000 Z
11
+ date: 2018-12-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler