moonshot 1.0.0 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f5bce9f3b85c4023e62a5d250b4133c9ddf0de5
-  data.tar.gz: c1d4db11985435018417485dccac98d9063af19c
+  metadata.gz: 2940b0c43a48274eb8368400726fc3269ff6fdf9
+  data.tar.gz: fb6dfbf21127e8c55533bf848361f81c07f2b0d7
 SHA512:
-  metadata.gz: 9027ac025f8594b769147582b37b0aa09aeb8e4ecf35d6c0cd7ba975ffa8df25cceb52cc1b4a0ba352b4f27851c76f7b2d3b5e6def8e1c7bec52b76faf508326
-  data.tar.gz: c662be99a3702a0d5a35d1ee9911b4eba129cff211a3378e378493788577a24724f07cbb0e8276fb9ca67f4cc49475b2e23952957065968d39fd251b13f75c26
+  metadata.gz: 146242a237abcccc8229257e0c73310ff539ba1483a57695cc1d6ccbc534778ac015354a9b91fa7ee09e83a8c2e921c3e61946dfd7a5ce0169b04ef005b37376
+  data.tar.gz: aaf546412e380adc74bc823e7e2a7aef2e1ae31eafb35c2fe284e075b714940eb3d88b7c72dfa53a890f1bf9a62b0fb2108691f52eca510aa205bc1eccf67af2

data/lib/moonshot.rb

@@ -24,55 +24,6 @@ module Moonshot
   end
 end
 
-[
-  # Helpers
-  'creds_helper',
-  'doctor_helper',
-  'resources',
-  'resources_helper',
-
-  # Core
-  'interactive_logger_proxy',
-  'command_line',
-  'command',
-  'ssh_command',
-  'commands/build',
-  'commands/console',
-  'commands/create',
-  'commands/delete',
-  'commands/deploy',
-  'commands/doctor',
-  'commands/list',
-  'commands/push',
-  'commands/ssh',
-  'commands/status',
-  'commands/update',
-  'commands/version',
-  'controller',
-  'controller_config',
-  'stack',
-  'stack_config',
-  'stack_lister',
-  'stack_events_poller',
-  'merge_strategy',
-  'default_strategy',
-  'ask_user_source',
-  'always_use_default_source',
-
-  # Built-in mechanisms
-  'artifact_repository/s3_bucket',
-  'artifact_repository/s3_bucket_via_github_releases',
-  'build_mechanism/script',
-  'build_mechanism/github_release',
-  'build_mechanism/travis_deploy',
-  'build_mechanism/version_proxy',
-  'deployment_mechanism/code_deploy',
-
-  # Core Tools
-  'tools/asg_rollout'
-].each { |f| require_relative "moonshot/#{f}" }
-
-# Bundled plugins
-[
-  'backup'
-].each { |p| require_relative "plugins/#{p}" }
+require 'require_all'
+require_rel 'moonshot'
+require_rel 'plugins'

data/lib/moonshot/account_context.rb

@@ -0,0 +1,19 @@
+module Moonshot
+  module AccountContext
+    def self.get
+      @account ||= determine_account_name
+    end
+
+    def self.set(account_name)
+      @account = account_name
+    end
+
+    def self.reset
+      @account = nil
+    end
+
+    def self.determine_account_name
+      Aws::IAM::Client.new.list_account_aliases.account_aliases.first
+    end
+  end
+end

data/lib/moonshot/change_set.rb

@@ -0,0 +1,100 @@
+module Moonshot
+  class ChangeSet
+    attr_reader :name
+    attr_reader :stack_name
+
+    def initialize(name, stack_name)
+      @name = name
+      @stack_name = stack_name
+      @change_set = nil
+      @cf_client = Aws::CloudFormation::Client.new
+    end
+
+    def confirm?
+      unless Moonshot.config.interactive
+        raise 'Cannot confirm ChangeSet when interactive mode is disabled!'
+      end
+
+      loop do
+        print 'Apply changes? '
+        resp = gets.chomp.downcase
+
+        return true if resp == 'yes'
+        return false if resp == 'no'
+        puts "Please enter 'yes' or 'no'!"
+      end
+    end
+
+    def valid?
+      @change_set.status == 'CREATE_COMPLETE'
+    end
+
+    def invalid_reason
+      @change_set.status_reason
+    end
+
+    def display_changes
+      wait_for_change_set unless @change_set
+
+      @change_set.changes.map(&:resource_change).each do |c|
+        puts "* #{c.action} #{c.logical_resource_id} (#{c.resource_type})"
+
+        if c.replacement == 'True'
+          puts ' - Will be replaced'
+        elsif c.replacement == 'Conditional'
+          puts ' - May be replaced (Conditional)'
+        end
+
+        c.details.each do |d|
+          case d.change_source
+          when 'ResourceReference', 'ParameterReference'
+            puts " - Caused by #{d.causing_entity.blue} (#{d.change_source})"
+          when 'DirectModification'
+            puts " - Caused by template change (#{d.target.attribute}: #{d.target.name})"
+          end
+        end
+      end
+    end
+
+    def execute
+      wait_for_change_set unless @change_set
+      @cf_client.execute_change_set(
+        change_set_name: @name,
+        stack_name: @stack_name)
+    end
+
+    def delete
+      wait_for_change_set unless @change_set
+      @cf_client.delete_change_set(
+        change_set_name: @name,
+        stack_name: @stack_name)
+    rescue Aws::CloudFormation::Errors::InvalidChangeSetStatus
+      sleep 1
+      retry
+    end
+
+    # NOTE: At the time of this patch, AWS-SDK native Waiters do not
+    # have support for ChangeSets. Once they add this, we can make
+    # this code much better.
+    def wait_for_change_set
+      start = Time.now.to_i
+
+      loop do
+        resp = @cf_client.describe_change_set(
+          change_set_name: @name,
+          stack_name: @stack_name)
+
+        if %w(CREATE_COMPLETE FAILED).include?(resp.status)
+          @change_set = resp
+          return
+        end
+
+        if Time.now.to_i > start + 30
+          raise 'ChangeSet did not complete creation within 30 seconds!'
+        end
+
+        sleep 0.25 # http://bit.ly/1qY1ZXJ
+      end
+    end
+  end
+end

data/lib/moonshot/command.rb

@@ -5,7 +5,7 @@ module Moonshot
   class Command
     module ClassMethods
       # TODO: Can we auto-generate usage for commands with no positional arguments, at least?
-      attr_accessor :usage, :description
+      attr_accessor :usage, :description, :only_in_account
     end
 
     def self.inherited(base)
@@ -30,15 +30,6 @@ module Moonshot
         o.on('--[no-]interactive-logger', TrueClass, 'Enable or disable fancy logging') do |v|
           @use_interactive_logger = v
         end
-
-        o.on('--[no-]show-all-events', FalseClass, 'Show all stack events during update') do |v|
-          Moonshot.config.show_all_stack_events = v
-        end
-
-        o.on('-pPARENT_STACK', '--parent=PARENT_STACK',
-             'Parent stack to import parameters from') do |v|
-          Moonshot.config.parent_stacks = [v]
-        end
       end
     end
 
@@ -46,10 +37,9 @@ module Moonshot
 
     # Build a Moonshot::Controller from the CLI options.
     def controller
-      controller = Moonshot::Controller.new
-
-      # Apply CLI options to configuration defined by Moonfile.
-      controller.config = Moonshot.config
+      config = Moonshot.config
+      config.update_for_account!
+      controller = Moonshot::Controller.new(config)
 
       # Degrade to a more compatible logger if the terminal seems outdated,
       # or at the users request.

data/lib/moonshot/command_line.rb

@@ -1,5 +1,3 @@
-require 'thor'
-
 module Moonshot
   # This class implements the command-line `moonshot` tool.
   class CommandLine
@@ -12,7 +10,7 @@ module Moonshot
       @classes || []
     end
 
-    def run! # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
+    def run! # rubocop:disable CyclomaticComplexity, MethodLength, PerceivedComplexity
       # Commands defined as Moonshot::Commands require a properly
       # configured Moonshot.rb and supporting files. Without them, we only
       # support `--help` and `new`.
@@ -65,15 +63,9 @@ module Moonshot
         raise "Command not found '#{command}'"
       end
 
-      handler = @commands[command].new
-      handler.parser.parse!
-
-      unless ARGV.size == handler.method(:execute).arity
-        warn handler.parser.help
-        raise "Invalid command line for '#{command}'."
-      end
+      command_class = @commands[command]
 
-      handler.execute(*ARGV)
+      CommandLineDispatcher.new(command, command_class, ARGV).dispatch!
     end
 
     def load_plugins(moonfile_dir)
@@ -137,7 +129,6 @@ module Moonshot
         ARGV.delete_at(0)
         ARGV.push('-h')
       elsif ARGV[0] == 'new'
-        require_relative 'commands/new'
         app_name = ARGV[1]
         ::Moonshot::Commands::New.run!(app_name)
         return true

data/lib/moonshot/command_line_dispatcher.rb

@@ -0,0 +1,71 @@
+module Moonshot
+  class CommandLineDispatcher
+    def initialize(command, klass, args)
+      @command = command
+      @klass = klass
+      @args = args
+    end
+
+    def dispatch!
+      # Look to see if we're allowed only to run in certain accounts, or
+      # not allowed to run in specific accounts.
+      check_account_restrictions
+
+      # Allow any mechanisms or plugins to hook into this CLI command.
+      handler = @klass.new
+      parser = build_parser(handler)
+      parser.parse!
+
+      unless @args.size == handler.method(:execute).arity
+        warn handler.parser.help
+        raise "Invalid command line for '#{@command}'."
+      end
+
+      handler.execute(*@args)
+    end
+
+    private
+
+    def check_account_restrictions
+      this_account = Moonshot::AccountContext.get
+
+      return if @klass.only_in_account.nil? ||
+                Array(@klass.only_in_account).any? { |a| a == this_account }
+
+      warn "'#{@command}' can only be run in the following accounts:"
+      Array(@klass.only_in_account).each do |account_name|
+        warn "- #{account_name}"
+      end
+
+      raise 'Command account restriction violation.'
+    end
+
+    def build_parser(handler)
+      parser = handler.parser
+
+      # Each mechanism / plugin may manipulate the OptionParser object
+      # associated with this command.
+      [:build_mechanism, :deployment_mechanism, :artifact_repository].each do |prov|
+        provider = Moonshot.config.send(prov)
+
+        if provider.respond_to?(hook_func_name(@command))
+          parser = provider.send(hook_func_name(@command), parser)
+        end
+      end
+
+      Moonshot.config.plugins.each do |plugin|
+        if plugin.respond_to?(hook_func_name(@command))
+          parser = plugin.send(hook_func_name(@command), parser)
+        end
+      end
+
+      parser
+    end
+
+    # Name of the function a plugin or mechanism could define to manipulate
+    # the parser for a command.
+    def hook_func_name(command)
+      command.tr('-', '_') << '_cli_hook'
+    end
+  end
+end

data/lib/moonshot/commands/create.rb

@@ -1,9 +1,9 @@
-require_relative 'parameter_arguments'
-
 module Moonshot
   module Commands
     class Create < Moonshot::Command
       include ParameterArguments
+      include ShowAllEventsOption
+      include ParentStackOption
 
       self.usage = 'create [options]'
       self.description = 'Create a new environment'

data/lib/moonshot/commands/delete.rb

@@ -1,6 +1,8 @@
 module Moonshot
   module Commands
     class Delete < Moonshot::Command
+      include ShowAllEventsOption
+
       self.usage = 'delete [options]'
       self.description = 'Delete an existing environment'
 

data/lib/moonshot/commands/list.rb

@@ -1,6 +1,3 @@
-require_relative '../stack_lister'
-require_relative '../stack_list_printer'
-
 module Moonshot
   module Commands
     class List < Moonshot::Command

data/lib/moonshot/commands/new.rb

@@ -16,18 +16,12 @@ module Moonshot
 
           create_project_dir
           copy_defaults
-          create_file(parameter_path)
-          create_file(template_path)
           fill_moonfile
           print_success_message
         end
 
         private
 
-        def cwd
-          Dir.pwd
-        end
-
         def create_project_dir
           raise "Directory '#{@application_name}' already exists!" \
             if Dir.exist?(project_path)
@@ -35,7 +29,7 @@ module Moonshot
         end
 
         def project_path
-          @project_path ||= File.join(cwd, @application_name)
+          @project_path ||= File.join(Dir.pwd, @application_name)
         end
 
         def copy_defaults
@@ -43,55 +37,39 @@ module Moonshot
           FileUtils.cp_r(target_path, project_path)
         end
 
-        def create_file(path)
-          FileUtils.touch(path)
-        end
-
-        def moonfile_path
-          File.join(project_path, 'Moonfile.rb')
-        end
-
-        def parameter_path
-          File.join(cf_dir, 'parameters', "#{@application_name}.yml")
-        end
-
-        def template_path
-          File.join(cf_dir, "#{@application_name}.json")
-        end
-
-        def cf_dir
-          File.join(project_path, 'cloud_formation')
-        end
-
         def fill_moonfile
-          File.open(moonfile_path, 'w') { |f| f.write generate_moonfile }
+          File.open(File.join(project_path, 'Moonfile.rb'), 'w') { |f| f.write generate_moonfile }
         end
 
         def generate_moonfile
           <<-EOF
-            Moonshot.config do |m|
-              m.app_name = '#{@application_name}'
-              m.artifact_repository = S3Bucket.new('<your_bucket>')
-              m.build_mechanism = Script.new('bin/build.sh')
-              m.deployment_mechanism = CodeDeploy.new(asg: 'AutoScalingGroup')
-            end
-        	EOF
+Moonshot.config do |m|
+  m.app_name             = '#{@application_name}'
+  m.artifact_repository  = S3Bucket.new('<your_bucket>')
+  m.build_mechanism      = Script.new('bin/build.sh')
+  m.deployment_mechanism = CodeDeploy.new(asg: 'AutoScalingGroup')
+end
+EOF
         end
 
         def print_success_message
-          warn 'Your application is configured, the following changes have '\
-               'been made to your project directory:'
-          warn ''
-          warn '- Created a Moonfile.rb where you can configure your project.'
-          warn '- Created moonshot/plugins where you can add hooks to core '\
-               'Moonshot actions.'
-          warn '- Created moonshot/cli_extensions where you can create '\
-               'project-specific commands.'
-          warn ''
-          warn 'You will also need to ensure your Amazon account is configured'\
-               ' for CodeDeploy, by creating a role that allows deployments. '\
-               'See: http://moonshot.readthedocs.io/en/latest/mechanisms/'\
-               'deployment/'
+          warn <<-EOF
+Your application is configured, the following changes have been made
+to your project directory:
+
+  * Created Moonfile.rb, where you can configure your project.
+  * Created moonshot/plugins, where you can place custom Ruby code
+    to add hooks to core Moonshot actions (create, update, delete, etc.)
+  * Created moonshot/cli_extensions, where you can place custom Ruby
+    code to add your own project-specific commands to Moonshot.
+  * Created moonshot/template.yml, where you can build your
+    CloudFormation template.
+
+You will also need to ensure your Amazon account is configured for
+CodeDeploy by creating a role that allows deployments.
+
+See: http://moonshot.readthedocs.io/en/latest/mechanisms/deployment/
+EOF
         end
       end
     end

data/lib/moonshot/commands/parent_stack_option.rb

@@ -0,0 +1,14 @@
+module Moonshot
+  module Commands
+    module ParentStackOption
+      def parser
+        parser = super
+
+        parser.on('-pPARENT_STACK', '--parent=PARENT_STACK',
+                  'Parent stack to import parameters from') do |v|
+          Moonshot.config.parent_stacks = [v]
+        end
+      end
+    end
+  end
+end

data/lib/moonshot/commands/show_all_events_option.rb

@@ -0,0 +1,13 @@
+module Moonshot
+  module Commands
+    module ShowAllEventsOption
+      def parser
+        parser = super
+
+        parser.on('--[no-]show-all-events', TrueClass, 'Show all stack events during update') do |v|
+          Moonshot.config.show_all_stack_events = v
+        end
+      end
+    end
+  end
+end

data/lib/moonshot/commands/update.rb

@@ -1,29 +1,29 @@
-require_relative 'parameter_arguments'
-
 module Moonshot
   module Commands
     class Update < Moonshot::Command
       include ParameterArguments
+      include ShowAllEventsOption
+      include ParentStackOption
 
       self.usage = 'update [options]'
       self.description = 'Update the CloudFormation stack within an environment.'
 
-      def execute
-        controller.update
-      end
+      def parser
+        parser = super
 
-      private
+        parser.on('--dry-run', TrueClass, 'Show the changes that would be applied, but do not execute them') do |v| # rubocop:disable LineLength
+          @dry_run = v
+        end
 
-      def parameter_strategy_factory(value)
-        case value.to_sym
-        when :default
-          Moonshot::ParameterStrategy::DefaultStrategy.new
-        when :merge
-          Moonshot::ParameterStrategy::MergeStrategy.new
-        else
-          raise "Unknown parameter strategy: #{value}"
+        parser.on('--force', '-f', TrueClass, 'Apply ChangeSet without confirmation') do |v|
+          @force = v
         end
       end
+
+      def execute
+        @force = true unless Moonshot.config.interactive
+        controller.update(dry_run: @dry_run, force: @force)
+      end
     end
   end
 end

data/lib/moonshot/controller.rb

@@ -1,18 +1,10 @@
-require_relative 'ssh_target_selector'
-require_relative 'ssh_command_builder'
-
-require_relative 'stack_parameter'
-require_relative 'parameter_collection'
-require_relative 'parent_stack_parameter_loader'
-
 module Moonshot
   # The Controller coordinates and performs all Moonshot actions.
   class Controller # rubocop:disable ClassLength
     attr_accessor :config
 
-    def initialize
-      @config = ControllerConfig.new
-      yield @config if block_given?
+    def initialize(config)
+      @config = config
     end
 
     def list
@@ -71,7 +63,7 @@ module Moonshot
       end
     end
 
-    def update # rubocop:disable AbcSize
+    def update(dry_run:, force:) # rubocop:disable AbcSize
       # Scan the template for all required parameters and configure
       # the ParameterCollection.
       @config.parameters = ParameterCollection.from_template(stack.template)
@@ -119,7 +111,7 @@ module Moonshot
       end
 
       run_hook(:deploy, :pre_update)
-      stack.update
+      stack.update(dry_run: dry_run, force: force)
       run_hook(:deploy, :post_update)
       run_plugins(:post_update)
     end

data/lib/moonshot/controller_config.rb

@@ -1,11 +1,8 @@
-require_relative 'default_strategy'
-require_relative 'ssh_config'
-require_relative 'task'
-require_relative 'ask_user_source'
-
 module Moonshot
   # Holds configuration for Moonshot::Controller
   class ControllerConfig
+    attr_reader :account_alias
+
     attr_accessor :additional_tag
     attr_accessor :answer_file
     attr_accessor :app_name
@@ -37,6 +34,8 @@ module Moonshot
       @parameter_sources        = {}
       @parameters               = ParameterCollection.new
       @parent_stacks            = []
+      @account_alias            = nil
+      @per_account_config       = {}
       @plugins                  = []
       @project_root             = Dir.pwd
       @show_all_stack_events    = false
@@ -49,5 +48,19 @@ module Moonshot
       user = ENV.fetch('USER', 'default-user').gsub(/\W/, '')
       @environment_name = "dev-#{user}"
     end
+
+    def in_account(name, &blk)
+      # Store account specific configs as lambdas, to be evaluated
+      # if the account name matches during controller execution.
+      @per_account_config[name] = blk
+    end
+
+    def update_for_account!
+      # Evaluated any account-specific configuration.
+      @account_alias = Moonshot::AccountContext.get
+      if @account_alias && @per_account_config.key?(account_alias)
+        @per_account_config[@account_alias].call(self)
+      end
+    end
   end
 end

data/lib/moonshot/deployment_mechanism/code_deploy.rb

@@ -40,6 +40,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     @group_name = group_name
     @codedeploy_role = role
     @codedeploy_config = config_name
+    @ignore_app_stop_failures = false
   end
 
   def post_create_hook
@@ -70,13 +71,7 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     deployment_id = nil
 
     ilog.start_threaded 'Creating Deployment' do |s|
-      res = cd_client.create_deployment(
-        application_name: app_name,
-        deployment_group_name: group_name,
-        revision: revision_for_artifact_repo(artifact_repo, version_name),
-        deployment_config_name: @codedeploy_config,
-        description: "Deploying version #{version_name}"
-      )
+      res = create_deployment(artifact_repo, version_name)
       deployment_id = res.deployment_id
       s.continue "Created Deployment #{deployment_id.blue}."
       success = wait_for_deployment(deployment_id, s)
@@ -96,6 +91,17 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     end
   end
 
+  def deploy_cli_hook(parser)
+    parser.on('--ignore-app-stop-failures', TrueClass, 'Continue deployment on ApplicationStop failures') do |v| # rubocop:disable LineLength
+      puts "ignore = #{v}"
+      @ignore_app_stop_failures = v
+    end
+
+    parser
+  end
+
+  alias push_cli_hook deploy_cli_hook
+
   private
 
   # By default, use the stack name as the application name, unless one has been
@@ -333,6 +339,17 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
     }
   end
 
+  def create_deployment(artifact_repo, version_name)
+    cd_client.create_deployment(
+      application_name: app_name,
+      deployment_group_name: group_name,
+      revision: revision_for_artifact_repo(artifact_repo, version_name),
+      deployment_config_name: @codedeploy_config,
+      description: "Deploying version #{version_name}",
+      ignore_application_stop_failures: @ignore_app_stop_failures
+    )
+  end
+
   def doctor_check_code_deploy_role
     iam_client.get_role(role_name: @codedeploy_role).role
     success("#{@codedeploy_role} exists.")

data/lib/moonshot/json_stack_template.rb

@@ -1,5 +1,4 @@
 require 'json'
-require_relative 'stack_template'
 
 module Moonshot
   # Handles JSON formatted AWS template files.

data/lib/moonshot/stack.rb

@@ -1,12 +1,3 @@
-require_relative 'creds_helper'
-require_relative 'doctor_helper'
-
-require_relative 'yaml_stack_template'
-require_relative 'json_stack_template'
-require_relative 'stack_parameter_printer'
-require_relative 'stack_output_printer'
-require_relative 'stack_asg_printer'
-require_relative 'unicode_table'
 require 'yaml'
 
 module Moonshot
@@ -44,22 +35,21 @@ module Moonshot
       should_wait ? wait_for_stack_state(:stack_create_complete, 'created') : true
     end
 
-    def update
+    def update(dry_run:, force:)
       raise "No stack found #{@name.blue}!" unless stack_exists?
 
-      should_wait = true
-      @ilog.start "Updating #{stack_name}." do |s|
-        if update_stack
-          s.success "Initiated update for #{stack_name}."
-        else
-          s.success 'No Stack update required.'
-          should_wait = false
-        end
+      change_set = ChangeSet.new(new_change_set, @name)
+      wait_for_change_set(change_set)
+      return unless change_set.valid?
+
+      if dry_run
+        change_set.display_changes
+      elsif !force
+        change_set.display_changes
+        change_set.confirm? || raise('ChangeSet rejected!')
       end
 
-      success = should_wait ? wait_for_stack_state(:stack_update_complete, 'updated') : true
-      raise 'Failed to update the CloudFormation Stack.' unless success
-      success
+      execute_change_set(change_set)
     end
 
     def delete
@@ -131,16 +121,6 @@ module Moonshot
       end
     end
 
-    # Build a hash of overrides that would be applied to this stack by an
-    # update.
-    def overrides
-      if File.exist?(parameters_file)
-        YAML.load_file(parameters_file) || {}
-      else
-        {}
-      end
-    end
-
     # Return a Hash of the default values defined in the stack template.
     def default_values
       h = {}
@@ -151,25 +131,12 @@ module Moonshot
     end
 
     def template
-      @template ||= load_template_file
+      load_template_file
     end
 
     # @return [String] the path to the template file.
     def template_file
-      json = json_template_path
-      yaml = yaml_template_path
-
-      @template_file ||= Dir[json].first || Dir[yaml].first
-
-      raise 'CloudFormation template not found at'\
-            "#{json} or #{yaml}!" unless @template_file
-
-      @template_file
-    end
-
-    # @return [String] the path to the parameters file.
-    def parameters_file
-      File.join(@config.project_root, 'cloud_formation', 'parameters', "#{@name}.yml")
+      load_template_file.filename
     end
 
     private
@@ -178,32 +145,21 @@ module Moonshot
       "CloudFormation Stack #{@name.blue}"
     end
 
-    def json_template_path
-      "#{raw_template_file_name}.json"
-    end
-
-    def yaml_template_path
-      "#{raw_template_file_name}.yml"
-    end
-
-    # @return [String] the path to the template file without extension.
-    def raw_template_file_name
-      @raw_template_file_name ||=
-        File.join(@config.project_root, 'cloud_formation', @config.app_name)
-    end
-
     def load_template_file
-      json_template = JsonStackTemplate.new(json_template_path)
-      yaml_template = YamlStackTemplate.new(yaml_template_path)
-      case
-      when json_template.exist?
-        json_template
-      when yaml_template.exist?
-        yaml_template
-      else
-        raise "CloudFormation template not found at #{json_template_path} "\
-              "or #{yaml_template_path}!" unless @template_file
-      end
+      templates = [
+        YamlStackTemplate.new(File.join(@config.project_root, 'moonshot', 'template.yml')),
+        JsonStackTemplate.new(File.join(@config.project_root, 'moonshot', 'template.json')),
+
+        # Support the legacy file location from Moonshot 1.0.
+        YamlStackTemplate.new(
+          File.join(@config.project_root, 'cloud_formation', "#{@config.app_name}.yml")),
+        JsonStackTemplate.new(
+          File.join(@config.project_root, 'cloud_formation', "#{@config.app_name}.json"))
+      ]
+
+      template = templates.find(&:exist?)
+      raise 'No template found in moonshot/template.{yml,json}!' unless template
+      template
     end
 
     def stack_parameters
@@ -232,20 +188,23 @@ module Moonshot
       raise 'You are not authorized to perform create_stack calls.'
     end
 
-    # @return [Boolean]
-    #   true if a stack update was required and initiated, false otherwise.
-    def update_stack
-      cf_client.update_stack(
+    def new_change_set
+      change_set_name = [
+        'moonshot',
+        @name,
+        Time.now.utc.to_i.to_s
+      ].join('-')
+
+      cf_client.create_change_set(
+        change_set_name: change_set_name,
+        description: "Moonshot update command for application '#{Moonshot.config.app_name}'",
         stack_name: @name,
         template_body: template.body,
         capabilities: ['CAPABILITY_IAM'],
         parameters: @config.parameters.values.map(&:to_cf)
       )
-      true
-    rescue Aws::CloudFormation::Errors::ValidationError => e
-      raise e.message unless
-        e.message == 'No updates are to be performed.'
-      false
+
+      change_set_name
     end
 
     # TODO: Refactor this into it's own class.
@@ -335,5 +294,28 @@ module Moonshot
     rescue => e
       critical('Invalid CloudFormation template!', e.message)
     end
+
+    def wait_for_change_set(change_set)
+      @ilog.start_threaded "Waiting for ChangeSet #{change_set.name.blue} to be created." do |s|
+        change_set.wait_for_change_set
+
+        if change_set.valid?
+          s.success "ChangeSet #{change_set.name.blue} ready!"
+        else
+          s.failure "ChangeSet failed to create: #{change_set.invalid_reason}"
+        end
+      end
+    end
+
+    def execute_change_set(change_set)
+      @ilog.start_threaded "Executing ChangeSet #{change_set.name.blue} for #{stack_name}." do |s|
+        change_set.execute
+        s.success "Executed ChangeSet #{change_set.name.blue} for #{stack_name}."
+      end
+
+      success = wait_for_stack_state(:stack_update_complete, 'updated')
+      raise 'Failed to update the CloudFormation Stack.' unless success
+      success
+    end
   end
 end

data/lib/moonshot/stack_config.rb

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

data/lib/moonshot/stack_template.rb

@@ -1,9 +1,9 @@
-require_relative 'stack_parameter'
-
 module Moonshot
   # A StackTemplate loads the template from disk and stores information
   # about it.
   class StackTemplate
+    attr_reader :filename
+
     def initialize(filename)
       @filename = filename
     end

data/lib/moonshot/tools/asg_rollout.rb

@@ -1,7 +1,3 @@
-require_relative 'asg_rollout_config'
-require_relative 'asg_rollout/asg'
-require_relative 'asg_rollout/hook_exec_environment'
-
 module Moonshot
   module Tools
     class ASGRollout

data/lib/moonshot/tools/asg_rollout/asg.rb

@@ -1,6 +1,3 @@
-require_relative 'asg_instance'
-require_relative 'instance_health'
-
 module Moonshot
   module Tools
     class ASGRollout

data/lib/moonshot/yaml_stack_template.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require_relative 'stack_template'
 
 module Moonshot
   # Handles YAML formatted AWS template files.

data/lib/plugins/backup.rb

@@ -1,6 +1,5 @@
 require 'rubygems/package'
 require 'zlib'
-require_relative '../moonshot/creds_helper'
 
 module Moonshot
   module Plugins

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -184,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,7 @@ files:
 - bin/moonshot
 - lib/default/Moonfile.rb
 - lib/moonshot.rb
+- lib/moonshot/account_context.rb
 - lib/moonshot/always_use_default_source.rb
 - lib/moonshot/artifact_repository/s3_bucket.rb
 - lib/moonshot/artifact_repository/s3_bucket_via_github_releases.rb
@@ -244,8 +259,10 @@ files:
 - lib/moonshot/build_mechanism/script.rb
 - lib/moonshot/build_mechanism/travis_deploy.rb
 - lib/moonshot/build_mechanism/version_proxy.rb
+- lib/moonshot/change_set.rb
 - lib/moonshot/command.rb
 - lib/moonshot/command_line.rb
+- lib/moonshot/command_line_dispatcher.rb
 - lib/moonshot/commands/build.rb
 - lib/moonshot/commands/console.rb
 - lib/moonshot/commands/create.rb
@@ -255,7 +272,9 @@ files:
 - lib/moonshot/commands/list.rb
 - lib/moonshot/commands/new.rb
 - lib/moonshot/commands/parameter_arguments.rb
+- lib/moonshot/commands/parent_stack_option.rb
 - lib/moonshot/commands/push.rb
+- lib/moonshot/commands/show_all_events_option.rb
 - lib/moonshot/commands/ssh.rb
 - lib/moonshot/commands/status.rb
 - lib/moonshot/commands/update.rb
@@ -264,12 +283,10 @@ 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/interactive_logger_proxy.rb
 - lib/moonshot/json_stack_template.rb
-- lib/moonshot/merge_strategy.rb
 - lib/moonshot/parameter_collection.rb
 - lib/moonshot/parent_stack_parameter_loader.rb
 - lib/moonshot/resources.rb
@@ -315,9 +332,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/lib/moonshot/default_strategy.rb

@@ -1,16 +0,0 @@
-module Moonshot
-  module ParameterStrategy
-    # Default strategy: use parameter defined in the parameter file
-    class DefaultStrategy
-      def parameters(params, _, _)
-        params.map do |key, _|
-          {
-            parameter_key: key,
-            parameter_value: params[key],
-            use_previous_value: false
-          }
-        end
-      end
-    end
-  end
-end

data/lib/moonshot/merge_strategy.rb

@@ -1,31 +0,0 @@
-require 'highline/import'
-require_relative 'unicode_table'
-
-module Moonshot
-  module ParameterStrategy
-    # Merge strategy: prefer parameter values defined in the parameter file,
-    # otherwise use the previously set value on the existing stack.
-    class MergeStrategy
-      def parameters(params, stack_params, template)
-        stack_keys = stack_params.keys.select do |k|
-          template.parameters.any? { |p| p.name == k }
-        end
-
-        (params.keys + stack_keys).uniq.map do |key|
-          if params[key]
-            {
-              parameter_key: key,
-              parameter_value: params[key],
-              use_previous_value: false
-            }
-          else
-            {
-              parameter_key: key,
-              use_previous_value: true
-            }
-          end
-        end
-      end
-    end
-  end
-end