cloudformation-tool 1.5.13 → 1.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f75b3fa01c1cfdf40a3122aa51178d591cd94b515dc2665e30693e2f599536a
-  data.tar.gz: 9a40860146bc044646b8427bbb9343e10309fdc0931a8145b5e96f363431f2dd
+  metadata.gz: 32f485059a283b0a34a74ac687c52fe01b6d9522616cc00beb572b46e9a13e1d
+  data.tar.gz: 9533caf5496a471432cadfbf007dd20a6789829d353642538052bde818ed6bfe
 SHA512:
-  metadata.gz: 7e4c95847703f3fc2cb3e07fb82884fe697e9c9568e90d43a8883613383d0e2f12f1e143354db2bc1da53fe0da8bb01aed34a8d4e9abdb7487c9682bb405ccfb
-  data.tar.gz: d28a83a9a3a5c67fb640560e2e71fd82640b415188aa0098f3eb25fbd51f3eab06c31a4c116f3a876667fd7f549c3058da1ad9ec64840ceebe37faabf383ab02
+  metadata.gz: cdd70a1186411fa08ddca90d687c53ad4d5113d503fd02068e6b84e63a3080a11d4dfc9e58f6a8231a90d05ef4ddb5212ece90cae208562a4caef2d54d1eb42c
+  data.tar.gz: f1d758e208b657d5f8e829e4e1dd079850ec4eaa8c1a9593ed09036da9cfe91fc5447edb305d6ed68005a3eda5f2e43df37c7ed4678b03ec8cac745e321af5eb

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -102,25 +102,14 @@ module CloudFormationTool
           # some categories are meta-data that we can ignore from includes
           next if %w(AWSTemplateFormatVersion Description).include? category
           
-          case category
-          when "Parameters"
-            (@data[category]||={}).each do |name, param|
-              if catdata.has_key? name
-                next if param['Default'] == catdata[name]['Default']
-                 
-                if catdata[name].has_key?('Override') and catdata[name]['Override'] == false
-                  catdata.delete(name)
-                else
-                  newname = "#{cfile_key}z#{name}"
-                  log "Rewriting conflicting parameter #{name} (='#{catdata[name]['Default']}') to #{newname}"
-                  catdata[newname] = catdata.delete name
-                  rewrites[name] = newname
-                end
-              else
-                @data[category][name] = param
-              end
-            end
-          else
+          if category == "Parameters"
+            rewriteParameters catdata, cfile_key, rewrites
+            @data["Parameters"].merge! catdata
+            next
+          end
+          
+          case catdata
+          when Hash
             # warn against duplicate entities, resources or outputs
             (@data[category] ||= {}).keys.each do |key|
               if catdata.has_key? key
@@ -128,14 +117,49 @@ module CloudFormationTool
               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
           
-          # add included properties
-          @data[category].merge! catdata
         end
       end
     end
     
+    def rewriteParameters data, key, rewrites
+      (@data["Parameters"]||={}).each do |name, param|
+        unless data.has_key? name
+          @data["Parameters"][name] = param
+          next
+        end
+        
+        next if param['Default'] == data[name]['Default']
+        
+        if data[name].has_key?('Override') and data[name]['Override'] == false
+          data.delete(name)
+          next
+        end
+        
+        newname = "#{key}z#{name}"
+        log "Rewriting conflicting parameter #{name} (='#{data[name]['Default']}') to #{newname}"
+        data[newname] = data.delete name
+        rewrites[name] = newname
+      end
+    end
+    
     def resolveVal(value)
       case value
       when Hash

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.5.13'
+  VERSION = '1.5.15'
 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.15
 platform: ruby
 authors:
 - Oded Arbel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake