Merge pull request #161 from theonestack/master

merge back fixes

Author: aaronwalker

Gemfile

@@ -12,4 +12,4 @@ gem 'rubyzip', '>= 2.0.0', '<3'
 gem 'git', '~> 1.4', '<2'
 gem 'rspec'
 gem 'octokit', '~> 4.0'
-gem 'duplicate','~> 1.1'
+gem 'duplicate','~> 1.1'

lib/util/cloudformation.util.rb

@@ -110,8 +110,13 @@ def self.inline_elements(element_name, component, template)
           model = sub_component.component_loaded.cfn_model_raw
           model[element_name].each do |resource, value|
             # effective extraction of child resource into parent
-            parent_model[element_name] = {} unless parent_model.key? element_name
-            parent_model[element_name][resource] = value
+            # allows for line components to use - or _ in the component name
+            # and still generate valid references
+            safe_resource_name = resource.gsub('-','').gsub('_','')
+            unless element_name == 'Outputs' && resource.end_with?('CfTemplateUrl')
+              parent_model[element_name] = {} unless parent_model.key? element_name
+              parent_model[element_name][safe_resource_name] = value
+            end
           end if model.key? element_name
         end
       end

spec/data/flatten/c.compiled.flat.yaml

@@ -21,6 +21,16 @@ Resources:
         - c1bbucketnames
         - default
         - name
+  c1cBucket:
+    Type: AWS::S3::Bucket
+  c1cc1NamedBucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName:
+        Fn::FindInMap:
+        - c1-cbucketnames
+        - default
+        - name
   c2Bucket:
     Type: AWS::S3::Bucket
     Properties:
@@ -40,19 +50,18 @@ Outputs:
   c1OutParam:
     Value:
       Ref: Bucket
-  c1aCfTemplateUrl:
-    Value: "/c1.compiled.yaml"
   c1aCfTemplateVersion:
     Value: latest
   c1bc1OutParam:
     Value:
       Ref: c1bBucket
-  c1bCfTemplateUrl:
-    Value: "/c1.compiled.yaml"
   c1bCfTemplateVersion:
     Value: latest
-  c2CfTemplateUrl:
-    Value: "/c2.compiled.yaml"
+  c1cc1OutParam:
+    Value:
+      Ref: c1-cBucket
+  c1cCfTemplateVersion:
+    Value: latest
   c2CfTemplateVersion:
     Value: latest
 Parameters:
@@ -68,6 +77,10 @@ Parameters:
     Type: String
     Default: ''
     NoEcho: false
+  c1cbubbleParam:
+    Type: String
+    Default: ''
+    NoEcho: false
 Description: c@latest - vlatest
 Conditions:
   UseC1:
@@ -81,3 +94,6 @@ Mappings:
   c1bbucketnames:
     default:
       name: mybucketname
+  c1cbucketnames:
+    default:
+      name: mybucketname

spec/data/flatten/src/c.cfhighlander.rb

@@ -10,6 +10,7 @@
 
   Component template: 'c1', name: 'c1a', render: Inline
   Component template: 'c1', name: 'c1b', render: Inline
+  Component template: 'c1', name: 'c1-c', render: Inline
 
   Component template:'c2',name:'c2', render: Inline do
     parameter name: 'c1OutParam', value: FnIf('UseC1',