kontena-cli 0.12.3 → 0.13.0

data/lib/kontena/cli/grids/{remove_user_command.rb → users/remove_command.rb}

@@ -1,10 +1,10 @@
-require_relative 'common'
+require_relative '../common'
 
-module Kontena::Cli::Grids
-  class RemoveUserCommand < Clamp::Command
+module Kontena::Cli::Grids::Users
+  class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include Common
+    include Kontena::Cli::Grids::Common
 
     parameter "EMAIL", "Email address"
 

data/lib/kontena/cli/login_command.rb

@@ -24,7 +24,7 @@ class Kontena::Cli::LoginCommand < Clamp::Command
     response = do_login(email, password)
 
     if response
-      update_master_info(name, url, response['access_token'])
+      update_master_info(name, url, response['access_token'], email)
       display_logo
       puts ''
       puts "Logged in as #{response['user']['name'].green}"
@@ -97,12 +97,13 @@ class Kontena::Cli::LoginCommand < Clamp::Command
   # @param [String] url
   # @param [String] token
   #
-  def update_master_info(name, url, token)
+  def update_master_info(name, url, token, email)
     name = name || 'default'
     master = {
         'name' => name,
         'url' => url,
-        'token' => token
+        'token' => token,
+        'email' => email
     }
 
     self.add_master(name, master)

data/lib/kontena/cli/master/aws/create_command.rb

@@ -16,6 +16,7 @@ module Kontena::Cli::Master::Aws
     option "--storage", "STORAGE", "Storage size (GiB)", default: '30'
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (default: generate random secret)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (default: generate random iv)"
+    option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url (optional)"
 
@@ -34,7 +35,8 @@ module Kontena::Cli::Master::Aws
           key_pair: key_pair,
           auth_server: auth_provider_url,
           vault_secret: vault_secret || SecureRandom.hex(24),
-          vault_iv: vault_iv || SecureRandom.hex(24)
+          vault_iv: vault_iv || SecureRandom.hex(24),
+          mongodb_uri: mongodb_uri
       )
     end
   end

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

@@ -0,0 +1,17 @@
+module Kontena::Cli::Master
+  class CurrentCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    option ["--name"], :flag, "Show name only", default: false
+
+    def execute
+      master = current_master
+
+      if name?
+        puts master['name']
+      else
+        puts "#{master['name']} #{master['url']}"
+      end
+    end
+  end
+end

data/lib/kontena/cli/master/digital_ocean/create_command.rb

@@ -9,8 +9,9 @@ module Kontena::Cli::Master::DigitalOcean
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
     option "--size", "SIZE", "Droplet size", default: '1gb'
     option "--region", "REGION", "Region", default: 'ams2'
-    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
-    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
+    option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
+    option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
+    option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
 
@@ -28,7 +29,8 @@ module Kontena::Cli::Master::DigitalOcean
           version: version,
           auth_server: auth_provider_url,
           vault_secret: vault_secret || SecureRandom.hex(24),
-          vault_iv: vault_iv || SecureRandom.hex(24)
+          vault_iv: vault_iv || SecureRandom.hex(24),
+          mongodb_uri: mongodb_uri
       )
     end
 

data/lib/kontena/cli/master/users/role_command.rb

@@ -0,0 +1,10 @@
+module Kontena::Cli::Master::Users
+
+  require_relative 'roles/add_command'
+  require_relative 'roles/remove_command'
+
+  class RoleCommand < Clamp::Command
+    subcommand "add", "Add role to user", Roles::AddCommand
+    subcommand ["remove", "rm"], "Remove role from user", Roles::RemoveCommand
+  end
+end

data/lib/kontena/cli/master/users/{add_role_command.rb → roles/add_command.rb}

@@ -1,7 +1,7 @@
-require_relative '../../common'
+require_relative '../../../common'
 
-module Kontena::Cli::Master::Users
-  class AddRoleCommand < Clamp::Command
+module Kontena::Cli::Master::Users::Roles
+  class AddCommand < Clamp::Command
     include Kontena::Cli::Common
 
     parameter "ROLE", "Role name"
@@ -23,4 +23,4 @@ module Kontena::Cli::Master::Users
       end
     end
   end
-end
+end

data/lib/kontena/cli/master/users/{remove_role_command.rb → roles/remove_command.rb}

@@ -1,7 +1,7 @@
-require_relative '../../common'
+require_relative '../../../common'
 
-module Kontena::Cli::Master::Users
-  class RemoveRoleCommand < Clamp::Command
+module Kontena::Cli::Master::Users::Roles
+  class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
 
     parameter "ROLE", "Role name"
@@ -23,4 +23,4 @@ module Kontena::Cli::Master::Users
       end
     end
   end
-end
+end

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

@@ -3,14 +3,12 @@ module Kontena::Cli::Master
   require_relative 'users/invite_command'
   require_relative 'users/remove_command'
   require_relative 'users/list_command'
-  require_relative 'users/add_role_command'
-  require_relative 'users/remove_role_command'
+  require_relative 'users/role_command'
 
   class UsersCommand < Clamp::Command
     subcommand "invite", "Invite user to Kontena Master", Users::InviteCommand
     subcommand ["remove", "rm"], "Remove user from Kontena Master", Users::RemoveCommand
     subcommand ["list", "ls"], "List users", Users::ListCommand
-    subcommand "add-role", "Add role to user", Users::AddRoleCommand
-    subcommand "remove-role", "Remove role from user", Users::RemoveRoleCommand
+    subcommand "role", "User role specific commands", Users::RoleCommand
   end
 end

data/lib/kontena/cli/master_command.rb

@@ -5,6 +5,7 @@ require_relative 'master/azure_command'
 require_relative 'master/use_command'
 require_relative 'master/list_command'
 require_relative 'master/users_command'
+require_relative 'master/current_command'
 
 class Kontena::Cli::MasterCommand < Clamp::Command
 
@@ -15,6 +16,7 @@ class Kontena::Cli::MasterCommand < Clamp::Command
   subcommand ["list", "ls"], "List masters where client has logged in", Kontena::Cli::Master::ListCommand
   subcommand "use", "Switch to use selected master", Kontena::Cli::Master::UseCommand
   subcommand "users", "Users specific commands", Kontena::Cli::Master::UsersCommand
+  subcommand "current", "Show current master details", Kontena::Cli::Master::CurrentCommand
   def execute
   end
 end

data/lib/kontena/cli/node_command.rb

@@ -4,8 +4,7 @@ require_relative 'nodes/show_command'
 require_relative 'nodes/update_command'
 require_relative 'nodes/ssh_command'
 
-require_relative 'nodes/add_label_command'
-require_relative 'nodes/remove_label_command'
+require_relative 'nodes/label_command'
 
 require_relative 'nodes/vagrant_command'
 require_relative 'nodes/digital_ocean_command'
@@ -20,8 +19,7 @@ class Kontena::Cli::NodeCommand < Clamp::Command
   subcommand "update", "Update node", Kontena::Cli::Nodes::UpdateCommand
   subcommand ["remove","rm"], "Remove node", Kontena::Cli::Nodes::RemoveCommand
 
-  subcommand "add-label", "Add label to node", Kontena::Cli::Nodes::AddLabelCommand
-  subcommand "remove-label", "Remove label from node", Kontena::Cli::Nodes::RemoveLabelCommand
+  subcommand "label", "Node label specific commands", Kontena::Cli::Nodes::LabelCommand
 
   subcommand "vagrant", "Vagrant specific commands", Kontena::Cli::Nodes::VagrantCommand
   subcommand "digitalocean", "DigitalOcean specific commands", Kontena::Cli::Nodes::DigitalOceanCommand

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

@@ -0,0 +1,14 @@
+module Kontena::Cli::Nodes
+
+  require_relative 'labels/add_command'
+  require_relative 'labels/remove_command'
+
+  class LabelCommand < Clamp::Command
+
+    subcommand "add", "Add label to node", Labels::AddCommand
+    subcommand ["remove", "rm"], "Remove label from node", Labels::RemoveCommand
+
+    def execute
+    end
+  end
+end

data/lib/kontena/cli/nodes/{add_label_command.rb → labels/add_command.rb}

@@ -1,5 +1,5 @@
-module Kontena::Cli::Nodes
-  class AddLabelCommand < Clamp::Command
+module Kontena::Cli::Nodes::Labels
+  class AddCommand < Clamp::Command
     include Kontena::Cli::Common
 
     parameter "NODE_ID", "Node id"

data/lib/kontena/cli/nodes/{remove_label_command.rb → labels/remove_command.rb}

@@ -1,5 +1,5 @@
-module Kontena::Cli::Nodes
-  class RemoveLabelCommand < Clamp::Command
+module Kontena::Cli::Nodes::Labels
+  class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
 
     parameter "NODE_ID", "Node id"

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

@@ -32,7 +32,8 @@ module Kontena::Cli::Nodes
       else
         nodes = client(token).get("grids/#{current_grid}/nodes")
         puts "%-70s %-10s %-40s" % ['Name', 'Status', 'Labels']
-        nodes['nodes'].each do |node|
+        nodes = nodes['nodes'].sort_by{|n| n['node_number'] }
+        nodes.each do |node|
           if node['connected']
             status = 'online'
           else

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

@@ -2,6 +2,7 @@ module Kontena::Cli::Nodes
   class ShowCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::BytesHelper
 
     parameter "NODE_ID", "Node id"
 
@@ -22,12 +23,28 @@ module Kontena::Cli::Nodes
       puts "  os: #{node['os']}"
       puts "  driver: #{node['driver']}"
       puts "  kernel: #{node['kernel_version']}"
-      puts "  cpus: #{node['cpus']}"
-      puts "  memory: #{node['mem_total'] / 1024 / 1024}M"
       puts "  labels:"
       if node['labels']
         node['labels'].each{|l| puts "    - #{l}"}
       end
+      puts "  stats:"
+      puts "    cpus: #{node['cpus']}"
+      loads = node.dig('resource_usage', 'load')
+      if loads
+        puts "    load: #{loads['1m'].round(2)} #{loads['5m'].round(2)} #{loads['15m'].round(2)}"
+      end
+      mem = node.dig('resource_usage', 'memory')
+      if mem
+        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']
+        puts "    filesystem:"
+        node['resource_usage']['filesystem'].each do |filesystem|
+          puts "      - #{filesystem['name']}: #{to_gigabytes(filesystem['used'], 2)} of #{to_gigabytes(filesystem['total'], 2)} GB"
+        end
+      end
     end
+
   end
 end

data/lib/kontena/cli/registry_command.rb

@@ -6,7 +6,6 @@ class Kontena::Cli::RegistryCommand < Clamp::Command
 
   subcommand "create", "Create Docker image registry service", Kontena::Cli::Registry::CreateCommand
   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

@@ -14,12 +14,8 @@ 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/add_secret_command'
-require_relative 'services/remove_secret_command'
+require_relative 'services/env_command'
+require_relative 'services/secret_command'
 
 require_relative 'services/link_command'
 require_relative 'services/unlink_command'
@@ -42,12 +38,9 @@ class Kontena::Cli::ServiceCommand < Clamp::Command
   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 "env", "Environment variable specific commands", Kontena::Cli::Services::EnvCommand
 
-  subcommand "add-secret", "Add secret from Vault", Kontena::Cli::Services::AddSecretCommand
-  subcommand "remove-secret", "Remove secret", Kontena::Cli::Services::RemoveSecretCommand
+  subcommand "secret", "Secret specific commands", Kontena::Cli::Services::SecretCommand
 
   subcommand "link", "Link service to another service", Kontena::Cli::Services::LinkCommand
   subcommand "unlink", "Unlink service from another service", Kontena::Cli::Services::UnlinkCommand

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

@@ -31,6 +31,7 @@ module Kontena::Cli::Services
     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 "--deploy-interval", "TIME", "Auto-deploy with given interval (format: <number><unit>, where unit = min, h, d)"
     option "--pid", "PID", "Pid namespace to use"
     option "--secret", "SECRET", "Import secret from Vault (format: <secret>:<name>:<env>)", multivalued: true
 
@@ -73,8 +74,15 @@ module Kontena::Cli::Services
       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
+      if deploy_min_health
+        data[:deploy_opts][:min_health] = deploy_min_health.to_f
+      end
+      if deploy_wait_for_port
+        data[:deploy_opts][:wait_for_port] = deploy_wait_for_port.to_i
+      end
+      if deploy_interval
+        data[:deploy_opts][:interval] = parse_relative_time(deploy_interval)
+      end
       data[:pid] = pid if pid
       data
     end

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

@@ -0,0 +1,12 @@
+module Kontena::Cli::Services
+
+  require_relative 'envs/add_command'
+  require_relative 'envs/list_command'
+  require_relative 'envs/remove_command'
+
+  class EnvCommand < Clamp::Command
+    subcommand ["list", "ls"], "List service environment variables", Envs::ListCommand
+    subcommand "add", "Add environment variable", Envs::AddCommand
+    subcommand ["remove", "rm"], "Remove environment variable", Envs::RemoveCommand
+  end
+end

data/lib/kontena/cli/services/{add_env_command.rb → envs/add_command.rb}

@@ -1,10 +1,10 @@
-require_relative 'services_helper'
+require_relative '../services_helper'
 
-module Kontena::Cli::Services
-  class AddEnvCommand < Clamp::Command
+module Kontena::Cli::Services::Envs
+  class AddCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include ServicesHelper
+    include Kontena::Cli::Services::ServicesHelper
 
     parameter "NAME", "Service name"
     parameter "ENV", "Environment variable"

data/lib/kontena/cli/services/{envs_command.rb → envs/list_command.rb}

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

data/lib/kontena/cli/services/{remove_env_command.rb → envs/remove_command.rb}

@@ -1,10 +1,10 @@
-require_relative 'services_helper'
+require_relative '../services_helper'
 
-module Kontena::Cli::Services
-  class RemoveEnvCommand < Clamp::Command
+module Kontena::Cli::Services::Envs
+  class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include ServicesHelper
+    include Kontena::Cli::Services::ServicesHelper
 
     parameter "NAME", "Service name"
     parameter "ENV", "Environment variable name"

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

@@ -11,9 +11,10 @@ module Kontena::Cli::Services
       token = require_token
 
       grids = client(token).get("grids/#{current_grid}/services")
+      services = grids['services'].sort_by{|s| s['updated_at'] }.reverse
       titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'EXPOSED PORTS']
-      puts "%-60.60s %-10s %-8s %-10s %-50s" % titles
-      grids['services'].each do |service|
+      puts "%-60s %-10s %-8s %-10s %-50s" % titles
+      services.each do |service|
         stateful = service['stateful'] ? 'yes' : 'no'
         running = service['instances']['running']
         desired = service['container_count']

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

@@ -10,7 +10,6 @@ module Kontena::Cli::Services
     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 ["-i", "--instance"], "INSTANCE", "Show only given instance specific logs"
 
     def execute
@@ -22,7 +21,6 @@ module Kontena::Cli::Services
         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=#{name}-#{instance}" if instance
 
         result = client(token).get("services/#{current_grid}/#{name}/container_logs?#{query_params.join('&')}")