bbc-cosmos-tools 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c052e70bf55d6b859d9c3b6f7aec1573828fb0
-  data.tar.gz: 58cdf9bb265c6f1544b7a60bddfa6a090e13d4c6
+  metadata.gz: c9f73c62ff74b961229432dd533a9ebd0bf8b025
+  data.tar.gz: 3d456c48f0f1455b0f0ec8112ae2f3507203f4d0
 SHA512:
-  metadata.gz: 93b2ed6fe6c2155e022e9b17bfc4626d651f5e491b04ebb3cb6fd4e659d507c6adbb27c5229a95727596c7f50dcc47860ff48e78cab7bd3248df67d9969719a1
-  data.tar.gz: d62438d8c0a3f2639dbdd41bd3c162749a98323551c5fb8b212bfa5b3756ba2075f1d0d662438fcf483848141b84683f430d912b80e46b9320770cd1d39c6775
+  metadata.gz: 7da7d791f4eb7318141eb379f20d6cf6ac7a4da67a7744df2b90c583b0bbd1c90460e22c65a3dad726b4c24f58fca7596deb69e087f0cadf4dec5ff0e8b6d7dc
+  data.tar.gz: f027c41e34a4eb9c50a0382c81cfe1b4d9d6ccdc60fc044f204eb71321dd83620c7d1b1f93cf5e4f76dc795daf5eca911374b0854e92d11fb18eb91ee560fa63

data/lib/bbc/cosmos/tools/commands/stack.rb

@@ -125,6 +125,13 @@ module BBC
                 @l.(d, id, options[:env])
               end
 
+              stack_meta = stack_data(component, stack_name, options[:env])
+
+              data['Parameters'] = deep_merge(
+                stack_parameters(stack_meta['parameters']),
+                data['Parameters']
+              )
+
               params = Tools::Cloudformation::Generator.parameters(data, false)
 
               post_data = {
@@ -201,14 +208,34 @@ module BBC
 
           private
 
+          def stack_parameters(stack_data)
+            stack_data.reduce({}) do |accum, (key, value)|
+              accum.tap do |a|
+                a[key] = {
+                  "Default" => value["value"]
+                }
+              end
+            end
+          end
+
+          def stack_data(component, stack_name, env = 'int')
+            response = api.get sprintf(config.app['stack_details'], env, component, stack_name)
+            JSON.parse(response.body)
+          end
+
           def latest_ami_for(component, env = 'int')
             response = api.get sprintf(config.app['deployments'], component, env)
             api_error response unless response.success?
             JSON.parse(response.body).first['image']['ami_id']
           end
+
+          def deep_merge(merger, mergee)
+            merge_proc = Proc.new { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merge_proc) : v2 }
+            merger.merge(mergee, &merge_proc)
+          end
+
         end
       end
     end
   end
 end
-

data/lib/bbc/cosmos/tools/types/cfndsl.rb

@@ -11,8 +11,7 @@ module BBC
             @config  = config
           end
 
-          def generate_data
-            to_json = false
+          def generate_data(to_json = false)
 
             # Because the block is evaluated in the context of another class
             # i.e. instance_eval &block

data/lib/bbc/cosmos/tools/version.rb

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-        VERSION = "0.4.3"
+        VERSION = "0.4.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler