terrafying 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e6ea924291e6e3c08fe913e7e3bb7edb5f09b2e6866c335f4c5c8a0719ab7a
-  data.tar.gz: dc6638e07d28a2e6d1b421cdfba0714d77c1f2575782529eb4af6ef6320cd029
+  metadata.gz: 01f9e6e626d9bae8f15aa3acd24ae41d3e0a77b057fcd54cfb3f8422ff70a5a6
+  data.tar.gz: e4f7996c75a7bae65cc0f58e2d8ecd0cc022d4533cea504d4b232137b8f4ae4d
 SHA512:
-  metadata.gz: bfa5024091b5edd32be865f0e2155dc2780d34c4b20d5a666b72fdcd53f88012cb2cb865e3d05d28edd6bd85b3234ebe8e464615d7fcbbcafeb7665a552113f2
-  data.tar.gz: da0ed79b1c259e86e5ded70f032268aa8bf4e292e4489a10725aa03734c5e047ed811dbed4b21dee8ba2af21b6b6074d47f2b672d4b08f6c84df32016e362441
+  metadata.gz: 28db6d1e2f967502c76d779416853b9961573dfe261e85ac3f1c767f0306c64e91003a295fba0d8eeacbdd6d0bcd9041d4afccb51c5b2de08c2a625cf9d8593e
+  data.tar.gz: 82ac99ff86316ce0508e3b64e78d6e9d0622be42c24e54b9d3d2019cdb545d21380ce054106884deb24a51169120c8ed0e2c014eb7942a1fad5d4f4dff0440e1

data/lib/terrafying/generator.rb

@@ -61,14 +61,16 @@ module Terrafying
     end
 
     def provider(name, spec)
-      @output["provider"] ||= {}
-      @output["provider"][name] = spec
+      key = [name, spec[:alias]].compact.join('.')
+      @providers ||= {}
+      raise "Duplicate provider configuration detected for #{key}" if key_exists_spec_differs(key, name, spec)
+      @providers[key] = { name.to_s => spec }
+      @output['provider'] = @providers.map { |_, v| v }
+      key
+    end
 
-      if spec[:alias]
-        "#{name}.#{spec[:alias]}"
-      else
-        name.to_s
-      end
+    def key_exists_spec_differs(key, name, spec)
+      @providers.key?(key) && spec != @providers[key][name.to_s]
     end
 
     def data(type, name, spec)

data/lib/terrafying/version.rb

@@ -1,4 +1,4 @@
 module Terrafying
-  VERSION = "1.5.0" # will be inserted by Drone
+  VERSION = "1.6.0" # will be inserted by Drone
   CLI_VERSION = "0.11.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler