cfhighlander 0.7.0.alpha.1539253803 → 0.7.0.alpha.1539554880

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 229b8189ae6e94ec037ab24a56f7f5a08db541774838874933b7ceab055ca1be
-  data.tar.gz: 1a3a2fb4be02415c2b946607174e5f568d6679b8946e5a85460bc5a2a0487fc0
+  metadata.gz: 0e9aac115a71d923c39ebf9380b04920f804ffabeb334857d6a193141c5d5d60
+  data.tar.gz: 4fdfbee33ecd1bb029ff6c43fa0d5d1f3435f2e74999c70ad46426916cb5a338
 SHA512:
-  metadata.gz: 211adccc53e6b274c4e9975d9cd3dbe04c459a6fd973c0c4307028dc8af9cd587aac8eabdbf4c68334d00af47b24ffff62599da280a97797ccb493ef32cec31b
-  data.tar.gz: 3590228746dfd1e8318b846891049eb364d4505196987bcc746231994ca75802767fb7511ccde02b942b1938bcc199e66b883f4e2aab44e828631cbe298c5430
+  metadata.gz: c63486123a0cd3e5774f5cbaf0f84bccd0d7b8e525d65dbdb54371426fb076e4429a7700c4ac4567b78ce73841b74a4c5726bc0d6d765dc383e815583aee4322
+  data.tar.gz: 4b5f5a6d7cd2cb0941bf0d3f459c8304235ad9ade294437077b174a3482023d64db315f9e020e33288a0fa92f545119789eb2cdf48ae26dda053a606dbb15e0c

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

@@ -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.7.0.alpha.1539253803
+  version: 0.7.0.alpha.1539554880
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline