kontena-cli 1.4.0.pre8 → 1.4.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5fbe13d6c43974ce734828c192b42c582b56a04
-  data.tar.gz: a2de0cbe2555ea75327028a9f1f6417f839a876f
+  metadata.gz: 0ee7784ef8718b8afec8e31001cb8386de5ae3f9
+  data.tar.gz: d5dca2cd45bcd062bce2935e81cfdf33bca6572e
 SHA512:
-  metadata.gz: 9ed72921adf1a691ed03ea9ec1223800191136b686d89c0e1ca2af21306755e83cb9844c69db3831da566a1592d700d12c2126a99ae9f620c1817d0bf3ce6441
-  data.tar.gz: f1fd2b0a344552704f2e3c1de967daed63e9cf66532791af1040aea5f19262b7b123b2ee1f19d1799525cb02556784192fa9329b2e68a00636cfebc01c31463d
+  metadata.gz: 35c6016071aa01ef2a0a85a2b7e088f76fb24d74bd16bd7ea9db99da9c6ffe78f5f9bb7fee7d7395e3080534b2b9f30e1b87b0bfdc112d3633bc38423e8cc11b
+  data.tar.gz: 25e2c16f93d615d012157460d3edf46d01f7fa73a90a67daea6ad028ebb16556a37262d2233d95d9036ef1721a17136a8df1ab70ebb55c514d6467eed9fbe779

data/VERSION

@@ -1 +1 @@
-1.4.0.pre8
+1.4.0.pre9

data/lib/kontena/cli/certificate/list_command.rb

@@ -15,7 +15,7 @@ module Kontena::Cli::Certificate
     THREE_DAYS = 3 * 24 * 60 * 60
 
     def fields
-      quiet? ? ['subject'] : {subject: 'subject', "expiration" => 'expires_in'}
+      quiet? ? ['subject'] : {subject: 'subject', "expiration" => 'expires_in', auto_renewable?: 'auto_renewable'}
     end
 
     def certificates

data/lib/kontena/cli/certificate/remove_command.rb

@@ -0,0 +1,23 @@
+require_relative '../services/services_helper'
+
+module Kontena::Cli::Certificate
+  class RemoveCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "SUBJECT", "Certificate subject"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    def execute
+      confirm_command(self.subject) unless forced?
+
+      spinner "Removing certificate for #{self.subject.colorize(:cyan)} from #{current_grid.colorize(:cyan)} grid " do
+        client.delete("certificates/#{current_grid}/#{self.subject}")
+      end
+    end
+  end
+end

data/lib/kontena/cli/certificate_command.rb

@@ -7,6 +7,7 @@ class Kontena::Cli::CertificateCommand < Kontena::Command
   subcommand "authorize", "Create DNS authorization for domain", load_subcommand('certificate/authorize_command')
   subcommand "request", "Request certificate for domain", load_subcommand('certificate/request_command')
   subcommand "get", "Get certificate for domain", load_subcommand('certificate/get_command')
+  subcommand ["remove", "rm"], "Remove certificate for domain", load_subcommand('certificate/remove_command')
 
 
   def execute

data/lib/kontena/cli/stacks/change_resolver.rb

@@ -0,0 +1,96 @@
+require_relative 'yaml/stack_file_loader'
+
+module Kontena::Cli::Stacks
+  class ChangeResolver
+
+    attr_reader :old_data, :new_data
+
+    # Creates a change analysis from two sets of stack data.
+    # The format is a flat hash of all related stacks.
+    #
+    # @param old_data [Hash]
+    # @param new_data [Hash]
+    def initialize(old_data, new_data)
+      @old_data = old_data
+      @new_data = new_data
+      analyze
+    end
+
+    # @return [Array<String>] an array of services that should be added
+    def added_services
+      @added_services ||= []
+    end
+
+    # @return [Array<String>] an array of services that should be removed
+    def removed_services
+      @removed_services ||= []
+    end
+
+    # @return [Array<String>] an array of services that should be upgraded
+    def upgraded_services
+      @upgraded_services ||= []
+    end
+
+    # @return [Array<String>] an array of stack installation names that should be removed
+    def removed_stacks
+      @removed_stacks ||= []
+    end
+
+    # @return [Array<String>] an array of stack installation names that should be removed
+    def added_stacks
+      @added_stacks ||= []
+    end
+
+    # @return [Array<String>] an array of stack installation names that should be upgraded
+    def upgraded_stacks
+      @upgraded_stacks ||= []
+    end
+
+    # @return [Hash] a hash of "installed-stack-name" => { :from => 'stackname', :to => 'new-stackname' }
+    def replaced_stacks
+      @replaced_stacks ||= {}
+    end
+
+    # @return [Array<String>] an array of installed stack names that should exist after upgrade
+    def remaining_stacks
+      @remaining_stacks ||= added_stacks + upgraded_stacks
+    end
+
+    def analyze
+      old_names = old_data.keys
+      new_names = new_data.keys
+
+      removed_stacks.concat(old_names - new_names)
+      added_stacks.concat(new_names - old_names)
+      upgraded_stacks.concat(new_names & old_names)
+
+      removed_stacks.each do |removed_stack|
+        removed_services.concat(
+          old_data[removed_stack][:stack_data]['services'].map { |svc| "#{removed_stack}/#{svc['name']}"}
+        )
+      end
+
+      added_stacks.each do |added_stack|
+        added_services.concat(
+          new_data[added_stack][:stack_data]['services'].map { |svc| "#{added_stack}/#{svc['name']}"}
+        )
+      end
+
+      upgraded_stacks.each do |upgraded_stack|
+        old_stack = old_data[upgraded_stack][:stack_data]['stack']
+        new_stack = new_data[upgraded_stack][:stack_data]['stack']
+
+        unless old_stack == new_stack
+          replaced_stacks[upgraded_stack] = { from: old_stack, to: new_stack }
+        end
+
+        old_services = old_data[upgraded_stack][:stack_data]['services'].map { |svc| "#{upgraded_stack}/#{svc['name']}" }
+        new_services = new_data[upgraded_stack][:stack_data]['services'].map { |svc| "#{upgraded_stack}/#{svc['name']}" }
+
+        removed_services.concat(old_services - new_services)
+        added_services.concat(new_services - old_services)
+        upgraded_services.concat(new_services & old_services)
+      end
+    end
+  end
+end

data/lib/kontena/cli/stacks/install_command.rb

@@ -44,7 +44,7 @@ module Kontena::Cli::Stacks
       return if dependencies.nil?
       dependencies.each do |dependency|
         target_name = "#{stack_name}-#{dependency['name']}"
-        caret "Installing dependency #{pastel.cyan(dependency[:stack])} as #{pastel.cyan(target_name)}"
+        caret "Installing dependency #{pastel.cyan(dependency['stack'])} as #{pastel.cyan(target_name)}"
         cmd = ['stack', 'install', '-n', target_name, '--parent-name', stack_name]
 
         dependency['variables'].merge(dependency_values_from_options(dependency['name'])).each do |key, value|

data/lib/kontena/cli/stacks/list_command.rb

@@ -76,6 +76,7 @@ module Kontena::Cli::Stacks
     end
 
     def tree_icon(row)
+      return '' unless $stdout.tty?
       parent = row['parent']
       children = row['children'] || []
       if parent.nil? && children.empty?

data/lib/kontena/cli/stacks/upgrade_command.rb

@@ -1,4 +1,7 @@
 require_relative 'common'
+require_relative 'change_resolver'
+
+require 'json'
 
 module Kontena::Cli::Stacks
   class UpgradeCommand < Kontena::Command
@@ -19,143 +22,207 @@ module Kontena::Cli::Stacks
 
     option '--force', :flag, 'Force upgrade'
     option '--skip-dependencies', :flag, "Do not install any stack dependencies"
-    option '--dry-run', :flag, "Do not perform any uploading", hidden: true
+    option '--dry-run', :flag, "Simulate upgrade"
 
     requires_current_master
     requires_current_master_token
 
-    def normalize_local_data(stack_data, parent_name)
-      return nil if stack_data.nil? || stack_data.empty?
-
-      depends = stack_data.delete('depends') || []
-      normalized_data = {
-        parent_name => stack_data.merge(
-          :loader => loader_class.for(stack_data['stack'])
-        )
-      }
+    # @return [Kontena::Cli::Stacks::ChangeResolver]
+    def execute
+      set_env_variables(stack_name, current_grid)
 
-      depends.each do |stack|
-        key = "#{parent_name}-#{stack['name']}"
-        normalized_data.merge!(normalize_local_data(stack.merge('parent_name' => parent_name), key))
+      old_data = spinner "Reading stack #{pastel.cyan(stack_name)} from master" do
+        gather_master_data(stack_name)
       end
-      normalized_data
-    end
 
-    def normalize_master_data(stack_name, raise_not_found = false)
-      begin
-        data = fetch_master_data(stack_name)
-      rescue Kontena::Errors::StandardError => ex
-        return nil if ex.status == 404 && !raise_not_found
-        raise ex
+      new_data = spinner "Parsing #{pastel.cyan(source)}" do
+        loader.flat_dependencies(
+          stack_name,
+          variables: values_from_options
+        )
       end
-      depends = data.delete('children') || []
 
-      normalized_data = { stack_name => data }
+      changes = process_data(old_data, new_data)
+
+      display_report(changes)
+
+      return if dry_run?
+
+      get_confirmation(changes)
+
+      deployable_stacks = []
+      deployable_stacks.concat run_installs(changes)
+      deployable_stacks.concat run_upgrades(changes)
+
+      run_deploys(deployable_stacks) if deploy?
+
+      run_removes(changes.removed_stacks)
+
+      changes
+    end
 
-      return normalized_data if skip_dependencies?
+    private
 
-      depends.each do |stack|
-        normalized_data.merge!(normalize_master_data(stack['name']))
+    # Recursively fetch master data in StackFileLoader#flat_dependencies format
+    # @return [Hash{string => Hash}] stackname => hash
+    def gather_master_data(stackname)
+      response = fetch_master_data(stackname)
+      children = response.delete('children') || []
+      result = { stackname => { stack_data: response } }
+      children.each do |child|
+        result.merge!(gather_master_data(child['name']))
       end
-      normalized_data
+      result
     end
 
-    def merge_data(local_data, remote_data)
-      merged = {}
-      unless local_data.nil? || local_data.empty?
-        local_data.each do |key, data|
-          merged[key] ||= {}
-          merged[key][:local] = data
-        end
+    # Preprocess data and return a ChangeResolver
+    # @param old_data [Hash] data from master
+    # @param new_data [Hash] data from files
+    # @return [Kontena::Cli::Stacks::ChangeRsolver]
+    def process_data(old_data, new_data)
+      logger.debug { "Master stacks: #{old_data.keys.join(",")} YAML stacks: #{new_data.keys.join(",")}" }
+
+      new_data.reverse_each do |stackname, data|
+        reader = data[:loader].reader
+        set_env_variables(stackname, current_grid) # set envs for execution time
+        data[:stack_data] = reader.execute(
+          values: data[:variables],
+          defaults: old_data[stackname].nil? ? nil : old_data[stackname][:stack_data]['variables'],
+          parent_name: data[:parent_name],
+          name: data[:name]
+        )
+        hint_on_validation_notifications(reader.notifications, reader.loader.source)
+        abort_on_validation_errors(reader.errors, reader.loader.source)
       end
-      unless remote_data.nil? || remote_data.empty?
-        remote_data.each do |key, data|
-          merged[key] ||= {}
-          merged[key][:remote] = data
-        end
+
+      set_env_variables(stack_name, current_grid) # restore envs
+
+      spinner "Analyzing upgrade" do
+        Kontena::Cli::Stacks::ChangeResolver.new(old_data, new_data)
       end
-      merged
     end
 
-    def execute
-      set_env_variables(stack_name, current_grid)
+    def display_report(changes)
+      if !dry_run? && changes.removed_stacks.empty? && changes.replaced_stacks.empty? && changes.upgraded_stacks.size == 1 && changes.removed_services.empty?
+        return
+      end
+
+      will = dry_run? ? "would" : "will"
+
+      puts "SERVICES:"
+      puts "-" * 40
 
-      local = spinner "Parsing #{pastel.cyan(source)}" do
-        normalize_local_data({'stack' => source, 'depends' => skip_dependencies? ? nil : loader.dependencies}, stack_name)
+      unless changes.removed_services.empty?
+        puts pastel.yellow("These services #{will} be removed from master:")
+        changes.removed_services.each { |svc| puts pastel.yellow(" - #{svc}") }
+        puts
       end
 
-      remote = spinner "Reading stack #{pastel.cyan(stack_name)} from master" do
-        normalize_master_data(stack_name, true)
+      unless changes.added_services.empty?
+        puts pastel.green("These new services #{will} be created to master:")
+        changes.added_services.each { |svc| puts pastel.green(" - #{svc}") }
+        puts
       end
 
-      merged = merge_data(local, remote)
+      unless changes.upgraded_services.empty?
+        puts pastel.cyan("These services #{will} be upgraded:")
+        changes.upgraded_services.each do |svc|
+          puts pastel.cyan("- #{svc}")
+        end
+        puts
+      end
 
-      removes = merged.keys.select { |k| merged[k][:local].nil? }
+      puts "STACKS:"
+      puts "-" * 40
 
-      unless removes.empty?
+      unless changes.removed_stacks.empty?
+        puts pastel.red("These stacks #{will} be removed because they are no longer depended on:")
+        changes.removed_stacks.each { |stack| puts pastel.red("- #{stack}") }
         puts
-        puts "Stacks to be removed because they are no longer depended on:"
-        removes.each do |r|
-          puts pastel.yellow("- #{r}")
+      end
+
+      unless changes.replaced_stacks.empty?
+        puts pastel.yellow("These stacks #{will} be replaced by other stacks:")
+        changes.replaced_stacks.each do |installed_name, data|
+          puts "- #{pastel.yellow(installed_name)} from #{pastel.cyan(data[:from])} to #{pastel.cyan(data[:to])}"
         end
         puts
-        unless force?
+      end
+
+      unless changes.added_stacks.empty?
+        puts pastel.red("These new stack dependencies #{will} be installed:")
+        changes.added_stacks.each { |stack| puts pastel.red("- #{stack}") }
+        puts
+      end
+
+      unless changes.upgraded_stacks.empty?
+        puts pastel.cyan("These stacks #{will} be upgraded#{' and deployed' if deploy?}:")
+        changes.upgraded_stacks.each { |stack| puts pastel.cyan("- #{stack}") }
+        puts
+      end
+
+      puts
+    end
+
+    # requires heavier confirmation when something very dangerous is going to happen
+    def get_confirmation(changes)
+      unless force?
+        unless changes.removed_services.empty? && changes.removed_stacks.empty? && changes.replaced_stacks.empty?
           puts "#{pastel.red('Warning:')} This can not be undone, data will be lost."
-        end
-        confirm unless force?
-        removes.reverse_each do |removed_stack|
-          Kontena.run!('stack', 'remove', '--force', '--keep-dependencies', removed_stack)
-          merged.delete(removed_stack)
+          confirm
         end
       end
+    end
 
-      unless force?
-        merged.each do |stackname, data|
-          next if data[:remote].nil?
-          unless data[:local][:loader].stack_name.stack_name == data[:remote]['stack']
-            confirm "Replacing stack #{pastel.cyan(data[:remote]['stack'])} on master with #{pastel.cyan(data[:local][:loader].stack_name.stack_name)}. Are you sure?"
-          end
+    def deployable_stacks
+      @deployable_stacks ||= []
+    end
+
+    def run_removes(removed_stacks)
+      removed_stacks.reverse_each do |removed_stack|
+        Kontena.run!('stack', 'remove', '--force', '--keep-dependencies', removed_stack)
+      end
+    end
+
+    # @return [Array] an array of stack names that have been installed, but not yet deployed
+    def run_installs(changes)
+      deployable_stacks = []
+      changes.added_stacks.reverse_each do |added_stack|
+        data = changes.new_data[added_stack]
+        cmd = ['stack', 'install', '--name', added_stack, '--no-deploy']
+        cmd.concat ['--parent-name', data[:parent_name]] if data[:parent_name]
+        data[:variables].each do |k,v|
+          cmd.concat ['-v', "#{k}=#{v}"]
         end
+        cmd << data[:loader].source
+        caret "Installing new dependency #{cmd.last} as #{added_stack}"
+        deployable_stacks << added_stack
+        Kontena.run!(cmd)
       end
+      deployable_stacks
+    end
 
-      merged.reverse_each do |stackname, data|
-        set_env_variables(stackname, current_grid)
-        data[:local][:stack] = data[:local][:loader].reader.execute(
-          name: stackname,
-          values: (data.dig(:local, 'variables') || {}).merge(dependency_values_from_options(stackname)),
-          defaults: data.dig(:remote, 'variables'),
-          parent_name: data.dig(:local, 'parent_name')
-        )
-        hint_on_validation_notifications(data[:local][:loader].reader.notifications, data[:local][:loader].source)
-        abort_on_validation_errors(data[:local][:loader].reader.errors, data[:local][:loader].source)
-      end
-
-      merged.reverse_each do |stackname, data|
-        stack = data[:local][:stack]
-        if data[:remote]
-          spinner "Upgrading #{stack_name == stackname ? 'stack' : 'dependency'} #{pastel.cyan(stackname)}" do |spin|
-            update_stack(stackname, stack) || spin.fail!
-          end
-        else
-          cmd = ['stack', 'install', '--name', stackname]
-          cmd.concat ['--parent-name', stack['parent_name']] if stack['parent_name']
-
-          stack['variables'].merge(dependency_values_from_options(stackname)).each do |k, v|
-            cmd.concat ['-v', "#{k}=#{v}"]
-          end
-
-          cmd << '--no-deploy'
-          cmd << data[:local][:loader].source
-          caret "Installing new dependency #{cmd.last} as #{stackname}"
-          Kontena.run!(cmd)
+    # @return [Array] an array of stack names that have been upgraded, but not yet deployed
+    def run_upgrades(changes)
+      deployable_stacks = []
+      changes.upgraded_stacks.reverse_each do |upgraded_stack|
+        data = changes.new_data[upgraded_stack]
+        spinner "Upgrading #{stack_name == upgraded_stack ? 'stack' : 'dependency'} #{pastel.cyan(upgraded_stack)}" do |spin|
+          deployable_stacks << upgraded_stack
+          update_stack(upgraded_stack, data[:stack_data]) || spin.fail!
         end
+      end
+      deployable_stacks
+    end
 
-        Kontena.run!(['stack', 'deploy', stackname]) if deploy?
+    # @param deployable_stacks [Array<String>] an array of stack names that should be deployed
+    def run_deploys(deployable_stacks)
+      deployable_stacks.each do |deployable_stack|
+        Kontena.run!(['stack', 'deploy', deployable_stack])
       end
     end
 
     def update_stack(name, data)
-      return true if dry_run?
       client.put(stack_url(name), data)
     end
 
@@ -163,8 +230,8 @@ module Kontena::Cli::Stacks
       "stacks/#{current_grid}/#{name}"
     end
 
-    def fetch_master_data(stack_name)
-      client.get(stack_url(stack_name))
+    def fetch_master_data(stackname)
+      client.get(stack_url(stackname))
     end
   end
 end

data/lib/kontena/cli/stacks/validate_command.rb

@@ -30,7 +30,6 @@ module Kontena::Cli::Stacks
         cmd.concat ['--parent-name', stack_name]
 
         dependency['variables'].merge(dependency_values_from_options(dependency['name'])).each do |key, value|
-          next if key == 'PARENT_STACK'
           cmd.concat ['-v', "#{key}=#{value}"]
         end
         cmd << dependency['stack']
@@ -58,8 +57,11 @@ module Kontena::Cli::Stacks
 
       dump_variables if values_to
 
-      result = reader.fully_interpolated_yaml.merge(
-        'variables' => Kontena::Util.stringify_keys(reader.variables.to_h(with_values: true, with_errors: true))
+      result = stack.reject { |k, _| k == 'source' }
+      result.merge!(
+        'variables' => Kontena::Util.stringify_keys(
+          reader.variable_values(without_defaults: true, without_vault: true, with_errors: true)
+        )
       )
       if dependencies?
         puts ::YAML.dump(result).sub(/\A---$/, "---\n# #{loader.source}")

data/lib/kontena/cli/stacks/yaml/reader.rb

@@ -49,8 +49,8 @@ module Kontena::Cli::Stacks
       # @param without_defaults [TrueClass,FalseClass] strip the GRID, STACK, etc from response
       # @param without_vault [TrueClass,FalseClass] strip out any values that are going to or coming from VAULT
       # @return [Hash] a hash of key value pairs representing the values of stack variables
-      def variable_values(without_defaults: false, without_vault: false)
-        result = variables.to_h(values_only: true)
+      def variable_values(without_defaults: false, without_vault: false, with_errors: false)
+        result = variables.to_h(values_only: true, with_errors: with_errors)
         if without_defaults
           result.delete_if { |k, _| default_envs.key?(k.to_s) || k.to_s == 'PARENT_STACK' }
         end

data/lib/kontena/cli/stacks/yaml/stack_file_loader.rb

@@ -43,6 +43,11 @@ module Kontena::Cli::Stacks
         @parent = parent
       end
 
+      # @return [String] a stripped down version of inspect without all the yaml source
+      def inspect
+        "#<#{self.class.name}:#{object_id} @source=#{source.inspect} @parent=#{parent.nil? ? 'nil' : parent.source}>"
+      end
+
       # @return [Hash] a hash parsed from the YAML content
       def yaml
         @yaml ||= ::YAML.safe_load(content, [], [], true, source)
@@ -75,21 +80,71 @@ module Kontena::Cli::Stacks
       # @return [Array<Hash>] an array of hashes ('name', 'stack', 'variables', and 'depends')
       def dependencies(recurse: true)
         return @dependencies if @dependencies
-        depends = yaml['depends']
         if depends.nil? || depends.empty?
           @dependencies = nil
         else
           @dependencies = depends.map do |name, dependency|
-            reader = StackFileLoader.for(dependency['stack'], self)
-            deps = { 'name' => name, 'stack' => reader.source, 'variables' => dependency.fetch('variables', Hash.new) }
+            loader = StackFileLoader.for(dependency['stack'], self)
+            deps = { 'name' => name, 'stack' => loader.source, 'variables' => dependency.fetch('variables', Hash.new) }
             if recurse
-              child_deps = reader.dependencies
+              child_deps = loader.dependencies
               deps['depends'] = child_deps unless child_deps.nil?
             end
             deps
           end
         end
       end
+
+      def to_h
+        {
+          'stack' => stack_name.stack_name,
+          :loader => self,
+        }
+      end
+
+      # Returns a non nested hash of all dependencies.
+      # Processes :variables hash and moves the related variables to children
+      #
+      # @param basename [String] installed stack name
+      # @param opts [Hash] extra data such as variable lists
+      # @return [Hash] { installation_name => { 'name' => installation-name, 'stack' => stack_name, :loader => self }, child_install_name => { ... } }
+      def flat_dependencies(basename, opts = {})
+        opt_variables = opts[:variables] || {}
+
+        result = {
+          basename => self.to_h.merge(opts).merge(
+            name: basename,
+            variables: opt_variables.reject { |k, _| k.include?('.') }
+          )
+        }
+
+        depends.each do |as_name, data|
+          variables = {}
+
+          opt_variables.select { |k, _| k.start_with?(as_name + '.') }.each do |k,v|
+            variables[k.split('.', 2).last] = v
+          end
+
+          data['variables'] ||= {}
+
+          loader = StackFileLoader.for(data['stack'], self)
+          result.merge!(
+           loader.flat_dependencies(
+             basename + '-' + as_name,
+             variables: data['variables'].merge(variables),
+             parent_name: basename
+           )
+          )
+        end
+
+        result
+      end
+
+      private
+
+      def depends
+        yaml['depends'] || {}
+      end
     end
   end
 end

data/spec/kontena/cli/stacks/upgrade_command_spec.rb

@@ -51,13 +51,13 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
     it 'sends stack to master' do
       expect(client).to receive(:get).with('stacks/test-grid/stack-a').and_return(stack_response)
       expect(client).to receive(:put).with('stacks/test-grid/stack-a', hash_including(stack_expectation.merge('name' => 'stack-a'))).and_return(true)
-      subject.run(['--no-deploy', 'stack-a', fixture_path('kontena_v3.yml')])
+      subject.run(['--no-deploy', '--force', 'stack-a', fixture_path('kontena_v3.yml')])
     end
 
     it 'requires confirmation when master stack is different than input stack' do
       expect(client).to receive(:get).with('stacks/test-grid/stack-b').and_return(stack_response.merge('stack' => 'foo/otherstack'))
-      expect(subject).to receive(:confirm).with(/Replacing stack foo\/otherstack on master with user\/stackname/).and_call_original
-      expect{subject.run(['stack-b',  fixture_path('kontena_v3.yml')])}.to exit_with_error
+      expect(subject).to receive(:confirm).and_call_original
+      expect{subject.run(['stack-b', fixture_path('kontena_v3.yml')])}.to exit_with_error.and output(/- stack-b from foo\/otherstack to user\/stackname/).to_stdout
     end
 
     it 'triggers deploy by default' do
@@ -66,7 +66,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
         'stacks/test-grid/stack-a', anything
       ).and_return({})
       expect(Kontena).to receive(:run!).with(['stack', 'deploy', 'stack-a']).once
-      subject.run(['stack-a', fixture_path('kontena_v3.yml')])
+      subject.run(['--force', 'stack-a', fixture_path('kontena_v3.yml')])
     end
 
     context '--no-deploy option' do
@@ -83,13 +83,13 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
     context 'with a stack including dependencies' do
 
       let(:expectation)     {{ 'name' => 'deptest', 'stack' => 'user/depstack1' }}
-      let(:expectation_1)   {{ 'name' => 'deptest-dep_1', 'stack' => 'user/depstack1child1' }}
+      let(:expectation_1)   {{ 'name' => 'deptest-dep_1', 'stack' => 'user/depstack1child1'}}
       let(:expectation_1_1) {{ 'name' => 'deptest-dep_1-dep_1', 'stack' => 'user/depstack1child1child1', 'services' => array_including(hash_including('image' => 'image:2')) }}
       let(:expectation_2)   {{ 'name' => 'deptest-dep_2', 'stack' => 'user/depstack1child2', 'services' => array_including(hash_including('image' => 'image:1')), 'variables' => hash_including('dep_var' => 1) }}
 
-      let(:response)     { expectation.merge('parent' => nil, 'children' => [{'name' => 'deptest-dep_1'}, {'name' => 'deptest-dep_2'}]) }
-      let(:response_1)   { expectation_1.merge('parent' => { 'name' => 'deptest' }, 'children' => [{'name' => 'deptest-dep_1-dep_1'}]) }
-      let(:response_1_1) { expectation_1_1.merge('parent' => { 'name' => 'deptest-dep_1' }, 'children' => []) }
+      let(:response)     { expectation.merge('parent' => nil, 'children' => [{'name' => 'deptest-dep_1'}, {'name' => 'deptest-dep_2'}], 'services' => [])  }
+      let(:response_1)   { expectation_1.merge('parent' => { 'name' => 'deptest' }, 'children' => [{'name' => 'deptest-dep_1-dep_1'}], 'services' => []) }
+      let(:response_1_1) { expectation_1_1.merge('parent' => { 'name' => 'deptest-dep_1' }, 'children' => [], 'services' => []) }
       let(:response_2)   { expectation_2.merge('parent' => { 'name' => 'deptest' }, 'children' => [], 'variables' => {}, 'services' => []) }
 
       before  do
@@ -104,7 +104,7 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
         expect(client).to receive(:put).with('stacks/test-grid/deptest-dep_1-dep_1', hash_including(expectation_1_1)).and_return(true)
         expect(client).to receive(:put).with('stacks/test-grid/deptest-dep_1', hash_including(expectation_1)).and_return(true)
         expect(client).to receive(:put).with('stacks/test-grid/deptest', hash_including(expectation)).and_return(true)
-        subject.run(['--no-deploy', '-v', 'dep_2.dep_var=1', 'deptest', fixture_path('stack-with-dependencies.yml')])
+        subject.run(['--force', '--no-deploy', '-v', 'dep_2.dep_var=1', 'deptest', fixture_path('stack-with-dependencies.yml')])
       end
 
       context 'when a dependency has been removed' do
@@ -117,8 +117,8 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       context 'when a dependency has been added' do
         it 'installs any new stacks in the dependency chain' do
           allow(client).to receive(:put).and_return(true)
-          expect(Kontena).to receive(:run!).with(["stack", "install", "--name", "deptest-dep_3", "--parent-name", "deptest", "--no-deploy", fixture_path('stack-with-dependencies-dep-3.yml')]).and_return(true)
-          subject.run(['--no-deploy', '-v', 'dep_2.dep_var=1', 'deptest', fixture_path('stack-with-dependencies-dep_3-added.yml')])
+          expect(Kontena).to receive(:run!).with(["stack", "install", "--name", "deptest-dep_3", "--no-deploy", "--parent-name", "deptest", fixture_path('stack-with-dependencies-dep-3.yml')]).and_return(true)
+          subject.run(['--no-deploy', '--force', '-v', 'dep_2.dep_var=1', 'deptest', fixture_path('stack-with-dependencies-dep_3-added.yml')])
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre8
+  version: 1.4.0.pre9
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -257,6 +257,7 @@ files:
 - lib/kontena/cli/certificate/get_command.rb
 - lib/kontena/cli/certificate/list_command.rb
 - lib/kontena/cli/certificate/register_command.rb
+- lib/kontena/cli/certificate/remove_command.rb
 - lib/kontena/cli/certificate/request_command.rb
 - lib/kontena/cli/certificate/show_command.rb
 - lib/kontena/cli/certificate_command.rb
@@ -408,6 +409,7 @@ files:
 - lib/kontena/cli/spinner.rb
 - lib/kontena/cli/stack_command.rb
 - lib/kontena/cli/stacks/build_command.rb
+- lib/kontena/cli/stacks/change_resolver.rb
 - lib/kontena/cli/stacks/common.rb
 - lib/kontena/cli/stacks/deploy_command.rb
 - lib/kontena/cli/stacks/events_command.rb