kontena-cli 1.1.0.rc1 → 1.1.0.rc2

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

@@ -13,22 +13,35 @@ module Kontena::Cli::Stacks
     include Common::StackFileOrNameParam
     include Common::StackValuesFromOption
 
-    option '--deploy', :flag, 'Deploy after upgrade'
+    option '--[no-]deploy', :flag, 'Trigger deploy after upgrade', default: true
 
     requires_current_master
     requires_current_master_token
 
     def execute
-      require_config_file(filename)
-      stack = stack_from_yaml(filename, name: name, values: values, from_registry: from_registry)
-      spinner "Upgrading stack #{pastel.cyan(name)} " do
-        update_stack(stack)
+      master_data = spinner "Reading stack #{pastel.cyan(name)} metadata from Kontena Master" do |spin|
+        read_stack || spin.fail!
       end
-      Kontena.run("stack deploy #{name}") if deploy?
+
+      stack = stack_from_yaml(filename, name: name, values: values, defaults: master_data['variables'])
+
+      spinner "Upgrading stack #{pastel.cyan(name)}" do |spin|
+        update_stack(stack) || spin.fail!
+      end
+
+      Kontena.run(['stack', 'deploy', name]) if deploy?
     end
 
     def update_stack(stack)
-      client.put("stacks/#{current_grid}/#{name}", stack)
+      client.put(stack_url, stack)
+    end
+
+    def stack_url
+      @stack_url ||= "stacks/#{current_grid}/#{name}"
+    end
+
+    def read_stack
+      client.get(stack_url)
     end
   end
 end

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

@@ -19,15 +19,7 @@ module Kontena::Cli::Stacks
     requires_current_master_token
 
     def execute
-
-      if !File.exist?(filename) && filename =~ /\A[a-zA-Z0-9\_\.\-]+\/[a-zA-Z0-9\_\.\-]+(?::.*)?\z/
-        from_registry = true
-      else
-        from_registry = false
-        require_config_file(filename)
-      end
-
-      reader = reader_from_yaml(filename, from_registry: from_registry, name: name, values: values)
+      reader = reader_from_yaml(filename, name: name, values: values)
       outcome = reader.execute
       hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0
       abort_on_validation_errors(outcome[:errors]) if outcome[:errors].size > 0

data/lib/kontena/cli/stacks/yaml/opto/service_link_resolver.rb

@@ -0,0 +1,45 @@
+module Kontena::Cli::Stacks
+  module YAML
+    class Opto::Resolvers::ServiceLink < Opto::Resolver
+      include Kontena::Cli::Common
+
+      def resolve
+        message = hint['prompt']
+        name_filter = hint['name']
+        image_filter = hint['image']
+        raise "prompt missing" unless message
+
+        services = client.get("grids/#{current_grid}/services")['services']
+        services = filter_by_image(services, image_filter) if image_filter
+        services = filter_by_name(services, name_filter) if name_filter
+        prompt.select(message) do |menu|
+          menu.choice "<none>", nil unless option.required?
+          services.each do |s|
+            if s.dig('stack', 'name') == 'null'
+              name = s['name']
+            else
+              name = "#{s.dig('stack', 'name')}/#{s['name']}"
+            end
+            menu.choice name, "#{s.dig('stack', 'name')}/#{s['name']}"
+          end
+        end
+      end
+
+      def filter_by_image(services, image)
+        services.select { |s|
+          s['image'].include?(image)
+        }
+      end
+
+      def filter_by_name(services, name)
+        services.select { |s|
+          s['name'].include?(name)
+        }
+      end
+
+      def stack
+        ENV['STACK']
+      end
+    end
+  end
+end

data/lib/kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver.rb

@@ -0,0 +1,15 @@
+module Kontena::Cli::Stacks
+  module YAML
+    class Opto::Resolvers::VaultCertPrompt < Opto::Resolver
+      include Kontena::Cli::Common
+
+      def resolve
+        message = hint || 'Select SSL certs'
+        secrets = client.get("grids/#{current_grid}/secrets")['secrets'].select{ |s|
+          s['name'].match(/(ssl|cert)/i)
+        }
+        prompt.multi_select(hint, secrets.map{ |s| s['name'] })
+      end
+    end
+  end
+end

data/lib/kontena/cli/stacks/yaml/opto/vault_resolver.rb

@@ -2,6 +2,7 @@ module Kontena::Cli::Stacks
   module YAML
     class Opto::Resolvers::Vault < Opto::Resolver
       def resolve
+        raise RuntimeError, "Missing or empty vault secret name" if hint.to_s.empty?
         require 'shellwords'
         Kontena.run("vault read --return #{hint.shellescape}", returning: :result)
       end

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

@@ -6,9 +6,9 @@ module Kontena::Cli::Stacks
       include Kontena::Util
       include Kontena::Cli::Common
 
-      attr_reader :file, :raw_content, :errors, :notifications
+      attr_reader :file, :raw_content, :errors, :notifications, :defaults, :values
 
-      def initialize(file, skip_validation: false, skip_variables: false, from_registry: false, variables: nil, values: nil)
+      def initialize(file, skip_validation: false, skip_variables: false, variables: nil, values: nil, defaults: nil)
         require 'yaml'
         require_relative 'service_extender'
         require_relative 'validator_v3'
@@ -17,15 +17,20 @@ module Kontena::Cli::Stacks
         require_relative 'opto/vault_resolver'
         require_relative 'opto/prompt_resolver'
         require_relative 'opto/service_instances_resolver'
+        require_relative 'opto/vault_cert_prompt_resolver'
+        require_relative 'opto/service_link_resolver'
         require 'liquid'
 
         @file = file
-        @from_registry = from_registry
 
         if from_registry?
           require 'shellwords'
           @raw_content = Kontena::StacksCache.pull(file)
           @registry    = Kontena::StacksCache.registry_url
+        elsif from_url?
+          require 'open-uri'
+          stream = open(file)
+          @raw_content = stream.read
         else
           @raw_content = File.read(File.expand_path(file))
         end
@@ -36,6 +41,7 @@ module Kontena::Cli::Stacks
         @skip_variables   = skip_variables
         @variables        = variables
         @values           = values
+        @defaults         = defaults
       end
 
       def internals_interpolated_yaml
@@ -89,8 +95,15 @@ module Kontena::Cli::Stacks
             to: :env
           }
         )
-        if @values
-          @values.each do |key, val|
+        if defaults
+          defaults.each do |key, val|
+            var = variables.option(key)
+            var.default = val if var
+          end
+        end
+
+        if values
+          values.each do |key, val|
             var = @variables.option(key)
             var.set(val) if var
           end
@@ -105,7 +118,7 @@ module Kontena::Cli::Stacks
         validate unless skip_validation?
 
         result = {}
-        Dir.chdir(from_registry? ? Dir.pwd : File.dirname(File.expand_path(file))) do
+        Dir.chdir(from_file? ? File.dirname(File.expand_path(file)) : Dir.pwd) do
           result[:stack]         = raw_yaml['stack']
           result[:version]       = self.stack_version
           result[:name]          = self.stack_name
@@ -119,7 +132,6 @@ module Kontena::Cli::Stacks
               k == 'GRID' || k == 'STACK' || variables.option(k).to.has_key?(:vault) || variables.option(k).from.has_key?(:vault)
             end
           end
-          result[:vault_keys]    = extract_vault_keys(result[:services])
         end
         result
       end
@@ -160,7 +172,15 @@ module Kontena::Cli::Stacks
       end
 
       def from_registry?
-        !!@from_registry
+        file =~ /\A[a-zA-Z0-9\_\.\-]+\/[a-zA-Z0-9\_\.\-]+(?::.*)?\z/ && !File.exist?(file)
+      end
+
+      def from_url?
+        file =~ /\A(?:http|https|ftp):\/\//
+      end
+
+      def from_file?
+        !from_registry? && !from_url?
       end
 
       # @return [Kontena::Cli::Stacks::YAML::ValidatorV3]
@@ -229,8 +249,8 @@ module Kontena::Cli::Stacks
         @services ||= fully_interpolated_yaml['services']
       end
 
-      def from_external_file(filename, service_name, from_registry: false)
-        outcome = Reader.new(filename, skip_validation: skip_validation?, skip_variables: true, from_registry: from_registry, variables: variables).execute(service_name)
+      def from_external_file(filename, service_name)
+        outcome = Reader.new(filename, skip_validation: skip_validation?, skip_variables: true, variables: variables, defaults: defaults, values: values).execute(service_name)
         errors.concat outcome[:errors] unless errors.any? { |item| item.has_key?(filename) }
         notifications.concat outcome[:notifications] unless notifications.any? { |item| item.has_key?(filename) }
         outcome[:services]
@@ -252,8 +272,11 @@ module Kontena::Cli::Stacks
               if use_opto
                 opt = variables.option(var)
                 if opt.nil?
-                  raise RuntimeError, "Undeclared variable '#{var}' in #{file}:#{line_num} -- #{row}" if raise_on_unknown
-                  val = nil
+                  if variables.find { |opt| opt.to[:env][var] }
+                    val = env[var]
+                  else
+                    raise RuntimeError, "Undeclared variable '#{var}' in #{file}:#{line_num} -- #{row}" if raise_on_unknown
+                  end
                 else
                   val = opt.value
                 end
@@ -315,7 +338,7 @@ module Kontena::Cli::Stacks
         if filename
           parent_config = from_external_file(filename, extended_service)
         elsif stackname
-          parent_config = from_external_file(stackname, extended_service, from_registry: true)
+          parent_config = from_external_file(stackname, extended_service)
         else
           raise ("Service '#{extended_service}' not found in #{file}") unless services.has_key?(extended_service)
           parent_config = process_config(services[extended_service])
@@ -384,19 +407,6 @@ module Kontena::Cli::Stacks
         end
       end
 
-      # Goes through an array of service hashes and extracts vault secret key names
-      # @param [Hash] services_array
-      # @return [Array] keys
-      def extract_vault_keys(services)
-        keys = []
-        services.each do |_, data|
-          Array(services['secrets']).each do |secret|
-            keys << secret['secret']
-          end
-        end
-        keys.uniq.compact
-      end
-
       # Takes a stack name such as user/foo:1.0.0 and breaks it into components
       # @param [String] stack_name
       # @return [Hash] a hash with :user, :stack and :version

data/lib/kontena/command.rb

@@ -2,6 +2,10 @@ require 'clamp'
 
 class Kontena::Command < Clamp::Command
 
+  option ['-D', '--debug'], :flag, "Enable debug", environment_variable: 'DEBUG' do
+    ENV['DEBUG'] = 'true'
+  end
+
   attr_accessor :arguments
   attr_reader :result
   attr_reader :exit_code
@@ -194,6 +198,7 @@ class Kontena::Command < Clamp::Command
     exit(@exit_code) if @exit_code.to_i > 0
     @result
   end
+
 end
 
 require_relative 'callback'

data/lib/kontena/main_command.rb

@@ -6,7 +6,6 @@ require_relative 'callback'
 require_relative 'cli/bytes_helper'
 require_relative 'cli/grid_options'
 require_relative 'cli/app_command'
-require_relative 'cli/login_command'
 require_relative 'cli/logout_command'
 require_relative 'cli/whoami_command'
 require_relative 'cli/container_command'
@@ -25,12 +24,16 @@ require_relative 'cli/version_command'
 require_relative 'cli/stack_command'
 require_relative 'cli/certificate_command'
 require_relative 'cli/cloud_command'
-require_relative 'cli/register_command'
 
 class Kontena::MainCommand < Kontena::Command
   include Kontena::Util
   include Kontena::Cli::Common
 
+  option ['-v', '--version'], :flag, "Output Kontena CLI version #{Kontena::Cli::VERSION}" do
+    puts ['kontena-cli', Kontena::Cli::VERSION, '[ruby' + RUBY_VERSION + '+' + RUBY_PLATFORM + ']'].join(' ')
+    exit 0
+  end
+
   subcommand "cloud", "Kontena Cloud specific commands", Kontena::Cli::CloudCommand
   subcommand "logout", "Logout from Kontena Masters or Kontena Cloud accounts", Kontena::Cli::LogoutCommand
   subcommand "grid", "Grid specific commands", Kontena::Cli::GridCommand
@@ -49,8 +52,6 @@ class Kontena::MainCommand < Kontena::Command
   subcommand "whoami", "Shows current logged in user", Kontena::Cli::WhoamiCommand
   subcommand "plugin", "Plugin related commands", Kontena::Cli::PluginCommand
   subcommand "version", "Show version", Kontena::Cli::VersionCommand
-  subcommand "login", "[DEPRECATED] Login to Kontena Master", Kontena::Cli::LoginCommand
-  subcommand "register", "[DEPRECATED] Register a Kontena Cloud account", Kontena::Cli::RegisterCommand
 
   def execute
   end

data/lib/kontena_cli.rb

@@ -36,6 +36,10 @@ module Kontena
     ENV['OS'] == 'Windows_NT' && RUBY_PLATFORM !~ /cygwin/
   end
 
+  def self.browserless?
+    !!(RUBY_PLATFORM =~ /linux|(?:free|net|open)bsd|solaris|aix|hpux/ && ENV['DISPLAY'].to_s.empty?)
+  end
+
   def self.simple_terminal?
     ENV['KONTENA_SIMPLE_TERM'] || !$stdout.tty?
   end

data/spec/fixtures/stack-with-prompted-variables.yml

@@ -31,8 +31,12 @@ variables:
       env: test_var
   TEST_ENV_VAR:      # the default from/to is to set/read env of the option name
     type: :string
-  TAG:
+  tag:
     type: string
+    from:
+      env: TAG
+    to:
+      env: TAG
   MYSQL_IMAGE:
     type: string
     empty_is_nil: false

data/spec/fixtures/stack-with-variables.yml

@@ -23,8 +23,12 @@ variables:
       env: test_var
   TEST_ENV_VAR:      # the default from/to is to set/read env of the option name
     type: string
-  TAG:
+  tag:
     type: string
+    from:
+      env: TAG
+    to:
+      env: TAG
   MYSQL_IMAGE:
     type: string
     empty_is_nil: false

data/spec/kontena/cli/cloud/login_command_spec.rb

@@ -17,6 +17,7 @@ describe Kontena::Cli::Cloud::LoginCommand do
   before(:each) do
     allow(subject).to receive(:config).and_return(config)
     allow(Kontena::Client).to receive(:new).and_return(client)
+    allow(Kontena).to receive(:browserless?).and_return(false)
   end
 
   it 'should give error if trying to use --code and --force' do

data/spec/kontena/cli/etcd/health_command_spec.rb

@@ -0,0 +1,87 @@
+describe Kontena::Cli::Etcd::HealthCommand do
+  include ClientHelpers
+  include OutputHelpers
+
+  before do
+    allow(subject).to receive(:health_icon) {|health| health.inspect }
+  end
+
+  describe '#show_node_health' do
+    context "For an offline node" do
+      let :node_health do
+        {
+          "connected" => false,
+          "name" => "node-1",
+          'etcd_health' => {
+            'health' => nil,
+            'error' => nil,
+          },
+        }
+      end
+
+      it "shows offline and returns false" do
+        expect{subject.show_node_health(node_health)}.to return_and_output false, [
+          ":offline Node node-1 is offline",
+        ]
+      end
+    end
+
+    context "For a node with health errors" do
+      let :node_health do
+        {
+          "name" => "node-1",
+          "connected" => true,
+          'etcd_health' => {
+            'health' => nil,
+            'error' => "timeout",
+          },
+        }
+      end
+
+      it "shows errored and returns false" do
+        expect{subject.show_node_health(node_health)}.to return_and_output false, [
+          ":error Node node-1 is unhealthy: timeout",
+        ]
+      end
+    end
+
+    context "For a node that returns health=false" do
+      let :node_health do
+        {
+          "name" => "node-1",
+          "connected" => true,
+          'etcd_health' => {
+            'health' => false,
+            'error' => nil,
+          },
+        }
+      end
+
+      it "shows unhealthy and returns false" do
+        expect{subject.show_node_health(node_health)}.to return_and_output false, [
+          ":error Node node-1 is unhealthy",
+        ]
+      end
+    end
+
+    context "For a healthy node" do
+      let :node_health do
+        {
+          "name" => "node-1",
+          "connected" => true,
+          'etcd_health' => {
+            'health' => true,
+            'error' => nil,
+          },
+        }
+      end
+
+
+      it "shows healthy and returns true" do
+        expect{subject.show_node_health(node_health)}.to return_and_output true, [
+          ":ok Node node-1 is healthy",
+        ]
+      end
+    end
+  end
+end