cfndsl 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c8059b1c93fbda0e1d99c571151e7f3d304f58e5aab6a77fc742ded0e60e8d
-  data.tar.gz: 70bc2d78fcf6187bb06f6c3d345f2947b3d95904d18efb232287757c0561d6d3
+  metadata.gz: 9cf9bc6b5e89d82bad3ceb1d70ca8d21e45b56a0ddf10a86c193a276ed002ce7
+  data.tar.gz: 2c18e5728f5344dfea8a25250710859b232f1db9bbff9eab1e2265bbc1a38be0
 SHA512:
-  metadata.gz: ae4df9627c992947913d19e2bf997ce38a2e256e460a34750bc9f210c2fa84cf696785aed3d8017270c865be32c7ff2b780a29d5720788d2a687ed9de0483709
-  data.tar.gz: fd5c4d3b66df51391a2a1c3cfe28102383efbe1e681b21191cdc301ca283782ce0082b6be4221effbbd86b7680d433e4b2a5540668b6bbcd80891fb47da5bcb5
+  metadata.gz: 867b4f09e4f6003b74d7fc6f7893d96022219c1e28e8d4cc4238820735373fed90380c387dc1fced44f5bc0698c9e9ad604fde82551f7d2f105fcdb017c0faec
+  data.tar.gz: 0baf10e9ca24ea7bee83915ccf6a7b1ef2036ad80c3887da67b56bed34fd6aabd9d72d37c55b5081ce91175c61cc554feee9c0b979dd48d7aab4aa06611a8483

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [1.0.6](https://github.com/cfndsl/cfndsl/tree/1.0.6) (2020-04-24)
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.0.5...1.0.6)
+## [1.1.0](https://github.com/cfndsl/cfndsl/tree/1.1.0) (2020-06-01)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.0.6...1.1.0)
+
+**Closed issues:**
+
+- Shorthand method of accessing resource attributes via FnSub fails reference checks [\#455](https://github.com/cfndsl/cfndsl/issues/455)
+
+**Merged pull requests:**
+
+- Fix \#455 [\#456](https://github.com/cfndsl/cfndsl/pull/456) ([lwoggardner](https://github.com/lwoggardner))
+
+## [v1.0.6](https://github.com/cfndsl/cfndsl/tree/v1.0.6) (2020-04-23)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.0.5...v1.0.6)
 
 **Fixed bugs:**
 
@@ -138,10 +149,6 @@
 ## [v0.17.3](https://github.com/cfndsl/cfndsl/tree/v0.17.3) (2019-09-13)
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.2...v0.17.3)
 
-**Merged pull requests:**
-
-- Fix for \#418. This time with less pre 1.0.... [\#420](https://github.com/cfndsl/cfndsl/pull/420) ([cmaxwellau](https://github.com/cmaxwellau))
-
 ## [v0.17.2](https://github.com/cfndsl/cfndsl/tree/v0.17.2) (2019-09-05)
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.1...v0.17.2)
 
@@ -240,6 +247,7 @@
 
 **Merged pull requests:**
 
+- Fix for \#418. This time with less pre 1.0.... [\#420](https://github.com/cfndsl/cfndsl/pull/420) ([cmaxwellau](https://github.com/cmaxwellau))
 - implement json patch for patches and pull in patches from CDK [\#386](https://github.com/cfndsl/cfndsl/pull/386) ([gergnz](https://github.com/gergnz))
 
 ## [v0.16.9](https://github.com/cfndsl/cfndsl/tree/v0.16.9) (2018-12-07)

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

data/lib/cfndsl/version.rb

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

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/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler