kontena-cli 0.11.7 → 0.12.0

data/lib/kontena/cli/registry/delete_command.rb

@@ -1,8 +1,11 @@
 module Kontena::Cli::Registry
   class DeleteCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     def execute
+       puts "DEPRECATION WARNING: Support for 'kontena registry delete' will be dropped. Use 'kontena registry remove' instead.".colorize(:red)
+
       require_api_url
       token = require_token
 

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

@@ -0,0 +1,15 @@
+module Kontena::Cli::Registry
+  class RemoveCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    def execute
+      require_api_url
+      token = require_token
+
+      registry = client(token).get("services/#{current_grid}/registry") rescue nil
+      abort("Docker Registry service does not exist") if registry.nil?
+
+      client(token).delete("services/#{current_grid}/registry")
+    end
+  end
+end

data/lib/kontena/cli/registry_command.rb

@@ -1,10 +1,12 @@
 require_relative 'registry/create_command'
 require_relative 'registry/delete_command'
+require_relative 'registry/remove_command'
 
 class Kontena::Cli::RegistryCommand < Clamp::Command
 
   subcommand "create", "Create Docker image registry service", Kontena::Cli::Registry::CreateCommand
-  subcommand "delete", "Delete Docker image registry service", Kontena::Cli::Registry::DeleteCommand
+  subcommand ["remove","rm"], "Remove Docker image registry service", Kontena::Cli::Registry::RemoveCommand
+  subcommand "delete", "[DEPRECATED] Delete Docker image registry service", Kontena::Cli::Registry::DeleteCommand
 
   def execute
   end

data/lib/kontena/cli/service_command.rb

@@ -8,17 +8,25 @@ require_relative 'services/restart_command'
 require_relative 'services/create_command'
 require_relative 'services/scale_command'
 require_relative 'services/delete_command'
+require_relative 'services/remove_command'
 require_relative 'services/containers_command'
 require_relative 'services/logs_command'
 require_relative 'services/stats_command'
+require_relative 'services/monitor_command'
+
 require_relative 'services/envs_command'
 require_relative 'services/add_env_command'
 require_relative 'services/remove_env_command'
-require_relative 'services/monitor_command'
+
+require_relative 'services/add_secret_command'
+require_relative 'services/remove_secret_command'
+
+require_relative 'services/link_command'
+require_relative 'services/unlink_command'
 
 class Kontena::Cli::ServiceCommand < Clamp::Command
 
-  subcommand "list", "List services", Kontena::Cli::Services::ListCommand
+  subcommand ["list","ls"], "List services", Kontena::Cli::Services::ListCommand
   subcommand "create", "Create a new service", Kontena::Cli::Services::CreateCommand
   subcommand "show", "Show service details", Kontena::Cli::Services::ShowCommand
   subcommand "update", "Update service configuration", Kontena::Cli::Services::UpdateCommand
@@ -27,14 +35,22 @@ class Kontena::Cli::ServiceCommand < Clamp::Command
   subcommand "start", "Start service", Kontena::Cli::Services::StartCommand
   subcommand "restart", "Restart service", Kontena::Cli::Services::RestartCommand
   subcommand "scale", "Scale service", Kontena::Cli::Services::ScaleCommand
-  subcommand "delete", "Delete service", Kontena::Cli::Services::DeleteCommand
+  subcommand ["remove", "rm"], "Remove service", Kontena::Cli::Services::RemoveCommand
+  subcommand "delete", "[DEPRECATED] Delete service", Kontena::Cli::Services::DeleteCommand
   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 "monitor", "Monitor", Kontena::Cli::Services::MonitorCommand
+
   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
+
+  subcommand "add-secret", "Add secret from Vault", Kontena::Cli::Services::AddSecretCommand
+  subcommand "remove-secret", "Remove secret", Kontena::Cli::Services::RemoveSecretCommand
+
+  subcommand "link", "Link service to another service", Kontena::Cli::Services::LinkCommand
+  subcommand "unlink", "Unlink service from another service", Kontena::Cli::Services::UnlinkCommand
 
   def execute
   end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class AddEnvCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -0,0 +1,24 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class AddSecretCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    parameter "SECRET", "Secret to be added from Vault (format: secret:name:type)"
+
+    def execute
+      require_api_url
+      token = require_token
+      result = client(token).get("services/#{parse_service_id(name)}")
+      secrets = result['secrets']
+      secrets << parse_secrets([secret])[0]
+      data = {
+        secrets: secrets
+      }
+      client(token).put("services/#{parse_service_id(name)}", data)
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class ContainersCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"
@@ -27,11 +28,11 @@ 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-strategy", "STRATEGY", "Deploy strategy to use (ha, daemon, 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"
-    option "--secret", "SECRET", "Import secret from Vault", multivalued: true
+    option "--secret", "SECRET", "Import secret from Vault (format: <secret>:<name>:<env>)", multivalued: true
 
     def execute
       require_api_url

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

@@ -3,11 +3,13 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class DeleteCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"
 
     def execute
+       puts "DEPRECATION WARNING: Support for 'kontena service delete' will be dropped. Use 'kontena service remove' instead.".colorize(:red)
       require_api_url
       token = require_token
 

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class DeployCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class EnvsCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -0,0 +1,26 @@
+require_relative '../grid_options'
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class LinkCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    parameter "TARGET", "Link target service name"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      service = client(token).get("services/#{parse_service_id(name)}")
+      existing_targets = service['links'].map{|l| l['grid_service_id'].split('/')[1]}
+      abort("Service is already linked to #{target.to_s}") if existing_targets.include?(target.to_s)
+      links = service['links'].map{|l| {name: l['grid_service_id'].split('/')[1], alias: l['alias']} }
+      links << {name: target.to_s, alias: target.to_s}
+      data = {links: links}
+      update_service(token, name, data)
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class ListCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     def execute
@@ -10,22 +11,24 @@ module Kontena::Cli::Services
       token = require_token
 
       grids = client(token).get("grids/#{current_grid}/services")
-      titles = ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL', 'STATE']
-      puts "%-30.30s %-50.50s %-10s %-8s %-10s" % titles
+      titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'EXPOSED PORTS']
+      puts "%-60.60s %-10s %-8s %-10s %-50s" % titles
       grids['services'].each do |service|
         stateful = service['stateful'] ? 'yes' : 'no'
-        image = service['image']
-        if image.length > 50
-          image = image[0..10] << '...' << image[-35..-1]
-        end
+        running = service['instances']['running']
+        desired = service['container_count']
+        instances = "#{running} / #{desired}"
+        ports = service['ports'].map{|p|
+          "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
+        }.join(", ")
         vars = [
           service['name'],
-          image,
-          service['container_count'],
+          instances,
           stateful,
-          service['state']
+          service['state'],
+          ports
         ]
-        puts "%-30.30s %-50.50s %-10.10s %-8s %-10s" % vars
+        puts "%-60.60s %-10.10s %-8s %-10s %-50s" % vars
       end
     end
   end

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

@@ -3,12 +3,15 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class LogsCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"
-    option ["-f", "--follow"], :flag, "Follow (tail) logs", default: false
+    option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
+    option ["-l", "--lines"], "LINES", "How many lines to show", default: '100'
+    option "--since", "SINCE", "Show logs since given timestamp"
     option ["-s", "--search"], "SEARCH", "Search from logs"
-    option ["-c", "--container"], "CONTAINER", "Show only specified container logs"
+    option ["-i", "--instance"], "INSTANCE", "Show only given instance specific logs"
 
     def execute
       require_api_url
@@ -16,17 +19,22 @@ module Kontena::Cli::Services
       last_id = nil
       loop do
         query_params = []
+        query_params << "limit=#{lines}"
         query_params << "from=#{last_id}" unless last_id.nil?
+        query_params << "since=#{since}" if !since.nil? && last_id.nil?
         query_params << "search=#{search}" if search
-        query_params << "container=#{container}" if container
+        query_params << "container=#{name}-#{instance}" if instance
 
         result = client(token).get("services/#{current_grid}/#{name}/container_logs?#{query_params.join('&')}")
         result['logs'].each do |log|
           color = color_for_container(log['name'])
-          puts "#{log['name'].colorize(color)} | #{log['data']}"
+          instance_number = log['name'].match(/^.+-(\d+)$/)[1]
+          name = instance_number.nil? ? log['name'] : instance_number
+          prefix = "#{log['created_at']} [#{name}]:".colorize(color)
+          puts "#{prefix} #{log['data']}"
           last_id = log['id']
         end
-        break unless follow?
+        break unless tail?
         sleep(2)
       end
     end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class MonitorCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -0,0 +1,17 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class RemoveCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      result = client(token).delete("services/#{parse_service_id(name)}")
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class RemoveEnvCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -0,0 +1,28 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class RemoveSecretCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    parameter "SECRET", "Secret to be removed (format: secret:name:type)"
+
+    def execute
+      require_api_url
+      token = require_token
+      result = client(token).get("services/#{parse_service_id(name)}")
+      secrets = result['secrets']
+      remove_secret = parse_secrets([secret])[0]
+      if secrets.delete_if{|s| s['name'] == remove_secret[:name] && s['secret'] == remove_secret[:secret]}
+        data = {
+          secrets: secrets
+        }
+        client(token).put("services/#{parse_service_id(name)}", data)
+      else
+        abort("Secret not found")
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class RestartCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -3,13 +3,14 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class ScaleCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"
     parameter "INSTANCES", "Scales service to given number of instances"
 
     def execute
-      token = require_token      
+      token = require_token
       scale_service(token, name, instances)
     end
   end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class ShowCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class StartCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -3,21 +3,22 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class StatsCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"
-    option ["-f", "--follow"], :flag, "Follow stats in real time", default: false
+    option ["-t", "--tail"], :flag, "Tail (follow) stats in real time", default: false
 
     def execute
       require_api_url
       token = require_token
-      if follow?
+      if tail?
         system('clear')
         render_header
       end
       loop do
-        fetch_stats(token, name, follow?)
-        break unless follow?
+        fetch_stats(token, name, tail?)
+        break unless tail?
         sleep(2)
       end
     end