kontena-cli 1.1.6 → 1.2.0.dev1

data/lib/kontena/cli/subcommand_loader.rb

@@ -0,0 +1,82 @@
+module Kontena::Cli
+  class SubcommandLoader
+    attr_reader :path
+
+    # Create a subcommand loader instance
+    #
+    # @param [String] path path to command definition
+    def initialize(path)
+      @path = path
+    end
+
+    # Takes something like /foo/bar/cli/master/foo_coimmand and returns [:Master, :FooCommand]
+    #
+    # @param path [String]
+    # @return [Array<Symbol>]
+    def symbolize_path(path)
+      path.gsub(/.*\/cli\//, '').split('/').map do |path_part|
+        path_part.split('_').map{ |e| e.capitalize }.join
+      end.map(&:to_sym)
+    end
+
+    # Takes an array such as [:Foo] or [:Cli, :Foo] and returns [:Kontena, :Cli, :Foo]
+    def prepend_kontena_cli(tree)
+      [:Kontena, :Cli] + (tree - [:Cli])
+    end
+
+    # Takes an array such as [:Master, :FooCommand] and returns Master::FooCommand
+    #
+    # @param tree [Array<Symbol]
+    # @return [Class]
+    def const_get_tree(tree)
+      if tree.size == 1
+        Object.const_get(tree.first)
+      else
+        tree[1..-1].inject(Object.const_get(tree.first)) { |new_base, part| new_base.const_get(part) }
+      end
+    rescue
+      raise ArgumentError, "Can't figure out command class name from path #{path} - tried #{tree}"
+    end
+
+    # Tries to require a file, returns false instead of raising LoadError unless succesful
+    #
+    # @param path [String]
+    # @return [TrueClass,FalseClass]
+    def safe_require(path)
+      require path
+      true
+    rescue LoadError
+      false
+    end
+
+    def klass
+      return @subcommand_class if @subcommand_class
+      unless safe_require(path) || safe_require(Kontena.cli_root(path))
+        raise ArgumentError, "Can't load #{path} or #{Kontena.cli_root(path)}"
+      end
+      @subcommand_class = const_get_tree(prepend_kontena_cli(symbolize_path(path)))
+    end
+
+    def new(*args)
+      klass.new(*args)
+    end
+
+    def method_missing(meth, *args)
+      klass.send(meth, *args)
+    end
+
+    def respond_to_missing?(meth)
+      klass.respond_to?(meth)
+    end
+
+    def const_get(const)
+      klass.const_get(const)
+    end
+
+    def const_defined?(const)
+      klass.const_defined?(const)
+    end
+
+    alias_method :class, :klass
+  end
+end

data/lib/kontena/cli/vault_command.rb

@@ -1,20 +1,12 @@
-require_relative 'vault/export_command'
-require_relative 'vault/import_command'
-require_relative 'vault/list_command'
-require_relative 'vault/read_command'
-require_relative 'vault/remove_command'
-require_relative 'vault/update_command'
-require_relative 'vault/write_command'
-
 class Kontena::Cli::VaultCommand < Kontena::Command
 
-  subcommand ["list", "ls"], "List secrets", Kontena::Cli::Vault::ListCommand
-  subcommand "write", "Write a secret", Kontena::Cli::Vault::WriteCommand
-  subcommand "read", "Read secret", Kontena::Cli::Vault::ReadCommand
-  subcommand "update", "Update secret", Kontena::Cli::Vault::UpdateCommand
-  subcommand ["remove", "rm"], "Remove secret", Kontena::Cli::Vault::RemoveCommand
-  subcommand "export", "Export secrets to STDOUT", Kontena::Cli::Vault::ExportCommand
-  subcommand "import", "Import secrets from a file or STDIN", Kontena::Cli::Vault::ImportCommand
+  subcommand ["list", "ls"], "List secrets", load_subcommand('vault/list_command')
+  subcommand "write", "Write a secret", load_subcommand('vault/write_command')
+  subcommand "read", "Read secret", load_subcommand('vault/read_command')
+  subcommand "update", "Update secret", load_subcommand('vault/update_command')
+  subcommand ["remove", "rm"], "Remove secret", load_subcommand('vault/remove_command')
+  subcommand "export", "Export secrets to STDOUT", load_subcommand('vault/export_command')
+  subcommand "import", "Import secrets from a file or STDIN", load_subcommand('vault/import_command')
 
   def execute
   end

data/lib/kontena/cli/version.rb

@@ -1,5 +1,10 @@
 module Kontena
   module Cli
-    VERSION = File.read(File.realpath(File.join(__dir__, '../../../VERSION'))).strip unless const_defined?(:VERSION)
+    unless const_defined?(:VERSION)
+      require 'pathname'
+      version_file = Pathname.new(__FILE__).dirname.join('../../../VERSION').realpath
+      is_head = ENV["KONTENA_EXTRA_BUILDTAGS"].to_s.include?('head')
+      VERSION = "#{version_file.read.strip}#{"-head" if is_head}"
+    end
   end
 end

data/lib/kontena/cli/vpn_command.rb

@@ -1,12 +1,8 @@
-require_relative 'vpn/create_command'
-require_relative 'vpn/config_command'
-require_relative 'vpn/remove_command'
-
 class Kontena::Cli::VpnCommand < Kontena::Command
 
-  subcommand "create", "Create VPN service", Kontena::Cli::Vpn::CreateCommand
-  subcommand "config", "Show/Export VPN config", Kontena::Cli::Vpn::ConfigCommand
-  subcommand ["remove", "rm"], "Remove VPN service", Kontena::Cli::Vpn::RemoveCommand
+  subcommand "create", "Create VPN service", load_subcommand('vpn/create_command')
+  subcommand "config", "Show/Export VPN config", load_subcommand('vpn/config_command')
+  subcommand ["remove", "rm"], "Remove VPN service", load_subcommand('vpn/remove_command')
 
   def execute
   end

data/lib/kontena/command.rb

@@ -1,4 +1,5 @@
 require 'clamp'
+require_relative 'cli/subcommand_loader'
 
 class Kontena::Command < Clamp::Command
 
@@ -62,6 +63,10 @@ class Kontena::Command < Clamp::Command
     end
   end
 
+  def self.load_subcommand(path)
+    Kontena::Cli::SubcommandLoader.new(path)
+  end
+
   def self.inherited(where)
     where.extend Finalizer
   end
@@ -197,8 +202,30 @@ class Kontena::Command < Clamp::Command
     run_callbacks :after unless help_requested?
     exit(@exit_code) if @exit_code.to_i > 0
     @result
+  rescue Excon::Errors::SocketError => exc
+    if exc.message.include?('Unable to verify certificate')
+      $stderr.puts " [#{Kontena.pastel.red('error')}] The server uses a certificate signed by an unknown authority."
+      $stderr.puts "         You can trust this server by copying server CA pem file to: #{Kontena.pastel.yellow("~/.kontena/certs/<hostname>.pem")}"
+      $stderr.puts "         Protip: you can bypass the certificate check by setting #{Kontena.pastel.yellow('SSL_IGNORE_ERRORS=true')} env variable, but any data you send to the server could be intercepted by others."
+      abort
+    else
+      abort(exc.message)
+    end
+  rescue Kontena::Errors::StandardError => exc
+    raise exc if ENV['DEBUG']
+    puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
+    abort
+  rescue Errno::EPIPE
+    # If user is piping the command outputs to some other command that might exit before CLI has outputted everything
+    abort
+  rescue Clamp::HelpWanted, Clamp::UsageError
+    raise
+  rescue => exc
+    raise exc if ENV['DEBUG']
+    $stderr.puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
+    $stderr.puts "         Rerun the command with environment DEBUG=true set to get the full exception"
+    abort
   end
-
 end
 
 require_relative 'callback'

data/lib/kontena/machine/cloud_config/cloudinit.yml

@@ -11,7 +11,7 @@ write_files:
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
-        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/16" --bip="<%= docker_bip %>"'
+        Environment='DOCKER_OPTS=--insecure-registry="<%= grid_subnet %>" --bip="<%= docker_bip %>"'
   - path: /etc/sysctl.d/99-inotify.conf
     owner: root
     permissions: 0644

data/lib/kontena/main_command.rb

@@ -5,53 +5,37 @@ require_relative 'command'
 require_relative 'callback'
 require_relative 'cli/bytes_helper'
 require_relative 'cli/grid_options'
-require_relative 'cli/app_command'
-require_relative 'cli/logout_command'
-require_relative 'cli/whoami_command'
-require_relative 'cli/container_command'
-require_relative 'cli/grid_command'
-require_relative 'cli/master_command'
-require_relative 'cli/node_command'
-require_relative 'cli/service_command'
-require_relative 'cli/vpn_command'
-require_relative 'cli/registry_command'
-require_relative 'cli/external_registry_command'
-require_relative 'cli/app_command'
-require_relative 'cli/etcd_command'
-require_relative 'cli/vault_command'
-require_relative 'cli/plugin_command'
-require_relative 'cli/version_command'
-require_relative 'cli/stack_command'
-require_relative 'cli/certificate_command'
-require_relative 'cli/cloud_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(' ')
+    build_tags = [ 'ruby' + RUBY_VERSION ]
+    build_tags << RUBY_PLATFORM
+    build_tags += ENV["KONTENA_EXTRA_BUILDTAGS"].to_s.split(',')
+    puts ['kontena-cli', Kontena::Cli::VERSION, "[#{build_tags.join('+')}]"].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
-  subcommand "app", "App specific commands", Kontena::Cli::AppCommand
-  subcommand "stack", "Stack specific commands", Kontena::Cli::StackCommand
-  subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
-  subcommand "vault", "Vault specific commands", Kontena::Cli::VaultCommand
-  subcommand "certificate", "LE Certificate specific commands", Kontena::Cli::CertificateCommand
-  subcommand "node", "Node specific commands", Kontena::Cli::NodeCommand
-  subcommand "master", "Master specific commands", Kontena::Cli::MasterCommand
-  subcommand "vpn", "VPN specific commands", Kontena::Cli::VpnCommand
-  subcommand "registry", "Registry specific commands", Kontena::Cli::RegistryCommand
-  subcommand "container", "Container specific commands", Kontena::Cli::ContainerCommand
-  subcommand "etcd", "Etcd specific commands", Kontena::Cli::EtcdCommand
-  subcommand "external-registry", "External registry specific commands", Kontena::Cli::ExternalRegistryCommand
-  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 "cloud", "Kontena Cloud specific commands", load_subcommand('cloud_command')
+  subcommand "logout", "Logout from Kontena Masters or Kontena Cloud accounts", load_subcommand('logout_command')
+  subcommand "grid", "Grid specific commands", load_subcommand('grid_command')
+  subcommand "app", "App specific commands", load_subcommand('app_command')
+  subcommand "stack", "Stack specific commands", load_subcommand('stack_command')
+  subcommand "service", "Service specific commands", load_subcommand('service_command')
+  subcommand "vault", "Vault specific commands", load_subcommand('vault_command')
+  subcommand "certificate", "LE Certificate specific commands", load_subcommand('certificate_command')
+  subcommand "node", "Node specific commands", load_subcommand('node_command')
+  subcommand "master", "Master specific commands", load_subcommand('master_command')
+  subcommand "vpn", "VPN specific commands", load_subcommand('vpn_command')
+  subcommand "registry", "Registry specific commands", load_subcommand('registry_command')
+  subcommand "container", "Container specific commands", load_subcommand('container_command')
+  subcommand "etcd", "Etcd specific commands", load_subcommand('etcd_command')
+  subcommand "external-registry", "External registry specific commands", load_subcommand('external_registry_command')
+  subcommand "whoami", "Shows current logged in user", load_subcommand('whoami_command')
+  subcommand "plugin", "Plugin related commands", load_subcommand('plugin_command')
+  subcommand "version", "Show CLI and current master version", load_subcommand('version_command')
 
   def execute
   end

data/lib/kontena/scripts/completer

@@ -3,238 +3,7 @@
 
 # resolve bin path, ignoring symlinks
 require 'pathname'
-require 'yaml'
 bin_file = Pathname.new(__FILE__).realpath
+$:.unshift File.expand_path('../../..', bin_file)
 
-# add self to libpath
-$:.unshift File.expand_path('../../lib', bin_file)
-
-require_relative '../client'
-require_relative '../cli/common'
-
-class Helper
-  include Kontena::Cli::Common
-
-  def client
-    token = require_token
-    super(token)
-  end
-
-  def grids
-    client.get("grids")['grids'].map{|grid| grid['id']}
-  rescue
-    []
-  end
-
-  def nodes
-    client.get("grids/#{current_grid}/nodes")['nodes'].map{|node| node['name']}
-  rescue
-    []
-  end
-
-  def stacks
-    stacks = client.get("grids/#{current_grid}/stacks")['stacks']
-    results = []
-    results.push stacks.map{|s| s['name']}
-    results.delete('null')
-    results
-  rescue
-    []
-  end
-
-  def services
-    services = client.get("grids/#{current_grid}/services")['services']
-    results = []
-    results.push services.map{ |s|
-      stack = s['stack']['id'].split('/').last
-      if stack != 'null'
-        "#{stack}/#{s['name']}"
-      else
-        s['name']
-      end
-    }
-    results
-  rescue
-    []
-  end
-
-  def containers
-    results = []
-    client.get("grids/#{current_grid}/services")['services'].each do |service|
-      containers = client.get("services/#{service['id']}/containers")['containers']
-      results.push(containers.map{|c| c['name'] })
-      results.push(containers.map{|c| c['id'] })
-    end
-    results
-  rescue
-    []
-  end
-
-  def yml_services
-    if File.exist?('kontena.yml')
-      yaml = YAML.safe_load(File.read('kontena.yml'))
-      services = yaml['services']
-      services.keys
-    end
-  rescue
-    []
-  end
-
-  def yml_files
-    Dir["./*.yml"].map{|file| file.sub('./', '')}
-  rescue
-    []
-  end
-
-  def master_names
-    config_file = File.expand_path('~/.kontena_client.json')
-    if(File.exist?(config_file))
-      config = JSON.parse(File.read(config_file))
-      return config['servers'].map{|s| s['name']}
-    end
-  rescue
-    []
-  end
-
-end
-
-helper = Helper.new
-
-words = ARGV
-words.delete_at(0)
-
-completion = []
-completion.push %w(cloud logout grid app service stack vault certificate node master vpn registry container etcd external-registry whoami plugin version) if words.size < 2
-if words.size > 0
-  case words[0]
-    when 'plugin'
-      completion.clear
-      sub_commands = %w(list ls search install uninstall)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'etcd'
-      completion.clear
-      sub_commands = %w(get set mkdir mk list ls rm)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'registry'
-      completion.clear
-      sub_commands = %w(create remove rm)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'grid'
-      completion.clear
-      sub_commands = %w(add-user audit-log create current list user remove show use)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.grids
-      else
-        completion.push sub_commands
-      end
-    when 'node'
-      completion.clear
-      sub_commands = %w(list show remove)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.nodes
-      else
-        completion.push sub_commands
-      end
-    when 'master'
-      completion.clear
-      sub_commands = %w(list use users current remove rm config cfg login logout token join audit-log init-cloud)
-      if words[1] && words[1] == 'use'
-        completion.push helper.master_names
-      elsif words[1] && words[1] == 'users'
-        users_sub_commands = %(invite list role)
-        completion.push users_sub_commands
-      elsif words[1] && ['config', 'cfg'].include?(words[1])
-        config_sub_commands = %(set get dump load import export unset)
-        completion.push config_sub_commands
-      elsif words[1] && words[1] == 'token'
-        token_sub_commands = %(list ls rm remove show current create)
-        completion.push token_sub_commands
-      elsif words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'cloud'
-      completion.clear
-      sub_commands = %w(login logout master)
-      if words[1] && words[1] == 'master'
-        cloud_master_sub_commands = %(list ls remove rm add show update)
-        completion.push cloud_master_sub_commands
-      elsif words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'service'
-      completion.clear
-      sub_commands = %w(containers create delete deploy list logs restart
-                      scale show start stats stop update monitor env
-                      secret link unlink)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.services
-      else
-        completion.push sub_commands
-      end
-    when 'container'
-      completion.clear
-      sub_commands = %w(exec inspect logs)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.containers
-      else
-        completion.push sub_commands
-      end
-    when 'vpn'
-      completion.clear
-      completion.push %w(config create delete)
-    when 'external-registry'
-      completion.clear
-      completion.push %w(add list delete)
-    when 'app'
-      completion.clear
-      sub_commands = %w(init build config deploy start stop remove rm ps list
-                        logs monitor show)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.yml_services
-      else
-        completion.push sub_commands
-      end
-    when 'stack'
-      completion.clear
-      sub_commands = %w(build install upgrade deploy start stop remove rm ls list
-                        logs monitor show registry)
-      if words[1]
-        if words[1] == 'registry'
-          registry_sub_commands = %(push pull search show rm)
-          completion.push registry_sub_commands
-        elsif %w(install).include?(words[1])
-            completion.push helper.yml_files
-        elsif words[1] == 'upgrade' && words[3]
-          completion.push helper.yml_files
-        else
-          completion.push(sub_commands) unless sub_commands.include?(words[1])
-          completion.push helper.stacks
-        end
-      else
-        completion.push sub_commands
-      end
-  end
-end
-
-puts completion
+require 'kontena/scripts/completer'