stack_master 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dac9ea54e5fb5f551c15e0d077816eb62b79cb7a
-  data.tar.gz: f9e58ade11de8c75902ffc8ed83a03d623b02a83
+  metadata.gz: dfd66f0ae759e197674b37f60c86753379a27b3d
+  data.tar.gz: 6ef5f772326ac2128d0d21667b1aa88cc4f066af
 SHA512:
-  metadata.gz: 18f4ad8e75146c81a63b33aade1e97ac14d133863def43e62f78e969120122eeba7ec33f90253d7582904443d9cedcab444d54c57e43637e5800981ff0a4000d
-  data.tar.gz: 311a35d9e1976033c4ab45a588199596b8be674af0669abd0dc27c77ec7f17f9a28b09d050ab0586b72fc578c02afab99aec9acf5112f6ac57fdbe9df988e574
+  metadata.gz: fd853147d8aa925242872f9fcc24fa3e79572c6b23a3009a721303126afb0a34b411d18d41b90d2377371155bc61a93557b0367a29d1537a1a7bb30d2f905590
+  data.tar.gz: 39f780912d2be5c8176b2ae36d185fcd2736ebb3f3448ea89d1629299e2cfc7a9141dd8d4f78e6d45be1b0874c8bf1c53c43b223b34975fd354c73eddeac7cf5

data/README.md

@@ -329,6 +329,19 @@ my_parameter:
     - value2
 ```
 
+Array parameter values can include nested parameter resolvers.
+
+For example, given the following parameter definition:
+```
+my_parameter:
+  - stack_output: my-stack/output # value resolves to 'value1'
+  - value2
+```
+The parameter value will resolve to:
+```
+my_parameter: 'value1,value2'
+```
+
 ## ERB Template Files in SparkleFormation templates
 
 An extension to SparkleFormation is the `user_data_file!` method, which evaluates templates in `templates/user_data/[file_name]`. Most of the usual SparkleFormation methods are available in user data templates. Example:

data/lib/stack_master/parameter_resolver.rb

@@ -47,7 +47,7 @@ module StackMaster
 
     def resolve_parameter_value(key, parameter_value)
       return parameter_value.to_s if Numeric === parameter_value || parameter_value == true || parameter_value == false
-      return parameter_value.join(',') if Array === parameter_value
+      return resolve_array_parameter_values(key, parameter_value).join(',') if Array === parameter_value
       return parameter_value unless Hash === parameter_value
       validate_parameter_value!(key, parameter_value)
 
@@ -61,6 +61,12 @@ module StackMaster
       raise InvalidParameter, $!.message
     end
 
+    def resolve_array_parameter_values(key, parameter_values)
+      parameter_values.reduce([]) do |values, parameter_value|
+        values << resolve_parameter_value(key, parameter_value)
+      end
+    end
+
     def call_resolver(class_name, value)
       resolver_class(class_name).resolve(value)
     end

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.10.2"
+  VERSION = "0.11.0"
 end

data/spec/stack_master/parameter_resolver_spec.rb

@@ -66,6 +66,16 @@ RSpec.describe StackMaster::ParameterResolver do
     }.to_not raise_error
   end
 
+  context 'when array values contain resolver hashes' do
+    it 'returns the comma separated string values returned by the resolvers' do
+      expect(resolve(param: [1, { my_resolver: 2 }])).to eq(param: '1,10')
+    end
+
+    it 'returns nested array values' do
+      expect(resolve(param: [[1, { my_resolver: 3 }], { my_resolver: 2 }])).to eq(param: '1,15,10')
+    end
+  end
+
   context 'when given a proper resolve hash' do
     it 'returns the value returned by the resolver as the parameter value' do
       expect(resolve(param: { my_resolver: 2 })).to eq(param: 10)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -450,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track