bbc-cosmos-tools 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b358639cde84b36b8b73c0261fdf68e7677a068
-  data.tar.gz: 0e8a1f8dfb9c64f8fdea45efd473bfc565b165bd
+  metadata.gz: ae2b9e2dd15ad2345d36171607515618f1f46f3a
+  data.tar.gz: 773bab960e3b232518140a7dd16a9d7ec6bbc95b
 SHA512:
-  metadata.gz: 493633c52be2c6edc27ed3582a9e10ea81cb540a278968205caf8a86ff26d4464c17462c83b702f2a577e9e84ad5cbedbfbb346489dd874c99a6f1947d944100
-  data.tar.gz: 9c7e0494c6ca78c19cdfd2f9010b55ef1c78a5c10f66b3134a08118c1a0a23d35a790a843f5441039525c552b323c07475a5754a0950be5e1948efeb08add36e
+  metadata.gz: 1593ed3e95785317ca7b2626b8c80c006301be9bd77a67f802a49ebbbc39d93b90099f7fcf90be76af12bf8ddcb08256e4c05a958b831e3cc9e67351ddf264c0
+  data.tar.gz: e6d5038ac4673d2df28a2adb9c5e1b2b49cc8af32dcd840de56919f06e0e41b7bead000fbdd67607e265aa085fbf9cc95ee66bfcdd068cadf142cd8e33d9bab3

data/README.md

@@ -161,6 +161,11 @@ bbc:
     stack_details: '/cosmos/env/%s/component/%s/stack/%s'
 ```
 
+> Note: `stack_details` is needed for when a stack update happens. As we don't have all the config values that Cosmos should automatically add in for us when it's created, we need to get them from Cosmos and add them to the parameter list when doing the update
+
+Steven Jack [12:38 PM]
+otherwise they'll be blank
+
 Where as the contents of `{component}.yaml.erb` can look like the following:
 
 ```yaml

data/lib/bbc/cosmos/tools/cloudformation/generator.rb

@@ -27,7 +27,7 @@ module BBC
               hash = JSON.parse(template.to_json)
 
               if component_exists?(component, config) && stack_exists?(component, config, options[:stack])
-                config.resources['cloudformation']['components'][component][options[:stack]]['variants'][options[:variant]].each do |key, value|
+                component_parameters(config.resources, options, component).each do |key, value|
                   hash['Parameters'][key]['Default'] = value if hash['Parameters'][key]
                 end
               end
@@ -40,7 +40,7 @@ module BBC
             if data['Parameters']
               data['Parameters'].reduce({}) do |object, (key, value)|
                 object.tap do |o|
-                  o[key] = value['Default'] unless reserved_main_stack_param_for(key, main_stack)
+                  o[key] = value['Default'] unless reserved_main_stack_param_for(key, main_stack) && value['Default'].nil?
                 end
               end
             else
@@ -58,6 +58,26 @@ module BBC
 
           private
 
+          def self.component_stack_details(resources, options, component)
+            raise("cloudformation: -> components: node is missing from the environment resource file") unless resources.has_key?("cloudformation") && resources['cloudformation'].has_key?("components")
+
+            components = resources['cloudformation']['components']
+            raise("'#{component}' node missing from cloudformation: -> components: nodes") unless components.has_key?(component)
+            component = components[component]
+
+            raise("'#{options[:stack]}' stack node missing from cloudformation: -> components: -> #{component}:") unless component.has_key?(options[:stack])
+            component[options[:stack]]
+          end
+
+          def self.variants(component_meta, variant = nil)
+            component_meta.has_key?('variants') ? component_meta['variants'][variant] : component_meta['parameters']
+          end
+
+          def self.component_parameters(resources, options, component)
+            stack_data = component_stack_details(resources, options, component)
+            variants(stack_data, options[:variant])
+          end
+
           def self.reserved_main_stack_param_for(key, main_stack)
             main_stack && RESERVED_MAIN_STACK_PARAMS.include?(key)
           end

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

@@ -85,15 +85,18 @@ module BBC
               components(options, component).each do |id|
                 say get_key_value("\nComponent", id)
 
-                type = Tools::Types::Factory.create(id, options, config)
-                data = type.generate_data
+                type       = Tools::Types::Factory.create(id, options, config)
+                data       = type.generate_data
+                stack_data = Tools::Cloudformation::Generator.component_stack_details(config.resources, options, id)
+
                 post_data = {
-                  'name_suffix'   => options[:stack],
-                  'service_stack' => main_stack.match(/(true|t|yes|y|1)$/i) != nil,
-                  'template'      => data,
-                  'parameters'    => Tools::Cloudformation::Generator.parameters(data, main_stack),
+                  'name_suffix'    => options[:stack],
+                  'service_stack'  => main_stack.match(/(true|t|yes|y|1)$/i) != nil,
+                  'template'       => data,
+                  'parameters'     => Tools::Cloudformation::Generator.parameters(data, main_stack),
                 }
 
+                post_data['aws_account_id'] = stack_data['account_id'] unless stack_data['account_id'].nil?
                 response = api.post sprintf(config.app['stack_create_endpoint'], options[:env], id), JSON.pretty_generate(post_data)
 
                 if response.success?

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

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-        VERSION = "0.4.9"
+        VERSION = "0.5.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tool for pusing config to cosmos and controlling cloudformation templates