kontena-cli 0.14.7 → 0.15.0.rc1

data/lib/kontena/cli/apps/yaml/validator.rb

@@ -4,11 +4,11 @@ module Kontena::Cli::Apps
     class Validator
       require_relative 'validations'
       include Validations
-      
+
       VALID_KEYS = %w(
       affinity build dockerfile cap_add cap_drop command deploy env_file environment extends external_links
       image links log_driver log_opt net pid ports volumes volumes_from cpu_shares
-      mem_limit memswap_limit privileged stateful user instances hooks secrets
+      mem_limit memswap_limit privileged stateful user instances hooks secrets health_check
       ).freeze
 
       UNSUPPORTED_KEYS = %w(
@@ -24,12 +24,12 @@ module Kontena::Cli::Apps
         base = self
         @yaml_schema = Dry::Validation.Schema do
           base.append_common_validations(self)
-          optional('build').maybe(:str?)
-          optional('dockerfile') { str? }
-          optional('net') { inclusion?(%w(host bridge)) }
-          optional('log_driver') { str? }
-          optional('log_opts') { type?(Hash) }
 
+          optional('build').value(:str?)
+          optional('dockerfile').value(:str?)
+          optional('net').value(included_in?: (%w(host bridge)))
+          optional('log_driver').value(:str?)
+          optional('log_opts').value(type?: Hash)
         end
       end
 

data/lib/kontena/cli/apps/yaml/validator_v2.rb

@@ -10,7 +10,7 @@ module Kontena::Cli::Apps
       VALID_KEYS = %w(
       affinity build cap_add cap_drop command deploy depends_on env_file environment extends external_links
       image links logging network_mode pid ports volumes volumes_from cpu_shares
-      mem_limit memswap_limit privileged stateful user instances hooks secrets
+      mem_limit memswap_limit privileged stateful user instances hooks secrets health_check
       ).freeze
 
       UNSUPPORTED_KEYS = %w(
@@ -30,14 +30,15 @@ module Kontena::Cli::Apps
 
           rule(build_hash: ['build']) do |build|
             build.type?(Hash) > build.schema do
-              key('context').required
-              optional('dockerfile') { str? }
+              required('context').filled
+              optional('dockerfile').value(:str?)
+              optional('args') { array? | type?(Hash) }
             end
           end
-          optional('depends_on') { array? }
-          optional('network_mode') { inclusion?(%w(host bridge)) }
+          optional('depends_on').value(:array?)
+          optional('network_mode').value(included_in?: (%w(host bridge)))
           optional('logging').schema do
-            optional('driver') { str? }
+            optional('driver').value(:str?)
             optional('options') { type?(Hash) }
           end
         end

data/lib/kontena/cli/certificate/authorize_command.rb

@@ -0,0 +1,23 @@
+
+module Kontena::Cli::Certificate
+  class AuthorizeCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+
+    parameter "DOMAIN", "Domain to authorize"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      data = {domain: domain}
+      response = client(token).post("certificates/#{current_grid}/authorize", data)
+      puts "Authorization successfully created. Use the following details to create necessary validations:"
+      puts "Record name:#{response['record_name']}"
+      puts "Record type:#{response['record_type']}"
+      puts "Record content:#{response['record_content']}"
+
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+
+module Kontena::Cli::Certificate
+  class GetCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+
+    option '--secret-name', 'SECRET_NAME', 'The name for the secret to store the certificate in'
+    parameter "DOMAIN ...", "Domain(s) to get certificate for"
+
+
+    def execute
+      require_api_url
+      token = require_token
+      secret = secret_name || "LE_CERTIFICATE_#{domain_list[0].gsub('.', '_')}"
+      data = {domains: domain_list, secret_name: secret}
+      response = client(token).post("certificates/#{current_grid}/certificate", data)
+      puts "Certificate successfully received and stored into vault with keys:"
+      response.each do |secret|
+        puts secret.colorize(:green)
+      end
+      puts "Use the #{secret}_BUNDLE with Kontena loadbalancer!"
+    end
+  end
+end

data/lib/kontena/cli/certificate/register_command.rb

@@ -0,0 +1,19 @@
+
+module Kontena::Cli::Certificate
+  class RegisterCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+
+    parameter "EMAIL", "Email to register"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      data = {email: email}
+      response = client(token).post("certificates/#{current_grid}/register", data)
+      puts 'Email registered to LetsEncrypt'
+    end
+  end
+end

data/lib/kontena/cli/certificate_command.rb

@@ -0,0 +1,14 @@
+require_relative 'certificate/register_command'
+require_relative 'certificate/authorize_command'
+require_relative 'certificate/get_command'
+
+class Kontena::Cli::CertificateCommand < Clamp::Command
+
+
+  subcommand "register", "Register to LetsEncrypt", Kontena::Cli::Certificate::RegisterCommand
+  subcommand "authorize", "Create DNS authorization for domain", Kontena::Cli::Certificate::AuthorizeCommand
+  subcommand "get", "Get certificate for domain", Kontena::Cli::Certificate::GetCommand
+
+  def execute
+  end
+end

data/lib/kontena/cli/containers/containers_helper.rb

@@ -0,0 +1,22 @@
+module Kontena
+  module Cli
+    module Containers
+      module ContainersHelper
+
+        # @param [Array<String>] args
+        # @return [String]
+        def build_command(args)
+          return args.first if args.size == 1
+
+          args.reduce('') do |cmd, arg|
+            if arg.include?(' ') || arg.include?('"')
+              arg = '"' + arg.gsub('"', '\\"') + '"'
+            end
+            cmd + ' ' + arg
+          end.strip
+        end
+
+      end
+    end
+  end
+end

data/lib/kontena/cli/containers/exec_command.rb

@@ -1,7 +1,11 @@
+require_relative '../grid_options'
+require_relative './containers_helper'
+
 module Kontena::Cli::Containers
   class ExecCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include ContainersHelper
 
     parameter "CONTAINER_ID", "Container id"
     parameter "CMD ...", "Command"
@@ -10,9 +14,12 @@ module Kontena::Cli::Containers
       require_api_url
       token = require_token
 
-      payload = {cmd: ['sh', '-c', cmd_list.join(' ')]}
-      service_name = container_id.match(/(.+)-(\d+)/)[1]
+      cmd = build_command(cmd_list)
+      payload = {cmd: ["sh", "-c", cmd]}
+
+      service_name = container_id.match(/(.+)-(\d+)/)[1] rescue nil
       result = client(token).post("containers/#{current_grid}/#{service_name}/#{container_id}/exec", payload)
+
       puts result[0].join(" ") unless result[0].size == 0
       STDERR.puts result[1].join(" ") unless result[1].size == 0
       exit result[2]

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

@@ -55,14 +55,25 @@ module Kontena::Cli::Grids
           @buffer << chunk
         end
         if log
+          @last_seen = log['id']
           color = color_for_container(log['name'])
           puts "#{log['name'].colorize(color)} | #{log['data']}"
         end
       end
 
-      result = client(token).get_stream(
-        "grids/#{current_grid}/container_logs", streamer, query_params
-      )
+      begin
+        if @last_seen
+          query_params[:from] = @last_seen
+        end
+        result = client(token).get_stream(
+          "grids/#{current_grid}/container_logs", streamer, query_params
+        )
+      rescue => exc
+        if exc.cause.is_a?(EOFError) # Excon wraps the EOFerror into SockerError
+          retry
+        end
+      end
+
     end
 
     def color_for_container(container_id)

data/lib/kontena/cli/master_command.rb

@@ -1,9 +1,3 @@
-require_relative 'master/vagrant_command'
-require_relative 'master/aws_command'
-require_relative 'master/digital_ocean_command'
-require_relative 'master/packet_command'
-require_relative 'master/upcloud_command'
-require_relative 'master/azure_command'
 require_relative 'master/use_command'
 require_relative 'master/list_command'
 require_relative 'master/users_command'
@@ -11,16 +5,11 @@ require_relative 'master/current_command'
 
 class Kontena::Cli::MasterCommand < Clamp::Command
 
-  subcommand "vagrant", "Vagrant specific commands", Kontena::Cli::Master::VagrantCommand
-  subcommand "aws", "AWS specific commands", Kontena::Cli::Master::AwsCommand
-  subcommand "digitalocean", "DigitalOcean specific commands", Kontena::Cli::Master::DigitalOceanCommand
-  subcommand "packet", "Packet specific commands", Kontena::Cli::Master::PacketCommand
-  subcommand "upcloud", "Upcloud specific commands", Kontena::Cli::Master::UpcloudCommand
-  subcommand "azure", "Azure specific commands", Kontena::Cli::Master::AzureCommand
   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

@@ -3,16 +3,8 @@ require_relative 'nodes/remove_command'
 require_relative 'nodes/show_command'
 require_relative 'nodes/update_command'
 require_relative 'nodes/ssh_command'
-
 require_relative 'nodes/label_command'
 
-require_relative 'nodes/vagrant_command'
-require_relative 'nodes/digital_ocean_command'
-require_relative 'nodes/packet_command'
-require_relative 'nodes/upcloud_command'
-require_relative 'nodes/aws_command'
-require_relative 'nodes/azure_command'
-
 class Kontena::Cli::NodeCommand < Clamp::Command
 
   subcommand ["list","ls"], "List grid nodes", Kontena::Cli::Nodes::ListCommand
@@ -20,16 +12,8 @@ class Kontena::Cli::NodeCommand < Clamp::Command
   subcommand "ssh", "Ssh into node", Kontena::Cli::Nodes::SshCommand
   subcommand "update", "Update node", Kontena::Cli::Nodes::UpdateCommand
   subcommand ["remove","rm"], "Remove node", Kontena::Cli::Nodes::RemoveCommand
-
   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
-  subcommand "packet", "Packet specific commands", Kontena::Cli::Nodes::PacketCommand
-  subcommand "upcloud", "Upcloud specific commands", Kontena::Cli::Nodes::UpcloudCommand
-  subcommand "aws", "AWS specific commands", Kontena::Cli::Nodes::AwsCommand
-  subcommand "azure", "Azure specific commands", Kontena::Cli::Nodes::AzureCommand
-
   def execute
   end
 end

data/lib/kontena/cli/plugin_command.rb

@@ -0,0 +1,15 @@
+require_relative 'plugins/list_command'
+require_relative 'plugins/search_command'
+require_relative 'plugins/install_command'
+require_relative 'plugins/uninstall_command'
+
+class Kontena::Cli::PluginCommand < Clamp::Command
+
+  subcommand ["list","ls"], "List plugins", Kontena::Cli::Plugins::ListCommand
+  subcommand "search", "Search plugins", Kontena::Cli::Plugins::SearchCommand
+  subcommand "install", "Install a plugin", Kontena::Cli::Plugins::InstallCommand
+  subcommand "uninstall", "Uninstall a plugin", Kontena::Cli::Plugins::UninstallCommand
+
+  def execute
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'open3'
+
+module Kontena::Cli::Plugins
+  class InstallCommand < Clamp::Command
+    include Kontena::Util
+
+    parameter 'NAME', 'Plugin name'
+
+    def execute
+      install_plugin(name)
+    end
+
+    def install_plugin(name)
+      plugin = "kontena-plugin-#{name}"
+      gem_bin = which('gem')
+      install_command = "#{gem_bin} install --no-ri --no-doc #{plugin}"
+      success = false
+      ShellSpinner "Installing plugin #{name.colorize(:cyan)}" do
+        stdout, stderr, status = Open3.capture3(install_command)
+        unless stderr.empty?
+          raise stderr
+        end
+      end
+    rescue => exc
+      puts exc.message
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+
+module Kontena::Cli::Plugins
+  class ListCommand < Clamp::Command
+
+    def execute
+      titles = ['NAME', 'VERSION', 'DESCRIPTION']
+      puts "%-40s %-10s %-40s" % titles
+      Kontena::PluginManager.instance.plugins.each do |plugin|
+        puts "%-40s %-10s %-40s" % [plugin.name, plugin.version, plugin.description]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Kontena::Cli::Plugins
+  class SearchCommand < Clamp::Command
+
+    parameter '[NAME]', 'Search text'
+
+    def execute
+      results = fetch_plugins(name)
+      abort("Cannot access plugin server") unless results
+      puts "%-50s %-10s %-60s" % ['NAME', 'VERSION', 'DESCRIPTION']
+      results.each do |item|
+        name = item['name'].sub('kontena-plugin-', '')
+        puts "%-50s %-10s %-60s" % [name, item['version'], item['info']]
+      end
+    end
+
+    def fetch_plugins(name)
+      client = Excon.new('https://rubygems.org')
+      response = client.get(
+        path: "/api/v1/search.json?query=kontena-plugin-#{name}",
+        headers: {
+          'Content-Type' => 'application/json',
+          'Accept' => 'application/json'
+        }
+      )
+
+      JSON.parse(response.body) rescue nil
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'open3'
+
+module Kontena::Cli::Plugins
+  class UninstallCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter 'NAME', 'Plugin name'
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
+
+    def execute
+      confirm unless forced?
+      uninstall_plugin(name)
+    end
+
+    def uninstall_plugin(name)
+      plugin = "kontena-plugin-#{name}"
+      gem_bin = `which gem`.strip
+      install_command = "#{gem_bin} install -q #{plugin}"
+      success = false
+      ShellSpinner "Uninstalling plugin #{name.colorize(:cyan)}" do
+        stdout, stderr, status = Open3.capture3(install_command)
+        unless stderr.empty?
+          raise stderr
+        end
+      end
+    rescue => exc
+      puts exc.message
+    end
+  end
+end

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

@@ -55,7 +55,7 @@ module Kontena::Cli::Registry
         env = [
             "REGISTRY_STORAGE=azure",
             "REGISTRY_STORAGE_AZURE_ACCOUNTNAME=#{azure_account_name}",
-            "REGISTRY_STORAGE_AZURE_ACCOUNTKEY=#{azure_account_key}"
+            "REGISTRY_STORAGE_AZURE_CONTAINER=#{azure_container_name}"
         ]
         secrets = [
           {secret: 'REGISTRY_STORAGE_AZURE_ACCOUNTKEY', name: 'REGISTRY_STORAGE_AZURE_ACCOUNTKEY', type: 'env'}

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

@@ -34,6 +34,12 @@ module Kontena::Cli::Services
     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
+    option "--health-check-uri", "HEALTH CHECK URI", "URI path for HTTP health check"
+    option "--health-check-timeout", "HEALTH CHECK TIMEOUT", "Timeout for health check"
+    option "--health-check-interval", "HEALTH CHECK INTERVAL", "Interval for health check"
+    option "--health-check-initial-delay", "HEALTH CHECK INITIAL DELAY", "Initial delay for health check"
+    option "--health-check-port", "HEALTH CHECK PORT", "Port for health check"
+    option "--health-check-protocol", "HEALTH CHECK PROTOCOL", "Protocol of health check"
 
     def execute
       require_api_url
@@ -83,6 +89,16 @@ module Kontena::Cli::Services
       if deploy_interval
         data[:deploy_opts][:interval] = parse_relative_time(deploy_interval)
       end
+      if health_check_port
+        data[:health_check] = { 
+          protocol: health_check_protocol,
+          uri: health_check_uri, 
+          port: health_check_port, 
+          timeout: health_check_timeout, 
+          interval: health_check_interval,
+          initial_delay: health_check_initial_delay
+        }
+      end
       data[:pid] = pid if pid
       data
     end