cfhighlander 0.12.8 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce9596bfe2e0a988d21ef1f23b567b7b3cd1d71f343daffe255a82bc097fbde6
-  data.tar.gz: 489472343feeb7a3422d37c0069f8f3c639dea0813ead2e7a1f2c8ad2cfb2829
+  metadata.gz: 9b7307f53eadd829977025dfca693aedb1167fb264c7284761838daf4e37245c
+  data.tar.gz: 59b506bfcb6841b5acc9c1bc8b875af571a18deba848783771de2734bea4bb08
 SHA512:
-  metadata.gz: 02bb5a53d8688683c238083bad087b9abe101d4c4a52b37f00994d16cbc87b09d21e299ba7c7ac2475b812eb62dfa37f77deae8ee9a9117598dcdadaf64e366d
-  data.tar.gz: 79f4cabecdf3b2b581f37072a1ff99c73f92c8ca7b74985f2c174b52f4a2b02049048112970c39d2f8c91aa9576e0f672f9608ca5a6a1e47c5f0f8918074f0fd
+  metadata.gz: 109058d0c98dc7e2df36b7f71ba2706399cdcf81a99d1584ffcf2eee6ba74b00b00bb3e87d0ac62093d578167365d81bc0bf2409ae1346352eb44e8b609249ef
+  data.tar.gz: b28cdb029069893b1c49c4222bcf15138e14fa5fc0dfe51981e652d0252e8704bc284b323242936ff0b3786806099bf18fc4a3949cc329f2a27471f8b5af2b1e

data/README.md

@@ -336,7 +336,7 @@ for component named `vpc` works just as well:
 # contents of vpc.config.yaml in outer component, defining vpc component
 
 # line below prevents component configuration file being merged with outer component configuration
-subcomponent_config_file:  
+subcomponent_config_file: true
 
 # there is no need for components/vpc/config structure, it is implied by file name
 maximum_availibility_zones: 3

data/lib/cfhighlander.compiler.rb

@@ -199,7 +199,9 @@ module Cfhighlander
         config_yaml_path = "#{@config_output_location}/#{@component_name}.config.yaml"
         FileUtils.mkdir_p(@config_output_location) unless Dir.exist?(@config_output_location)
 
-        File.write(config_yaml_path, @component.config.to_yaml)
+        config_yaml = JSON.parse(@component.config.to_json).to_yaml
+        File.write(config_yaml_path, config_yaml)
+        
         puts "Config for #{@component.highlander_dsl.name} written to #{config_yaml_path}"
 
         if write_subcomponents_config

data/lib/cfhighlander.model.component.rb

@@ -75,7 +75,7 @@ module Cfhighlander
         @config = {} if @config.nil?
         Dir["#{@component_dir}/*.config.yaml"].each do |config_file|
           puts "INFO Loading config for #{@name}: read file:#{config_file} "
-          partial_config = YAML.load(File.read(config_file))
+          partial_config = YAML.load(File.read(config_file, aliases: true))
           if (not partial_config)
             STDERR.puts "WARNING: Configuration file #{config_file} could not be loaded"
             next

data/lib/cfhighlander.version.rb

@@ -1,3 +1,3 @@
 module Cfhighlander
-  VERSION="0.12.8".freeze
+  VERSION="0.13.0".freeze
 end

data/lib/util/cloudformation.util.rb

@@ -112,7 +112,7 @@ module Cfhighlander
             if sub_component.conditional
               # If the resource already has a conditon we need to combine it with the stack condition
               if element_name == 'Conditions'
-                value = { "Fn::And" => [{"Condtion" => sub_component.condition}, value]}
+                value = { "Fn::And" => [{"Condition" => sub_component.condition}, value]}
               end
               # Adds the condition to the inlined resource if it doesn't already have a condition
               if element_name == 'Resources'
@@ -470,4 +470,4 @@ module Cfhighlander
 
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.12.8
+  version: 0.13.0
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -206,6 +206,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: DSL on top of cfndsl. Manage libraries of cloudformation components