moonshot 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706a76719c8af3e934f0f141d79ca04513456fa6
-  data.tar.gz: 7f4912bacb3d49ba8015d71130db779ef1e912ed
+  metadata.gz: 817938d5e697cd44c2c346438043111c7d323538
+  data.tar.gz: 68b387fdfbfc3c191c6b7270fd241112f39cec92
 SHA512:
-  metadata.gz: 9fd5749505b66b86c639aef84e862a3b83360ee66528d34930131282754cec3d018f7dbad38bc0d6c9887bfc5b8d9b8aa850b50fa1535fa2949511c2b49cabb2
-  data.tar.gz: f2d265eaf095ad3e387cef1ce435405875645873f74ce938bd1b0f547e11a1042f0fc0138c4a7b88c4b55602ff9c6923cccb98130532a72f8211c35166cd4a8a
+  metadata.gz: b6e66c46e218e4e1763b11bed6043a7b9225b6962a7de5cf8ffd59519666d4e38ccb72c4e783a3f40ca0b3454faa9f51c00e8f5efcf683bd5c8663fa34b7efd3
+  data.tar.gz: f675f519b87322a2802d5198b399ce78a16e616bf2b573466e685c36460ddbbc2ffc78e55630b255179aa26db26829f032b14087d98596227a83195df901284a

data/lib/moonshot/cli.rb

@@ -1,4 +1,6 @@
 require 'interactive-logger'
+require_relative 'default_strategy'
+require_relative 'merge_strategy'
 
 # Base class for Moonshot-powered project tooling.
 module Moonshot
@@ -16,6 +18,7 @@ module Moonshot
       attr_accessor :build_mechanism
       attr_accessor :deployment_mechanism
       attr_accessor :default_parent_stack
+      attr_accessor :default_parameter_strategy
       attr_reader :plugins
 
       def plugin(plugin)
@@ -27,6 +30,10 @@ module Moonshot
         @default_parent_stack = value
       end
 
+      def parameter_strategy(strategy)
+        @default_parameter_strategy = strategy
+      end
+
       def check_class_configuration
         raise Thor::Error, 'No application_name is set!' unless application_name
       end
@@ -80,10 +87,25 @@ module Moonshot
           elsif self.class.default_parent_stack
             config.parent_stacks << self.class.default_parent_stack
           end
+
+          parameter_strategy = options[:parameter_strategy] || self.class.default_parameter_strategy
+          config.parameter_strategy = parameter_strategy_factory(parameter_strategy) \
+            unless parameter_strategy.nil?
         end
       rescue => e
         raise Thor::Error, e.message
       end
+
+      def parameter_strategy_factory(value)
+        case value.to_sym
+        when :default
+          Moonshot::ParameterStrategy::DefaultStrategy.new
+        when :merge
+          Moonshot::ParameterStrategy::MergeStrategy.new
+        else
+          raise Thor::Error, "Unknown parameter strategy: #{value}"
+        end
+      end
     end
 
     desc :list, 'List stacks for this application.'
@@ -106,7 +128,14 @@ module Moonshot
     end
 
     desc :update, 'Update the CloudFormation stack within an environment.'
-    option :show_all_events, desc: 'Show all stack events during update. (Default: errors only)'
+    option(
+      :parameter_strategy,
+      type: :string,
+      desc: 'Override default parameter strategy.')
+    option(
+      :show_all_events,
+      type: :boolean,
+      desc: 'Show all stack events during update. (Default: errors only)')
     def update
       controller.update
     end

data/lib/moonshot/controller.rb

@@ -86,6 +86,7 @@ module Moonshot
                            ilog: @config.interactive_logger) do |config|
         config.parent_stacks = @config.parent_stacks
         config.show_all_events = @config.show_all_stack_events
+        config.parameter_strategy = @config.parameter_strategy
       end
     end
 

data/lib/moonshot/controller_config.rb

@@ -1,3 +1,5 @@
+require_relative 'default_strategy'
+
 module Moonshot
   # Holds configuration for Moonshot::Controller
   class ControllerConfig
@@ -12,6 +14,7 @@ module Moonshot
     attr_accessor :parent_stacks
     attr_accessor :plugins
     attr_accessor :show_all_stack_events
+    attr_accessor :parameter_strategy
 
     def initialize
       @auto_prefix_stack = true
@@ -20,6 +23,7 @@ module Moonshot
       @parent_stacks = []
       @plugins = []
       @show_all_stack_events = false
+      @parameter_strategy = Moonshot::ParameterStrategy::DefaultStrategy.new
     end
   end
 end

data/lib/moonshot/default_strategy.rb

@@ -0,0 +1,17 @@
+module Moonshot
+  module ParameterStrategy
+    # Default strategy: grabbing every parameter
+    # from the parameter file.
+    class DefaultStrategy
+      def parameters(_, overrides)
+        overrides.map do |key, _|
+          {
+            parameter_key: key,
+            parameter_value: overrides[key],
+            use_previous_value: false
+          }
+        end
+      end
+    end
+  end
+end

data/lib/moonshot/merge_strategy.rb

@@ -0,0 +1,28 @@
+require 'highline/import'
+require_relative 'unicode_table'
+
+module Moonshot
+  module ParameterStrategy
+    # Merge strategy: merging parameter values
+    # declared in the parameter file, otherwise
+    # using previous value.
+    class MergeStrategy
+      def parameters(current, overrides)
+        current.map do |key, _|
+          if overrides[key]
+            {
+              parameter_key: key,
+              parameter_value: overrides[key],
+              use_previous_value: false
+            }
+          else
+            {
+              parameter_key: key,
+              use_previous_value: true
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/moonshot/stack.rb

@@ -260,7 +260,7 @@ module Moonshot
         stack_name: @name,
         template_body: template.body,
         capabilities: ['CAPABILITY_IAM'],
-        parameters: stack_parameter_overrides
+        parameters: @config.parameter_strategy.parameters(parameters, overrides)
       )
       true
     rescue Aws::CloudFormation::Errors::ValidationError => e

data/lib/moonshot/stack_config.rb

@@ -3,6 +3,7 @@ module Moonshot
   class StackConfig
     attr_accessor :parent_stacks
     attr_accessor :show_all_events
+    attr_accessor :parameter_strategy
 
     def initialize
       @parent_stacks = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -195,10 +195,12 @@ files:
 - lib/moonshot/controller.rb
 - lib/moonshot/controller_config.rb
 - lib/moonshot/creds_helper.rb
+- lib/moonshot/default_strategy.rb
 - lib/moonshot/deployment_mechanism/code_deploy.rb
 - lib/moonshot/doctor_helper.rb
 - lib/moonshot/environment_parser.rb
 - lib/moonshot/interactive_logger_proxy.rb
+- lib/moonshot/merge_strategy.rb
 - lib/moonshot/resources.rb
 - lib/moonshot/resources_helper.rb
 - lib/moonshot/shell.rb