kontena-cli 1.4.0.pre6 → 1.4.0.pre7

data/lib/kontena/cli/helpers/exec_helper.rb

@@ -15,12 +15,12 @@ module Kontena::Cli::Helpers
     Kontena::Websocket::Logging.initialize_logger(STDERR, websocket_log_level)
 
     WEBSOCKET_CLIENT_OPTIONS = {
-      connect_timeout: ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 5.0,
-      open_timeout:    ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 5.0,
+      connect_timeout: ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 10.0,
+      open_timeout:    ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 10.0,
       ping_interval:   ENV["EXCON_READ_TIMEOUT"]    ? ENV["EXCON_READ_TIMEOUT"].to_f    : 30.0,
-      ping_timeout:    ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 5.0,
-      close_timeout:   ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 5.0,
-      write_timeout:   ENV["EXCON_WRITE_TIMEOUT"]   ? ENV["EXCON_WRITE_TIMEOUT"].to_f   : 5.0,
+      ping_timeout:    ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 10.0,
+      close_timeout:   ENV["EXCON_CONNECT_TIMEOUT"] ? ENV["EXCON_CONNECT_TIMEOUT"].to_f : 10.0,
+      write_timeout:   ENV["EXCON_WRITE_TIMEOUT"]   ? ENV["EXCON_WRITE_TIMEOUT"].to_f   : 10.0,
     }
 
     # @param ws [Kontena::Websocket::Client]
@@ -59,6 +59,7 @@ module Kontena::Cli::Helpers
     end
 
     # @param ws [Kontena::Websocket::Client]
+    # @raise [RuntimeError] exec error
     # @return [Integer] exit code
     def websocket_exec_read(ws)
       ws.read do |msg|
@@ -66,7 +67,9 @@ module Kontena::Cli::Helpers
 
         logger.debug "websocket exec read: #{msg.inspect}"
 
-        if msg.has_key?('exit')
+        if msg.has_key?('error')
+          raise msg['error']
+        elsif msg.has_key?('exit')
           # breaks the read loop
           return msg['exit'].to_i
         elsif msg.has_key?('stream')
@@ -96,6 +99,12 @@ module Kontena::Cli::Helpers
     def websocket_exec_write_thread(ws, tty: nil)
       Thread.new do
         begin
+          if tty
+            console_height, console_width = IO.console.winsize
+            websocket_exec_write(ws, 'tty_size' => {
+              width: console_width, height: console_height
+            })
+          end
           read_stdin(tty: tty) do |stdin|
             websocket_exec_write(ws, 'stdin' => stdin)
           end

data/lib/kontena/cli/helpers/health_helper.rb

@@ -49,5 +49,17 @@ module Kontena::Cli::Helpers
         return node['connected'] ? :ok : :offline
       end
     end
+
+    # @param node_etcd_health [Hash{health: String, error: String}]
+    # @return [Symbol, String]
+    def node_etcd_health(node_etcd_health)
+      if node_etcd_health['health']
+        return :ok, "healthy"
+      elsif node_etcd_health['error']
+        return :error, "unhealthy: #{node_etcd_health['error']}"
+      else
+        return :error, "unhealthy"
+      end
+    end
   end
 end

data/lib/kontena/cli/helpers/log_helper.rb

@@ -3,8 +3,8 @@ module Kontena::Cli::Helpers
 
     def self.included(base)
       if base.respond_to?(:option)
-        base.option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
-        base.option "--lines", "LINES", "Number of lines to show from the end of the logs", default: 100 do |s|
+        base.option ["-f", "--follow"], :flag, "Follow log output", :attribute_name => :tail, default: false
+        base.option ['--tail', '--lines'], "LINES", "Number of lines to show from the end of the logs", :attribute_name => :lines, default: 100 do |s|
           Integer(s)
         end
         base.option "--since", "SINCE", "Show logs since given timestamp"

data/lib/kontena/cli/helpers/time_helper.rb

@@ -0,0 +1,29 @@
+module Kontena::Cli::Helpers
+  module TimeHelper
+    # Return an approximation of how long ago the given time was.
+    # @param time [String]
+    # @param terse [Boolean] very terse output (2-3 chars wide)
+    def time_since(time, terse: false)
+      return '' if time.nil? || time.empty?
+
+      dt = Time.now - Time.parse(time)
+
+      dt_s = dt.to_i
+      dt_m, dt_s = dt_s / 60, dt_s % 60
+      dt_h, dt_m = dt_m / 60, dt_m % 60
+      dt_d, dt_h = dt_h / 60, dt_h % 60
+
+      parts = []
+      parts << "%dd" % dt_d if dt_d > 0
+      parts << "%dh" % dt_h if dt_h > 0
+      parts << "%dm" % dt_m if dt_m > 0
+      parts << "%ds" % dt_s
+
+      if terse
+        return parts.first
+      else
+        return parts.join('')
+      end
+    end
+  end
+end

data/lib/kontena/cli/master/init_cloud_command.rb

@@ -14,7 +14,26 @@ module Kontena::Cli::Master
     requires_current_master_token
     requires_current_account_token
 
+    def master_config
+      @master_config ||= client.get('config')
+    end
+
+    def current_master_cloud_config
+      return @cloud_config if @cloud_config
+      master_client_id = master_config['oauth2.client_id']
+      @cloud_config = cloud_client.get('user/masters')['data'].find { |cm| cm['attributes']['client-id'] == master_client_id }
+    end
+
+    def current_master_cloud_name
+      @cloud_name ||= current_master_cloud_config.nil? ? nil : current_master_cloud_config['attributes']['name']
+    end
+
+    def already_cloud_enabled?
+      !current_master_cloud_config.nil?
+    end
+
     def execute
+      exit_with_error "Current master is already registered to use Kontena Cloud as #{pastel.cyan(current_master_cloud_name)}" if already_cloud_enabled?
       args = ["--current"]
       args << "--force" if self.force?
       args += ["--cloud-master-id", self.cloud_master_id.shellescape] if self.cloud_master_id

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

@@ -13,7 +13,7 @@ module Kontena::Cli::Master
 
     def mark_if_current(row)
       unless quiet?
-        row.name.insert(0, pastel.yellow('* ')) if row.name == current_master_name
+        row.name.to_s.insert(0, pastel.yellow('* ')) if row.name == current_master_name
       end
     end
 

data/lib/kontena/cli/master/ssh_command.rb

@@ -1,3 +1,5 @@
+require 'kontena/plugin_manager'
+
 module Kontena::Cli::Master
   class SshCommand < Kontena::Command
 
@@ -25,7 +27,7 @@ module Kontena::Cli::Master
     end
 
     def vagrant_plugin_installed?
-      Kontena::PluginManager.instance.plugins.any? { |plugin| plugin.name == 'kontena-plugin-vagrant' }
+      Kontena::PluginManager::Common.installed?('vagrant')
     end
 
     def master_is_vagrant?

data/lib/kontena/cli/master/use_command.rb

@@ -18,8 +18,7 @@ module Kontena::Cli::Master
 
       master = config.find_server(name)
       if master.nil?
-        exit_with_error p"Could not resolve master by name '#{name}'." +
-              "\nFor a list of known masters please run: kontena master list"
+        exit_with_error "Could not resolve master by name '#{name}'. For a list of known masters please run: kontena master list"
       else
         config.current_master = master['name']
         config.write

data/lib/kontena/cli/node_command.rb

@@ -11,6 +11,7 @@ class Kontena::Cli::NodeCommand < Kontena::Command
   subcommand "health", "Check node health", load_subcommand('nodes/health_command')
   subcommand "env", "Generate kontena-agent.env configuration", load_subcommand('nodes/env_command')
 
+
   def execute
   end
 end

data/lib/kontena/cli/nodes/health_command.rb

@@ -1,32 +1,47 @@
 require 'kontena/cli/helpers/health_helper'
+require 'kontena/cli/helpers/time_helper'
 
 module Kontena::Cli::Nodes
   class HealthCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Helpers::HealthHelper
+    include Kontena::Cli::Helpers::TimeHelper
 
     parameter "NODE", "Node name"
 
-    def execute
-      require_api_url
-      require_current_grid
-      token = require_token
-
-      node = client(token).get("nodes/#{current_grid}/#{self.node}")
+    requires_current_master
+    requires_current_grid
 
-      return show_node_health(node)
+    def execute
+      return show_node_health("#{current_grid}/#{self.node}")
     end
 
+    # @param id [String] :grid/:node
     # @return [Boolean] true if healthy
-    def show_node_health(node)
-      if node['connected']
-        puts "#{health_icon(:ok)} Node is online"
-        return true
+    def show_node_health(id)
+      node_health = client.get("nodes/#{id}/health")
+
+      if node_health['status'] == 'online'
+        puts "#{health_icon(:ok)} Node is online for #{time_since(node_health['connected_at'])}"
       else
-        puts "#{health_icon(:offline)} Node is offline"
-        return false
+        puts "#{health_icon(:warning)} Node is #{node_health['status']}"
       end
+
+      etcd_health, etcd_status = node_etcd_health(node_health['etcd_health'])
+
+      puts "#{health_icon etcd_health} Node #{node_health['name']} etcd is #{etcd_status}"
+
+      return etcd_health == :ok
+
+    rescue Kontena::Errors::StandardErrorHash => exc
+      raise unless exc.status == 422
+
+      exc.errors.each do |what, error|
+        puts "#{health_icon :offline} Node #{id} #{what} error: #{error}"
+      end
+
+      return false
     end
   end
 end

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

@@ -1,10 +1,12 @@
 require_relative '../helpers/health_helper'
+require_relative '../helpers/time_helper'
 
 module Kontena::Cli::Nodes
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Helpers::HealthHelper
+    include Kontena::Cli::Helpers::TimeHelper
     include Kontena::Cli::TableGenerator::Helper
 
     option ['-a', '--all'], :flag, 'List nodes for all grids', default: false
@@ -19,7 +21,20 @@ module Kontena::Cli::Nodes
     end
 
     def node_status(node)
-      node['connected'] ? pastel.green('online') : pastel.red('offline')
+      case node_status = node['status']
+      when 'created'
+        "#{pastel.dark('created')} #{time_since(node['created_at'], terse: true)}"
+      when 'connecting'
+        "#{pastel.cyan('connecting')} #{time_since(node['connected_at'], terse: true)}"
+      when 'online'
+        "#{pastel.green('online')} #{time_since(node['connected_at'], terse: true)}"
+      when 'drain'
+        "#{pastel.yellow('drain')}"
+      when 'offline'
+        "#{pastel.red('offline')} #{time_since(node['disconnected_at'], terse: true)}"
+      else
+        pastel.white(node_status.to_s)
+      end
     end
 
     def node_initial(node, grid)
@@ -38,7 +53,7 @@ module Kontena::Cli::Nodes
         version: 'agent_version',
         status:  'status',
         initial: 'initial',
-        labels:  'labels'
+        labels:  'labels',
       }
     end
 
@@ -58,6 +73,7 @@ module Kontena::Cli::Nodes
           node['name'] = node_name(node, grid)
           grid_nodes << node
           next if quiet?
+          node['agent_version'] ||= '-'
           node['initial'] = node_initial(node, grid)
           node['status'] = node_status(node)
           node['labels'] = node_labels(node)
@@ -66,7 +82,7 @@ module Kontena::Cli::Nodes
         unless quiet?
           grid_health = grid_health(grid, grid_nodes)
           grid_nodes.each do |node|
-            node['name'] = health_icon(node_health(node, grid_health)) + " " + (node['name'] || '(initializing)')
+            node['name'] = health_icon(node_health(node, grid_health)) + " " + (node['name'] || node['node_id'])
           end
         end
 

data/lib/kontena/cli/nodes/show_command.rb

@@ -19,6 +19,7 @@ module Kontena::Cli::Nodes
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"
       puts "  last connect: #{node['connected_at']}"
       puts "  last seen: #{node['last_seen_at']}"
+      puts "  availability: #{node['availability']}"
       puts "  public ip: #{node['public_ip']}"
       puts "  private ip: #{node['private_ip']}"
       puts "  overlay ip: #{node['overlay_ip']}"
@@ -43,9 +44,10 @@ module Kontena::Cli::Nodes
         mem_used = mem['used'] - (mem['cached'] + mem['buffers'])
         puts "    memory: #{to_gigabytes(mem_used, 2)} of #{to_gigabytes(mem['total'], 2)} GB"
       end
-      if node['resource_usage']['filesystem']
+      fs = node.dig('resource_usage','filesystem')
+      if fs
         puts "    filesystem:"
-        node['resource_usage']['filesystem'].each do |filesystem|
+        fs.each do |filesystem|
           puts "      - #{filesystem['name']}: #{to_gigabytes(filesystem['used'], 2)} of #{to_gigabytes(filesystem['total'], 2)} GB"
         end
       end

data/lib/kontena/cli/nodes/ssh_command.rb

@@ -1,3 +1,5 @@
+require 'kontena/plugin_manager'
+
 module Kontena::Cli::Nodes
   class SshCommand < Kontena::Command
     include Kontena::Cli::Common
@@ -21,7 +23,8 @@ module Kontena::Cli::Nodes
         node = client.get("nodes/#{current_grid}/#{self.node}")
       elsif any?
         nodes = client.get("grids/#{current_grid}/nodes")['nodes']
-        node = nodes.select{ |node| node['connected'] }.first
+        node = nodes.find{ |node| node['connected'] }
+        exit_with_error "There are no online nodes" if node.nil?
       else
         exit_with_error "No node name given. Use --any to connect to the first available node"
       end
@@ -29,7 +32,7 @@ module Kontena::Cli::Nodes
       provider = Array(node["labels"]).find{ |l| l.start_with?('provider=')}.to_s.split('=').last
 
       if provider == 'vagrant'
-        unless Kontena::PluginManager.instance.plugins.find { |plugin| plugin.name == 'kontena-plugin-vagrant' }
+        unless Kontena::PluginManager::Common.installed?('vagrant')
           exit_with_error 'You need to install vagrant plugin to ssh into this node. Use kontena plugin install vagrant'
         end
         cmd = ['vagrant', 'node', 'ssh', node['name']] + commands_list

data/lib/kontena/cli/nodes/update_command.rb

@@ -11,6 +11,7 @@ module Kontena::Cli::Nodes
 
     option ["-l", "--label"], "LABEL", "Node label", multivalued: true
     option "--clear-labels", :flag, "Clear node labels"
+    option "--availability", "active|drain", "Node scheduling availability"
 
     def execute
       data = {}
@@ -18,6 +19,7 @@ module Kontena::Cli::Nodes
       data[:labels] = self.label_list unless self.label_list.empty?
       data[:labels] = [] if self.clear_labels?
 
+      data[:availability] = availability if availability
       spinner "Updating #{self.node.colorize(:cyan)} node " do
         client.put("nodes/#{current_grid}/#{self.node}", data)
       end

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

@@ -1,29 +1,32 @@
-require 'open3'
+require 'kontena/plugin_manager'
 
 module Kontena::Cli::Plugins
   class InstallCommand < Kontena::Command
     include Kontena::Util
     include Kontena::Cli::Common
+    include Kontena::PluginManager::Common
 
     parameter 'NAME', 'Plugin name'
 
     option ['-v', '--version'], 'VERSION', 'Specify version of plugin to install'
     option '--pre', :flag, 'Allow pre-release of a plugin to be installed', default: false
 
-    def execute
-      installed_version = Kontena::PluginManager.instance.installed(name)
+    def installer
+      Kontena::PluginManager::Installer.new(name, pre: pre?, version: version)
+    end
 
-      if installed_version
+    def execute
+      if installed?(name)
         installed = spinner "Upgrading plugin #{name.colorize(:cyan)}" do
-          Kontena::PluginManager.instance.upgrade_plugin(name, pre: pre?)
+          installer.upgrade
         end
 
-        spinner "Running cleanup" do
-          Kontena::PluginManager.instance.cleanup_plugin(name)
+        spinner "Running cleanup" do |spin|
+          Kontena::PluginManager::Cleaner.new(name).cleanup
         end
       else
         installed = spinner "Installing plugin #{name.colorize(:cyan)}" do
-          Kontena::PluginManager.instance.install_plugin(name, pre: pre?, version: version)
+          installer.install
         end
       end
 

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

@@ -1,3 +1,4 @@
+require 'kontena/plugin_manager'
 require_relative 'common'
 
 module Kontena::Cli::Plugins
@@ -5,6 +6,7 @@ module Kontena::Cli::Plugins
     include Kontena::Cli::Common
     include Kontena::Cli::TableGenerator::Helper
     include Common
+    include Kontena::PluginManager::Common
 
     banner "List installed plugins"
 
@@ -12,8 +14,8 @@ module Kontena::Cli::Plugins
       quiet? ? [:name] : %i(name version description)
     end
 
-    def plugins
-      Kontena::PluginManager.instance.plugins.map do |plugin|
+    def plugin_list
+      plugins.map do |plugin|
         {
           name: short_name(plugin.name),
           version: plugin.version,
@@ -23,7 +25,7 @@ module Kontena::Cli::Plugins
     end
 
     def execute
-      print_table(plugins)
+      print_table(plugin_list)
     end
   end
 end

data/lib/kontena/cli/plugins/search_command.rb

@@ -1,19 +1,21 @@
 require_relative 'common'
+require 'kontena/plugin_manager'
 
 module Kontena::Cli::Plugins
   class SearchCommand < Kontena::Command
     include Common
+    include Kontena::PluginManager::Common
 
     parameter '[NAME]', 'Search text'
     option '--pre', :flag, 'Include pre-release versions'
 
     def execute
-      results = Kontena::PluginManager.instance.search_plugins(name)
+      results = search_plugins(name)
       exit_with_error("Cannot access plugin server") unless results
       puts "%-50s %-10s %-60s" % ['NAME', 'VERSION', 'DESCRIPTION']
       results.each do |item|
         if pre?
-          latest = Kontena::PluginManager.instance.latest_version(item['name'], pre: true)
+          latest = rubygems_client.latest_version(item['name'], pre: true)
           item['version'] = latest.version.to_s
         end
         puts "%-50s %-10s %-60s" % [short_name(item['name']), item['version'], item['info']]