kontena-cli 0.9.3 → 0.10.0

data/lib/kontena/cli/etcd/common.rb

@@ -0,0 +1,8 @@
+module Kontena::Cli::Etcd
+  module Common
+
+    def validate_key
+      abort("Invalid key, did you mean /#{key} ?") unless key[0] == '/'
+    end
+  end
+end

data/lib/kontena/cli/etcd/get_command.rb

@@ -1,13 +1,17 @@
+require_relative 'common'
 
 module Kontena::Cli::Etcd
   class GetCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Common
 
     parameter "KEY", "Etcd key"
 
     def execute
       require_api_url
       token = require_token
+      validate_key
+      
       response = client(token).get("etcd/#{current_grid}/#{key}")
       if response['value']
         puts response['value']

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

@@ -1,7 +1,9 @@
+require_relative 'common'
 
 module Kontena::Cli::Etcd
   class ListCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Common
 
     parameter "KEY", "Etcd key"
 
@@ -10,6 +12,8 @@ module Kontena::Cli::Etcd
     def execute
       require_api_url
       token = require_token
+      validate_key
+
       opts = []
       opts << 'recursive=true' if recursive?
       response = client(token).get("etcd/#{current_grid}/#{key}?#{opts.join('&')}")

data/lib/kontena/cli/etcd/mkdir_command.rb

@@ -1,12 +1,17 @@
+require_relative 'common'
+
 module Kontena::Cli::Etcd
   class MkdirCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Common
 
     parameter "KEY", "Etcd key"
 
     def execute
       require_api_url
       token = require_token
+      validate_key
+      
       data = {}
       response = client(token).post("etcd/#{current_grid}/#{key}", data)
       if response['error']

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

@@ -1,6 +1,9 @@
+require_relative 'common'
+
 module Kontena::Cli::Etcd
   class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Common
 
     parameter "KEY", "Etcd key"
 
@@ -9,6 +12,8 @@ module Kontena::Cli::Etcd
     def execute
       require_api_url
       token = require_token
+      validate_key
+      
       data = {}
       data[:recursive] = true if recursive?
       response = client(token).delete("etcd/#{current_grid}/#{key}", data)

data/lib/kontena/cli/etcd/set_command.rb

@@ -1,6 +1,9 @@
+require_relative 'common'
+
 module Kontena::Cli::Etcd
   class SetCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Common
 
     parameter "KEY", "Etcd key"
     parameter "VALUE", "Etcd value"
@@ -8,6 +11,8 @@ module Kontena::Cli::Etcd
     def execute
       require_api_url
       token = require_token
+      validate_key
+      
       data = {value: value}
       response = client(token).post("etcd/#{current_grid}/#{key}", data)
       if response['error']

data/lib/kontena/cli/grid_command.rb

@@ -5,6 +5,7 @@ require_relative 'grids/show_command'
 require_relative 'grids/logs_command'
 require_relative 'grids/remove_command'
 require_relative 'grids/current_command'
+require_relative 'grids/env_command'
 require_relative 'grids/audit_log_command'
 require_relative 'grids/list_users_command'
 require_relative 'grids/add_user_command'
@@ -19,6 +20,7 @@ class Kontena::Cli::GridCommand < Clamp::Command
   subcommand "logs", "Show logs from grid containers", Kontena::Cli::Grids::LogsCommand
   subcommand "remove", "Remove a grid", Kontena::Cli::Grids::RemoveCommand
   subcommand "current", "Show current grid details", Kontena::Cli::Grids::CurrentCommand
+  subcommand "env", "Show the current grid environment details", Kontena::Cli::Grids::EnvCommand
   subcommand "audit-log", "Show audit log of the current grid", Kontena::Cli::Grids::AuditLogCommand
   subcommand "list-users", "List current grid users", Kontena::Cli::Grids::ListUsersCommand
   subcommand "add-user", "Add user to the current grid", Kontena::Cli::Grids::AddUserCommand

data/lib/kontena/cli/grids/env_command.rb

@@ -0,0 +1,22 @@
+require_relative 'common'
+
+module Kontena::Cli::Grids
+  class EnvCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Common
+
+    option ["-e", "--export"], :flag, "Add export", default: false
+
+    def execute
+      require_api_url
+      if current_grid.nil?
+        abort 'No grid selected. To select grid, please run: kontena grid use <grid name>'
+      else
+        grid = client(require_token).get("grids/#{current_grid}")
+        prefix = export? ? 'export ' : ''
+        puts "#{prefix}KONTENA_URI=#{settings['server']['url'].sub('http', 'ws')}"
+        puts "#{prefix}KONTENA_TOKEN=#{grid['token']}"
+      end
+    end
+  end
+end

data/lib/kontena/cli/grids/logs_command.rb

@@ -22,6 +22,7 @@ module Kontena::Cli::Grids
 
 
       if follow?
+        @buffer = ''
         query_params[:follow] = 1
         stream_logs(token, query_params)
       else
@@ -39,7 +40,17 @@ module Kontena::Cli::Grids
 
     def stream_logs(token, query_params)
       streamer = lambda do |chunk, remaining_bytes, total_bytes|
-        log = JSON.parse(chunk)
+        begin
+          unless @buffer.empty?
+            chunk = @buffer + chunk
+          end
+          unless chunk.empty?
+            log = JSON.parse(chunk)
+          end
+          @buffer = ''
+        rescue => exc
+          @buffer << chunk
+        end
         if log
           color = color_for_container(log['name'])
           puts "#{log['name'].colorize(color)} | #{log['data']}"

data/lib/kontena/cli/node_command.rb

@@ -2,6 +2,7 @@ require_relative 'nodes/list_command'
 require_relative 'nodes/remove_command'
 require_relative 'nodes/show_command'
 require_relative 'nodes/update_command'
+require_relative 'nodes/ssh_command'
 
 require_relative 'nodes/vagrant_command'
 require_relative 'nodes/digital_ocean_command'
@@ -12,6 +13,7 @@ class Kontena::Cli::NodeCommand < Clamp::Command
 
   subcommand "list", "List grid nodes", Kontena::Cli::Nodes::ListCommand
   subcommand "show", "Show node", Kontena::Cli::Nodes::ShowCommand
+  subcommand "ssh", "Ssh into node", Kontena::Cli::Nodes::SshCommand
   subcommand "update", "Update node", Kontena::Cli::Nodes::UpdateCommand
   subcommand "remove", "Remove node", Kontena::Cli::Nodes::RemoveCommand
 

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

@@ -0,0 +1,30 @@
+module Kontena::Cli::Nodes
+  class SshCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NODE_ID", "Node id"
+    option ["-i", "--identity-file"], "IDENTITY_FILE", "Path to ssh private key"
+    option ["-u", "--user"], "USER", "Login as a user", default: "core"
+    option "--private-ip", :flag, "Connect to node's private IP address"
+    option "--internal-ip", :flag, "Connect to node's internal IP address (requires VPN connection)"
+
+    def execute
+      require_api_url
+      require_current_grid
+      token = require_token
+
+      node = client(token).get("grids/#{current_grid}/nodes/#{node_id}")
+      cmd = ['ssh']
+      cmd << "-i #{identity_file}" if identity_file
+      if internal_ip?
+        ip = "10.81.0.#{node['node_number']}"
+      elsif private_ip?
+        ip = node['private_ip']
+      else
+        ip = node['public_ip']
+      end
+      cmd << "#{user}@#{ip}"
+      exec(cmd.join(" "))
+    end
+  end
+end

data/lib/kontena/cli/service_command.rb

@@ -11,8 +11,10 @@ require_relative 'services/delete_command'
 require_relative 'services/containers_command'
 require_relative 'services/logs_command'
 require_relative 'services/stats_command'
+require_relative 'services/envs_command'
 require_relative 'services/add_env_command'
 require_relative 'services/remove_env_command'
+require_relative 'services/monitor_command'
 
 class Kontena::Cli::ServiceCommand < Clamp::Command
 
@@ -29,8 +31,10 @@ class Kontena::Cli::ServiceCommand < Clamp::Command
   subcommand "containers", "List service containers", Kontena::Cli::Services::ContainersCommand
   subcommand "logs", "Show service logs", Kontena::Cli::Services::LogsCommand
   subcommand "stats", "Show service statistics", Kontena::Cli::Services::StatsCommand
+  subcommand "envs", "Show environment variables", Kontena::Cli::Services::EnvsCommand
   subcommand "add-env", "Add environment variable", Kontena::Cli::Services::AddEnvCommand
   subcommand "remove-env", "Remove environment variable", Kontena::Cli::Services::RemoveEnvCommand
+  subcommand "monitor", "Monitor", Kontena::Cli::Services::MonitorCommand
 
   def execute
   end

data/lib/kontena/cli/services/create_command.rb

@@ -27,6 +27,10 @@ module Kontena::Cli::Services
     option "--net", "NET", "Network mode"
     option "--log-driver", "LOG_DRIVER", "Set logging driver"
     option "--log-opt", "LOG_OPT", "Add logging options", multivalued: true
+    option "--deploy-strategy", "STRATEGY", "Deploy strategy to use (ha, random)"
+    option "--deploy-wait-for-port", "PORT", "Wait for port to respond when deploying"
+    option "--deploy-min-health", "FLOAT", "The minimum percentage (0.0 - 1.0) of healthy instances that do not sacrifice overall service availability while deploying"
+    option "--pid", "PID", "Pid namespace to use"
 
     def execute
       require_api_url
@@ -64,6 +68,11 @@ module Kontena::Cli::Services
       data[:net] = net if net
       data[:log_driver] = log_driver if log_driver
       data[:log_opts] = parse_log_opts(log_opt_list)
+      data[:strategy] = deploy_strategy if deploy_strategy
+      data[:deploy_opts] = {}
+      data[:deploy_opts][:min_health] = deploy_min_health.to_f if deploy_min_health
+      data[:deploy_opts][:wait_for_port] = deploy_wait_for_port.to_i if deploy_wait_for_port
+      data[:pid] = pid if pid
       data
     end
   end

data/lib/kontena/cli/services/deploy_command.rb

@@ -6,18 +6,12 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
-    option '--strategy', 'STRATEGY', 'Define deploy strategy (ha / random)'
-    option '--wait-for-port', 'WAIT_FOR_PORT', 'Wait for given container port to open before deploying next container'
 
     def execute
       require_api_url
       token = require_token
       service_id = name
-      data = {}
-      data[:strategy] = strategy if strategy
-      data[:wait_for_port] = wait_for_port if wait_for_port
-      deploy_service(token, service_id, data)
-      show_service(token, service_id)
+      deploy_service(token, service_id, {})
     end
   end
 end

data/lib/kontena/cli/services/envs_command.rb

@@ -0,0 +1,19 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class EnvsCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+      token = require_token
+      service = client(token).get("services/#{parse_service_id(name)}")
+      service["env"].each do |env|
+        puts env
+      end
+    end
+  end
+end

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

@@ -10,10 +10,22 @@ module Kontena::Cli::Services
       token = require_token
 
       grids = client(token).get("grids/#{current_grid}/services")
-      puts "%-30.30s %-40.40s %-10s %-8s" % ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL']
+      titles = ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL', 'STATE']
+      puts "%-30.30s %-50.50s %-10s %-8s %-10s" % titles
       grids['services'].each do |service|
-        state = service['stateful'] ? 'yes' : 'no'
-        puts "%-30.30s %-40.40s %-10.10s %-8s" % [service['name'], service['image'], service['container_count'], state]
+        stateful = service['stateful'] ? 'yes' : 'no'
+        image = service['image']
+        if image.length > 50
+          image = image[0..10] << '...' << image[-35..-1]
+        end
+        vars = [
+          service['name'],
+          image,
+          service['container_count'],
+          stateful,
+          service['state']
+        ]
+        puts "%-30.30s %-50.50s %-10.10s %-8s %-10s" % vars
       end
     end
   end

data/lib/kontena/cli/services/monitor_command.rb

@@ -0,0 +1,57 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class MonitorCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    option "--interval", "SECONDS", "How often view is refreshed", default: 2
+
+    def execute
+      require_api_url
+      token = require_token
+
+      loop do
+        nodes = {}
+        service = client(token).get("services/#{current_grid}/#{name}")
+        result = client(token).get("services/#{current_grid}/#{name}/containers")
+        result['containers'].each do |container|
+          nodes[container['node']['name']] ||= []
+          nodes[container['node']['name']] << container
+        end
+        clear_terminal
+        puts "service: #{name} (#{result['containers'].size}/#{service['container_count']} instances)"
+        puts "strategy: #{service['strategy']}"
+        puts "status: #{service['state']}"
+        puts "stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
+        puts "nodes:"
+        node_names = nodes.keys.sort
+        node_names.each do |name|
+          containers = nodes[name]
+          puts "  #{name} (#{containers.size} instances)"
+          print "  "
+          containers.each do |container|
+            color = container['status']
+            if container['status'] == 'running'
+              color = :green
+            elsif container['status'] == 'killed'
+              color = :red
+            elsif container['status'] == 'stopped'
+              color = :gray
+            else
+              color = :yellow
+            end
+            print "■".colorize(color)
+          end
+          puts ''
+        end
+        sleep interval.to_f
+      end
+    end
+
+    def clear_terminal
+      print "\e[H\e[2J"
+    end
+  end
+end

data/lib/kontena/cli/services/scale_command.rb

@@ -7,14 +7,10 @@ module Kontena::Cli::Services
 
     parameter "NAME", "Service name"
     parameter "INSTANCES", "Scales service to given number of instances"
-    option '--strategy', 'STRATEGY', 'Define deploy strategy (ha / random)'
 
     def execute
-      token = require_token
-      client(token).put("services/#{parse_service_id(name)}", {container_count: instances})
-      opts = {}
-      opts[:strategy] = strategy if strategy
-      deploy_service(token, name, opts)
+      token = require_token      
+      scale_service(token, name, instances)
     end
   end
 end

data/lib/kontena/cli/services/services_helper.rb

@@ -22,6 +22,14 @@ module Kontena
           client(token).put("services/#{param}", data)
         end
 
+        # @param [String] token
+        # @param [String] service_id
+        # @param [Integer] instances
+        def scale_service(token, service_id, instances)
+          param = parse_service_id(service_id)
+          client(token).post("services/#{param}/scale", {instances: instances})
+        end
+
         # @param [String] token
         # @param [String] service_id
         def get_service(token, service_id)
@@ -36,76 +44,126 @@ module Kontena
           grid = service['id'].split('/')[0]
           puts "#{service['id']}:"
           puts "  status: #{service['state'] }"
+          puts "  image: #{service['image']}"
           puts "  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
           puts "  scaling: #{service['container_count'] }"
-          puts "  image: #{service['image']}"
+          puts "  strategy: #{service['strategy']}"
+          puts "  deploy_opts:"
+          puts "    wait_for_port: #{service['deploy_opts']['wait_for_port'] || '-'}"
+          puts "    min_health: #{service['deploy_opts']['min_health']}"
           puts "  dns: #{service['name']}.#{grid}.kontena.local"
 
-          puts "  affinity: "
-          service['affinity'].to_a.each do |a|
-            puts "    - #{a}"
+          if service['affinity'].to_a.size > 0
+            puts "  affinity: "
+            service['affinity'].to_a.each do |a|
+              puts "    - #{a}"
+            end
           end
 
-          if service['cmd']
-            puts "  cmd: #{service['cmd'].join(' ')}"
-          else
-            puts "  cmd: "
+          unless service['cmd'].to_s.empty?
+            if service['cmd']
+              puts "  cmd: #{service['cmd'].join(' ')}"
+            else
+              puts "  cmd: "
+            end
+          end
+
+          if service['hooks'].to_a.size > 0
+            puts "  hooks: "
+            service['hooks'].to_a.each do |hook|
+                puts "    - name: #{hook['name']}"
+                puts "      type: #{hook['type']}"
+                puts "      cmd: #{hook['cmd']}"
+                puts "      oneshot: #{hook['oneshot']}"
+            end
           end
 
-          puts "  env: "
-          service['env'].to_a.each{|e| puts "    - #{e}"}
+          if service['env'].to_a.size > 0
+            puts "  env: "
+            service['env'].to_a.each do |e|
+              if e.length > 50
+                puts "    - #{e[0..50]}..."
+              else
+                puts "    - #{e}"
+              end
+            end
+          end
 
-          puts "  ports:"
-          service['ports'].to_a.each do |p|
-            puts "    - #{p['node_port']}:#{p['container_port']}/#{p['protocol']}"
+          unless service['net'].to_s.empty?
+            puts "  net: #{service['net']}"
           end
 
-          puts "  volumes:"
-          service['volumes'].to_a.each do |v|
-            puts "    - #{v}"
+          if service['ports'].to_a.size > 0
+            puts "  ports:"
+            service['ports'].to_a.each do |p|
+              puts "    - #{p['node_port']}:#{p['container_port']}/#{p['protocol']}"
+            end
           end
 
-          puts "  volumes_from:"
-          service['volumes_from'].to_a.each do |v|
-            puts "    - #{v}"
+          if service['volumes'].to_a.size > 0
+            puts "  volumes:"
+            service['volumes'].to_a.each do |v|
+              puts "    - #{v}"
+            end
+          end
+
+          if service['volumes_from'].to_a.size > 0
+            puts "  volumes_from:"
+            service['volumes_from'].to_a.each do |v|
+              puts "    - #{v}"
+            end
           end
 
-          puts "  links: "
-          service['links'].to_a.each do |l|
-            puts "    - #{l['alias']}"
+          if service['links'].to_a.size > 0
+            puts "  links: "
+            service['links'].to_a.each do |l|
+              puts "    - #{l['alias']}"
+            end
           end
 
-          puts "  cap_add:"
-          service['cap_add'].to_a.each do |c|
-            puts "    - #{c}"
+          if service['cap_add'].to_a.size > 0
+            puts "  cap_add:"
+            service['cap_add'].to_a.each do |c|
+              puts "    - #{c}"
+            end
           end
 
-          puts "  cap_drop:"
-          service['cap_drop'].to_a.each do |c|
-            puts "    - #{c}"
+          if service['cap_drop'].to_a.size > 0
+            puts "  cap_drop:"
+            service['cap_drop'].to_a.each do |c|
+              puts "    - #{c}"
+            end
           end
 
-          puts "  log_driver: #{service['log_driver']}"
+          unless service['log_driver'].to_s.empty?
+            puts "  log_driver: #{service['log_driver']}"
+            puts "  log_opts:"
+            service['log_opts'].each do |opt, value|
+              puts "    #{opt}: #{value}"
+            end
+          end
 
-          puts "  log_opts:"
-          service['log_opts'].each do |opt, value|
-            puts "    #{opt}: #{value}"
+          unless service['pid'].to_s.empty?
+            puts "  pid: #{service['pid']}"
           end
 
-          puts "  containers:"
+          puts "  instances:"
           result = client(token).get("services/#{parse_service_id(service_id)}/containers")
           result['containers'].each do |container|
             puts "    #{container['name']}:"
             puts "      rev: #{container['deploy_rev']}"
-            puts "      node: #{container['node']['name']}"
+            puts "      node: #{container['node']['name'] rescue 'unknown'}"
             puts "      dns: #{container['name']}.#{grid}.kontena.local"
-            puts "      ip: #{container['overlay_cidr'].split('/')[0]}"
-            puts "      public ip: #{container['node']['public_ip']}"
+            puts "      ip: #{container['overlay_cidr'].to_s.split('/')[0]}"
+            puts "      public ip: #{container['node']['public_ip'] rescue 'unknown'}"
             if container['status'] == 'unknown'
               puts "      status: #{container['status'].colorize(:yellow)}"
             else
               puts "      status: #{container['status']}"
             end
+            if container['state']['error'] && container['state']['error'] != ''
+              puts "      reason: #{container['state']['error']}"
+            end
           end
         end
 
@@ -115,13 +173,6 @@ module Kontena
         def deploy_service(token, service_id, data)
           param = parse_service_id(service_id)
           client(token).post("services/#{param}/deploy", data)
-          print 'deploying '
-          until client(token).get("services/#{param}")['state'] != 'deploying' do
-            print '.'
-            sleep 1
-          end
-          puts ' done'.colorize(:green)
-          puts ''
         end
 
         # @param [String] token