cfndsl 1.0.4 → 1.0.5

data/lib/cfndsl/rake_task.rb

@@ -135,7 +135,8 @@ module CfnDsl
     # @param [Hash] yaml_opts, other options to pass to YAML generator
     def yaml(name:, files:, pathmap:, extras: [], **yaml_opts)
       generate_model_tasks(name: name, files: files, pathmap: pathmap, extras: extras) do |model, f|
-        YAML.dump(model, f, **yaml_opts)
+        simple_model = JSON.parse(model.to_json) # convert model to a simple ruby object to avoid yaml tags
+        YAML.dump(simple_model, f, **yaml_opts)
       end
       self
     end
@@ -189,7 +190,7 @@ module CfnDsl
       files.each do |source|
         matched_extras = build_extras_filelist(source, extras)
 
-        file source.pathmap(pathmap) => [source, :load_spec_types, matched_extras] do |task|
+        file source.pathmap(pathmap) => [source, :load_spec_types, *matched_extras] do |task|
           eval_extras = matched_extras.map { |e| [:yaml, e] } # eval treats yaml and json same
           puts "Generating Cloudformation for #{source} to #{task.name}"
           model = CfnDsl.eval_file_with_extras(source, eval_extras, verbose)

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/sample/t1-extra.yaml

@@ -0,0 +1 @@
+description: 5 machine cluster

data/sample/t1.yaml

@@ -1,2 +1 @@
-description: 5 machine cluster
 machines: 5

data/spec/generate_spec.rb

@@ -12,6 +12,7 @@ describe Cfnlego do
       output << '# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-domain'
       output << "\n    InstanceId String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-instanceid"
       output << "\n    PublicIpv4Pool String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-publicipv4pool"
+      output << "\n    Tags [List] # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-tags"
       output << "\n  end\nend\n"
       expect(template).to eq output
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Steven Jack
@@ -128,6 +128,7 @@ files:
 - sample/import.rb
 - sample/lambda.rb
 - sample/s3.rb
+- sample/t1-extra.yaml
 - sample/t1.rb
 - sample/t1.yaml
 - sample/vpc_example.rb