terrafying 1.7.3 → 1.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/terrafying/generator.rb +17 -3
- data/lib/terrafying/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: eefaff1f899eebaafed67ea46a5ea7c8b7f1b764a526b2f4ad6d3c9ea5bddadd
|
4
|
+
data.tar.gz: c5f021cf506ee877ee588d28ef8c1fe9a3e6a0bc710b0c9f8289ce026cd19f2f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 983266176f2d6ac0b71734ffcdc2bb1fc504e831cba232525a60e5732817b4f8bf15bf5e5cd13391a7be05fb9050d8c884d49fda77c8d1ba2027f17fbe205e4c
|
7
|
+
data.tar.gz: b529fcaa92002534b110d5e557962fade9d240f4dde02a250742cda3927e5323c91374af62bd2ada138c4aea7b2ec06c55be9bb06d163cc7caa2e55681b8fd68
|
data/lib/terrafying/generator.rb
CHANGED
@@ -192,7 +192,7 @@ module Terrafying
|
|
192
192
|
end
|
193
193
|
|
194
194
|
def provider(name, spec)
|
195
|
-
key =
|
195
|
+
key = provider_key(name, spec)
|
196
196
|
@providers ||= {}
|
197
197
|
raise "Duplicate provider configuration detected for #{key}" if key_exists_spec_differs(key, name, spec)
|
198
198
|
@providers[key] = { name.to_s => spec }
|
@@ -200,6 +200,10 @@ module Terrafying
|
|
200
200
|
key
|
201
201
|
end
|
202
202
|
|
203
|
+
def provider_key(name, spec)
|
204
|
+
[name, spec[:alias]].compact.join('.')
|
205
|
+
end
|
206
|
+
|
203
207
|
def key_exists_spec_differs(key, name, spec)
|
204
208
|
@providers.key?(key) && spec != @providers[key][name.to_s]
|
205
209
|
end
|
@@ -300,8 +304,7 @@ module Terrafying
|
|
300
304
|
|
301
305
|
def initialize
|
302
306
|
super
|
303
|
-
|
304
|
-
PROVIDER_DEFAULTS.each { |name, spec| provider(name, spec) }
|
307
|
+
@providers = {}
|
305
308
|
end
|
306
309
|
|
307
310
|
def backend(name, spec)
|
@@ -320,6 +323,17 @@ module Terrafying
|
|
320
323
|
resource(fn, args.shift.to_s, args.first)
|
321
324
|
end
|
322
325
|
|
326
|
+
def output_with_children
|
327
|
+
|
328
|
+
PROVIDER_DEFAULTS.each { |name, spec|
|
329
|
+
if not key_exists_spec_differs(provider_key(name, spec), name, spec)
|
330
|
+
provider(name, spec)
|
331
|
+
end
|
332
|
+
}
|
333
|
+
|
334
|
+
super
|
335
|
+
end
|
336
|
+
|
323
337
|
end
|
324
338
|
|
325
339
|
Generator = RootContext.new
|
data/lib/terrafying/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: terrafying
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- uSwitch Limited
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-03-
|
11
|
+
date: 2019-03-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|