cfndsl 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08e50970be94f664f6e4775cb3367c51a16e8702e6ff023e632b69bd9802ab6
-  data.tar.gz: dc2ed8885d37cc044293a3cc1aa4ee4139a237042bc5722d2f07c78aecba584d
+  metadata.gz: ca0ed3764660d99aba5bab73da20c6e91d59e738bfb21e0bc8d8805eb8ecd63a
+  data.tar.gz: 592e14b691e4eb8367599507dc19adb6aedccdda01c32c219f44c6c2c5f84e31
 SHA512:
-  metadata.gz: 345a8c5bca051ecd484118cbb6ccbb862de0dceac2a9abbf5d314ca288741cd920be05fbe0a76b2331639a03f6e97bc48e2896ca0f3f6b7dc349e5ee862f4934
-  data.tar.gz: ae7442508593ec6bb3cd0957cd3656f6782e31d1487292c5a37bdd703b83aea3c4751b5a5470b630abfc2295b5c181415da5c3066986f772f49851c1b3c957fd
+  metadata.gz: 26c92723daeded312aad01d28d6b31fe238586e468a13a583741d9619295881f1e1602d1d3e121c9e23e861ef2992cc3c280924ee2395c935df9b7e82bb41b2d
+  data.tar.gz: 54b966108890545e7e7cda01871639c9d73ff3ffee8a4ef800c02ca2f94f096a71413b0892f55e2109508f2a72cca2eb951f07358b137b8065895a3da382c8cc

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [0.17.2](https://github.com/cfndsl/cfndsl/tree/0.17.2) (2019-09-05)
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.1...0.17.2)
+## [0.17.3](https://github.com/cfndsl/cfndsl/tree/0.17.3) (2019-09-13)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.2...0.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)
 
 **Fixed bugs:**
 
@@ -344,7 +351,6 @@
 **Merged pull requests:**
 
 - Update AWS::CloudWatch::Alarm with 2 new properties [\#312](https://github.com/cfndsl/cfndsl/pull/312) ([AnominousSign](https://github.com/AnominousSign))
-- Add support for AWS::KMS::Alias [\#265](https://github.com/cfndsl/cfndsl/pull/265) ([mikechau](https://github.com/mikechau))
 
 ## [v0.12.8](https://github.com/cfndsl/cfndsl/tree/v0.12.8) (2017-05-03)
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.12.7...v0.12.8)
@@ -501,6 +507,7 @@
 
 - Certificate manager type [\#267](https://github.com/cfndsl/cfndsl/pull/267) ([kornypoet](https://github.com/kornypoet))
 - Add monitoring properties to AWS::RDS::DBInstance [\#266](https://github.com/cfndsl/cfndsl/pull/266) ([mikechau](https://github.com/mikechau))
+- Add support for AWS::KMS::Alias [\#265](https://github.com/cfndsl/cfndsl/pull/265) ([mikechau](https://github.com/mikechau))
 
 ## [v0.11.6](https://github.com/cfndsl/cfndsl/tree/v0.11.6) (2016-10-23)
 [Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.11.5...v0.11.6)

data/lib/cfndsl/external_parameters.rb

@@ -51,7 +51,11 @@ module CfnDsl
         # rubocop:disable Style/SafeNavigation
         logstream.puts("Setting local variable #{key} to #{val}") if logstream
         # rubocop:enable Style/SafeNavigation
-        bind.eval "#{key} = #{val.inspect}"
+        if bind.eval "defined? #{key}"
+          bind.eval "#{key}.merge(#{val.inspect})"
+        else
+          bind.eval "#{key} = #{val.inspect}"
+        end
       end
     end
 

data/lib/cfndsl/version.rb

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

data/spec/external_parameters_spec.rb

@@ -3,6 +3,11 @@
 require 'spec_helper'
 
 describe CfnDsl::ExternalParameters do
+  let(:params_struct1) { "#{File.dirname(__FILE__)}/fixtures/params_struct1.yaml" }
+  let(:params_struct2) { "#{File.dirname(__FILE__)}/fixtures/params_struct2.yaml" }
+  let(:params_json) { "#{File.dirname(__FILE__)}/fixtures/params.json" }
+  let(:params_yaml) { "#{File.dirname(__FILE__)}/fixtures/params.yaml" }
+
   subject do
     exp = described_class.new
     exp.set_param(:username, 'Wiz Khalifa')
@@ -41,6 +46,21 @@ describe CfnDsl::ExternalParameters do
     end
   end
 
+  context '#set_param_capitalised' do
+    it 'treats keys as symbols only' do
+      subject.set_param('Reminder', 'You Know What It Is')
+      expect(subject['Reminder']).to eq('You Know What It Is')
+    end
+  end
+
+  context '#set_param_merge_struct' do
+    it 'treats keys as symbols only' do
+      subject.load_file(params_struct1)
+      subject.load_file(params_struct2)
+      expect(subject['TagStandard']).to eq('Tag1' => { 'Default' => 'value1' }, 'Tag2' => { 'Default' => 'value2' })
+    end
+  end
+
   context '#get_param' do
     it 'treats keys as symbols only' do
       subject.set_param(:reminder, 'You Know What It Is')
@@ -69,20 +89,16 @@ describe CfnDsl::ExternalParameters do
     end
   end
 
-  context '#load_file JSON', type: :aruba do
-    before { write_file('params.json', '{"reminder":"You Know What It Is"}') }
-
+  context '#load_file JSON' do
     it 'merges a JSON file as parameters' do
-      subject.load_file File.join(expand_path('./params.json'))
+      subject.load_file(params_json)
       expect(subject[:reminder]).to eq('You Know What It Is')
     end
   end
 
-  context '#load_file YAML', type: :aruba do
-    before { write_file('params.yaml', '{"reminder":"You Know What It Is"}') }
-
+  context '#load_file YAML' do
     it 'merges a YAML file as parameters' do
-      subject.load_file File.join(expand_path('./params.yaml'))
+      subject.load_file(params_yaml)
       expect(subject[:reminder]).to eq('You Know What It Is')
     end
   end

data/spec/fixtures/params.json

@@ -0,0 +1 @@
+{"reminder":"You Know What It Is"}

data/spec/fixtures/params.yaml

@@ -0,0 +1,2 @@
+---
+reminder: You Know What It Is

data/spec/fixtures/params_struct1.yaml

@@ -0,0 +1,4 @@
+---
+TagStandard:
+  Tag1:
+    Default: value1

data/spec/fixtures/params_struct2.yaml

@@ -0,0 +1,4 @@
+---
+TagStandard:
+  Tag2:
+    Default: value2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,10 @@ files:
 - spec/deep_merge_spec.rb
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
+- spec/fixtures/params.json
+- spec/fixtures/params.yaml
+- spec/fixtures/params_struct1.yaml
+- spec/fixtures/params_struct2.yaml
 - spec/fixtures/rule-assertion.json
 - spec/fixtures/serverless-api.json
 - spec/fixtures/serverless-function.json
@@ -173,6 +177,10 @@ test_files:
 - spec/deep_merge_spec.rb
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
+- spec/fixtures/params.json
+- spec/fixtures/params.yaml
+- spec/fixtures/params_struct1.yaml
+- spec/fixtures/params_struct2.yaml
 - spec/fixtures/rule-assertion.json
 - spec/fixtures/serverless-api.json
 - spec/fixtures/serverless-function.json