cfndsl 1.0.3 → 1.1.1

data/lib/cfndsl/cfnlego/cloudformation.rb

@@ -14,7 +14,7 @@ module Cfnlego
     end
 
     def render
-      erb = ERB.new(File.read(TEMPLATE), nil, '-')
+      erb = ERB.new(File.read(TEMPLATE), trim_mode: '-')
       erb.result(binding)
     end
   end

data/lib/cfndsl/jsonable.rb

@@ -87,7 +87,7 @@ module CfnDsl
     def FnSub(string, substitutions = nil)
       raise ArgumentError, 'The first argument passed to Fn::Sub must be a string' unless string.is_a? String
 
-      refs = string.scan(FN_SUB_SCANNER).map(&:first)
+      refs = string.scan(FN_SUB_SCANNER).map(&:first).map { |r| r.split('.', 2).first }
 
       if substitutions
         raise ArgumentError, 'The second argument passed to Fn::Sub must be a Hash' unless substitutions.is_a? Hash
@@ -169,7 +169,7 @@ module CfnDsl
     def check_names
       return if instance_variable_get('@Resources').nil?
 
-      instance_variable_get('@Resources').keys.each do |name|
+      instance_variable_get('@Resources').each_key do |name|
         next unless name !~ /\A\p{Alnum}+\z/
 
         warn "Resource name: #{name} is invalid"

data/lib/cfndsl/orchestration_template.rb

@@ -22,7 +22,7 @@ module CfnDsl
   # Handles the overall template object
   # rubocop:disable Metrics/ClassLength
   class OrchestrationTemplate < JSONable
-    dsl_attr_setter :AWSTemplateFormatVersion, :Description, :Metadata, :Transform
+    dsl_attr_setter :AWSTemplateFormatVersion, :Description, :Metadata, :Transform, :Hooks
     dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping, :Rule
 
     GLOBAL_REFS = {

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/resources.rb

@@ -5,7 +5,7 @@ require_relative 'jsonable'
 module CfnDsl
   # Handles Resource objects
   class ResourceDefinition < JSONable
-    dsl_attr_setter :Type, :DependsOn, :DeletionPolicy, :Condition, :Metadata
+    dsl_attr_setter :Type, :DependsOn, :UpdateReplacePolicy, :DeletionPolicy, :Condition, :Metadata
     dsl_content_object :Property, :UpdatePolicy, :CreationPolicy
 
     def add_tag(name, value, propagate = nil)

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '1.0.3'
+  VERSION = '1.1.1'
 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/cloud_formation_template_spec.rb

@@ -40,6 +40,26 @@ describe CfnDsl::CloudFormationTemplate do
         expect(subject.validate).to equal(subject)
       end
 
+      it 'returns self if there are valid Fn::Sub references to other resources' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnSub('prefix ${TestResource2}suffix'))
+
+        t2 = subject.Resource('TestResource2')
+        t2.Type('Custom-TestType')
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'returns self if there are valid Fn::Sub references to other resource attributes' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnSub('prefix ${TestResource2.AnAttribute}suffix'))
+
+        t2 = subject.Resource('TestResource2')
+        t2.Type('Custom-TestType')
+        expect(subject.validate).to equal(subject)
+      end
+
       it 'returns self if there are valid DependsOn to other resources' do
         tr = subject.Resource(:TestResource)
         tr.Type('Custom-TestType')
@@ -119,6 +139,13 @@ describe CfnDsl::CloudFormationTemplate do
         expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*itself/i)
       end
 
+      it 'raises CfnDsl::Error if a resourcs references itself in Fn::Sub attribute expression' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnSub('${TestResource.attr}'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*itself/i)
+      end
+
       it 'raises CfnDsl::Error if there are cyclic DependsOn references' do
         tr = subject.Resource(:ResourceOne)
         tr.Type('Custom-TestType')
@@ -211,6 +238,12 @@ describe CfnDsl::CloudFormationTemplate do
         expect(subject.validate).to equal(subject)
       end
 
+      it 'returns self if there are valid Fn::Sub references to resource attributes' do
+        subject.Resource(:TestResource)
+        subject.Output('TestResourceOutput').Value(subject.FnSub('prefix ${TestResource.attr}suffix'))
+        expect(subject.validate).to equal(subject)
+      end
+
       it 'raises CfnDsl::Error if references a non existent condition' do
         subject.Output(:TestOutput).Condition('NoCondition')
         expect { subject.validate }.to raise_error(CfnDsl::Error, /TestOutput.*NoCondition/)

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.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - lib/cfndsl/aws/patches/000_sam.spec.json
 - lib/cfndsl/aws/patches/100_sam.spec_DeploymentPreference_patch.json
 - lib/cfndsl/aws/patches/200_Scrutinies_patch.json
+- lib/cfndsl/aws/patches/500_BadTagsv13.0.0_patch.json
 - lib/cfndsl/aws/patches/500_Cognito_IdentityPoolRoleAttachment_patches.json
 - lib/cfndsl/aws/patches/500_IoT1Click_patch_PlacementTemplate_DeviceTemplates.json
 - lib/cfndsl/aws/patches/500_NetworkAclEntry_patch.json
@@ -128,6 +129,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
@@ -182,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="