cfhighlander 0.12.7 → 0.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2dfe3eb66664ba5c592e060c0c2257f890fa8ed03f7583d396857a8d1b789cd
-  data.tar.gz: 0577fcd3991f9e5fbb4b146c705c791a678523c04a025203255375ab1b264e98
+  metadata.gz: 9cf537c7bf80a801d6b795bb27a7e21376cc5d69840ab19c263a98573ea837fd
+  data.tar.gz: 064f4a84dfa1d15781f9ff09d18391953b6b6a3a4d610e5a895f9ed9bad976bf
 SHA512:
-  metadata.gz: ea89979f91b1a001a87c0779b57d7e6efad18a1897b0bc4ca8bcf69c0132694a4131c2d312d1451aa8cc0a8cd0cafa6abb44458097f69650e84a7ecd7026eae9
-  data.tar.gz: e7ab34cb43ad010ad12ae0dd4193c0cf247d24878bd07f2a4701d07d0fed419bc573c7ba649350b0d2e264a23864c63d9427fefa80184abdf915600ac85dcc5d
+  metadata.gz: babeedc823c19df370067cc96f6dd00ac04f66a8c7e2ceffaa6973dc7b44d1802b204898b711619389979a236c3a6698284d5fef8bc594ed8cff714846c9bc32
+  data.tar.gz: a19f90de3b97d8b5bd22468c633dbff79c89d5f87ae8175db6040133a4f9b01a3ee2cfbcfa7a5309d4effd8bc4dd55accf528a0ea4f8dc979ad33e42239952dd

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.7".freeze
+  VERSION="0.12.9".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.7
+  version: 0.12.9
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-31 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