cloudformation-tool 1.5.13 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f75b3fa01c1cfdf40a3122aa51178d591cd94b515dc2665e30693e2f599536a
-  data.tar.gz: 9a40860146bc044646b8427bbb9343e10309fdc0931a8145b5e96f363431f2dd
+  metadata.gz: a9db3672b97a22828e57d6c906a78831153a620bca1632f9f9748f72e27c9db7
+  data.tar.gz: ad0eca7cc6ae46eaf3b0a55c57fd8e85695a27b8c97f71e55492e0a95bd208d2
 SHA512:
-  metadata.gz: 7e4c95847703f3fc2cb3e07fb82884fe697e9c9568e90d43a8883613383d0e2f12f1e143354db2bc1da53fe0da8bb01aed34a8d4e9abdb7487c9682bb405ccfb
-  data.tar.gz: d28a83a9a3a5c67fb640560e2e71fd82640b415188aa0098f3eb25fbd51f3eab06c31a4c116f3a876667fd7f549c3058da1ad9ec64840ceebe37faabf383ab02
+  metadata.gz: 0452d98f9e5426f6924cc8caf53430b8936fc9ac38187abda7ff9d780cf921330f0f85b592cab7be9b26918e3f54585892e61548e747721dfc46973ec64e04aa
+  data.tar.gz: 6d50f5dd121f968799fd5754a6f54726cd0c64925ce9bd79a27f4360ee710c65a914fc36f3d740536664c4ffc1c1a03b5f055c21848deb2e976900c3f2060dc1

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -121,17 +121,34 @@ module CloudFormationTool
               end
             end
           else
-            # warn against duplicate entities, resources or outputs
-            (@data[category] ||= {}).keys.each do |key|
-              if catdata.has_key? key
-                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - duplicate '#{category}' item: #{key}"
-              end 
+            case catdata
+            when Hash
+              # warn against duplicate entities, resources or outputs
+              (@data[category] ||= {}).keys.each do |key|
+                if catdata.has_key? key
+                  raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - duplicate '#{category}' item: #{key}"
+                end 
+              end
+              catdata = fixrefs(catdata, rewrites)
+              # add included properties
+              @data[category].merge! catdata
+            when Array
+              if @data[category].nil?
+                @data[category] = catdata
+              elsif @data[category].is_a? Array
+                @data[category] += catdata
+              else
+                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - conflicting types for '#{category}'"
+              end
+            else
+              if @data[category].nil?
+                @data[category] = catdata
+              else
+                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - I do not know how to merge non-list non-dictionary '#{category}'!"
+              end
             end
-            catdata = fixrefs(catdata, rewrites)
           end
           
-          # add included properties
-          @data[category].merge! catdata
         end
       end
     end

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.5.13'
+  VERSION = '1.5.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.14
 platform: ruby
 authors:
 - Oded Arbel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake