cfhighlander 0.6.0 → 0.6.1.alpha.1542198781

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a420928c7aa2dc54c5108db929d3433eabc6c07b9bfc4d6b7b8c3a4d2428781c
-  data.tar.gz: 68f5e733bdfe5e9b0ac8e1d75c0c61a49c0b7cd45f39d2edfa035a020918644d
+  metadata.gz: 305201fcb187e9c69fb165d5e6dafea795ff5afccf199e13f7904bf358a78405
+  data.tar.gz: 3f755245699f69b4a26e4573d45060bc9a7586b2dc3a56124a1970dd72e0c32b
 SHA512:
-  metadata.gz: bf81b9c324540bb3fba23b6d5d91bcd03d033bd6080174bf356458a1a4c789dcdb8f1f066d1c2c7f75612b57080bcaca5abf7fe2b2b0508631a591ad69839ecb
-  data.tar.gz: c2613946392325b606435379d1fb480ed8b60c77fba729c2cfa8bcdf4ec3f5a1a79cef2675ded78c89bbe9396724d3d890ea62d1fb593919346bbf1e9d272f00
+  metadata.gz: b2e87a3d16bce6e6b81edd226feb2cf037ab333ebfee025a8dbbe91027892525a69e1c730fa5dff88de06ffac54d13d1d6a4dda324a67ceaf5e7dacaad2519fb
+  data.tar.gz: 60ef31bdde50e470b657254cedc9ebdded421f7c93855120fec308207e2f397aea2cdd62239698f3d7be7fb46aa87618ceebd87c66671faa3f26c6b8f1dd1bf0

data/lib/cfhighlander.compiler.rb

@@ -171,8 +171,7 @@ module Cfhighlander
         # `cfndsl #{@cfndsl_compiled_path} -p -f #{format} -o #{output_path} --disable-binding`
         puts "CloudFormation #{format.upcase} template for #{dsl.name} written to #{output_path}"
 
-
-
+        return JSON.parse(model.to_json)
 
       end
 

data/lib/util/cloudformation.util.rb

@@ -44,7 +44,7 @@ module Cfhighlander
         model = component.cfn_model_raw
         template.subcomponents.each do |sub_component|
           next unless sub_component.inlined
-          model['Resources'].delete(sub_component.component_loaded.name)
+          model['Resources'].delete(sub_component.cfn_name)
         end
       end
 
@@ -94,6 +94,12 @@ module Cfhighlander
         inline_elements('Conditions', component, template)
         inline_elements('Mappings', component, template)
         inline_elements('Resources', component, template)
+
+        # outputs are renamed AFTER all of the other processing
+        # has been done, as outputs are referenced. Only
+        # outputs of inlined components are renamed
+        flatten_namespace('Outputs', component, template)
+        Debug.debug_dump_cfn(template, 'flat.outputs')
         inline_elements('Outputs', component, template)
       end
 
@@ -364,7 +370,7 @@ module Cfhighlander
       def self.rename_mapping(tree, search, replacement)
         tree.keys.each do |k|
           v = tree[k]
-          if k == 'Fn::FindInMap' and v[0] = search
+          if k == 'Fn::FindInMap' and v[0] == search
             tree[k] = [replacement, v[1], v[2]]
           end
 
@@ -440,9 +446,6 @@ module Cfhighlander
 
         flatten_namespace('Resources', component, template)
         Debug.debug_dump_cfn(template, 'flat.resources')
-
-        flatten_namespace('Outputs', component, template)
-        Debug.debug_dump_cfn(template, 'flat.outputs')
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1.alpha.1542198781
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -293,12 +293,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: DSL on top of cfndsl. Manage libraries of cloudformation components