bbc-cosmos-tools 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb7442d963df4f4ca2d403ba2f37e831616363f
-  data.tar.gz: add8398183ee75d4580df67175ee25c7a8835be9
+  metadata.gz: 8d26da77c385f8b9e34fb1de6d2d6cb12c543a4c
+  data.tar.gz: aaa7528cffee9477830c0e5fa05af94fc05265dd
 SHA512:
-  metadata.gz: 9e382b385c6ea1b38fc6a3f58fdf82a9c61650d19401f492f7df9537334006df9cd6bc64b5138a9180932043eae90a4426acd33325e97aab360305e392b61c95
-  data.tar.gz: 4f49a41d384d116bb140d5547552c4bace00a66cbd2b95e7533323457cea3b77a1e62a229a078310b2364a357f73be89916b7cb41169fadc2242b37586bb427d
+  metadata.gz: 5660dbe5a69153663a1e536b285dc1240166a904ebec8f913b6342c78d89b58f13882a27d984d3f1a8d1341d4816c84691fd6a584b23187dbfc006f83ee24ea7
+  data.tar.gz: f84de60b7a3b3556d05eb6fbdf01e2cfeefb21a7167757552f546d302897f91c7e15aad1c85880c7ba8d13db4ad0b24debc024d98ceaeca16b8a0ed92e0c0098

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

@@ -7,6 +7,8 @@ module BBC
       module Cloudformation
         class Generator
 
+          RESERVED_MAIN_STACK_PARAMS = ['Environment', 'PublicSubnet1Id', 'PublicSubnet2Id', 'PublicSubnet3Id', 'ImageId', 'VpcId', 'PrivateSubnet1Id', 'PrivateSubnet2Id', 'PrivateSubnet3Id', 'BastionAccessSecurityGroup', 'DomainNameBase', 'KeyName']
+
           def self.component_exists?(component, config)
             config.resources['cloudformation']['components'][component]
           end
@@ -34,10 +36,12 @@ module BBC
             end
           end
 
-          def self.parameters(data)
+          def self.parameters(data, main_stack = true)
             if data['Parameters']
               data['Parameters'].reduce({}) do |object, (key, value)|
-                object.tap { |o| o[key] = value['Default'] }
+                object.tap do |o|
+                  o[key] = value['Default'] unless main_stack && RESERVED_MAIN_STACK_PARAMS.include? key
+                end
               end
             else
               {}

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

@@ -91,7 +91,7 @@ module BBC
                   'name_suffix'   => options[:stack],
                   'service_stack' => main_stack.match(/(true|t|yes|y|1)$/i) != nil,
                   'template'      => data,
-                  'parameters'    => Tools::Cloudformation::Generator.parameters(data),
+                  'parameters'    => Tools::Cloudformation::Generator.parameters(data, main_stack),
                 }
 
                 response = api.post sprintf(config.app['stack_create_endpoint'], options[:env], id), JSON.pretty_generate(post_data)
@@ -125,7 +125,7 @@ module BBC
                 @l.(d, id, options[:env])
               end
 
-              params = Tools::Cloudformation::Generator.parameters(data)
+              params = Tools::Cloudformation::Generator.parameters(data, false)
 
               post_data = {
                 'template'    => data,

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

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-        VERSION = "0.4.1"
+        VERSION = "0.4.2"
     end
   end
 end

metadata

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