kontena-cli 0.8.4 → 0.9.0

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

@@ -14,9 +14,11 @@ module Kontena::Cli::Apps
     attr_reader :services, :service_prefix
 
     def execute
-      @services = load_services_from_yml
+      require_config_file(filename)
+
+      @service_prefix = project_name || current_dir
+      @services = load_services(filename, service_list, service_prefix)
       if services.size > 0
-        Dir.chdir(File.dirname(filename))
         show_services(services)
       elsif !service_list.empty?
         puts "No such service: #{service_list.join(', ')}".colorize(:red)

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

@@ -14,9 +14,11 @@ module Kontena::Cli::Apps
     attr_reader :services, :service_prefix
 
     def execute
-      @services = load_services_from_yml
+      require_config_file(filename)
+
+      @service_prefix = project_name || current_dir
+      @services = load_services(filename, service_list, service_prefix)
       if services.size > 0
-        Dir.chdir(File.dirname(filename))
         show_logs(services)
       elsif !service_list.empty?
         puts "No such service: #{service_list.join(', ')}".colorize(:red)

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

@@ -16,10 +16,12 @@ module Kontena::Cli::Apps
     def execute
       require_api_url
       require_token
+      require_config_file(filename)
 
-      @services = load_services_from_yml
+      @service_prefix = project_name || current_dir
+      #Dir.chdir(File.dirname(filename))
+      @services = load_services(filename, service_list, service_prefix)
       if services.size > 0
-        Dir.chdir(File.dirname(filename))
         remove_services(services)
       elsif !service_list.empty?
         puts "No such service: #{service_list.join(', ')}".colorize(:red)

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

@@ -14,9 +14,11 @@ module Kontena::Cli::Apps
     attr_reader :services, :service_prefix
 
     def execute
-      @services = load_services_from_yml
+      require_config_file(filename)
+
+      @service_prefix = project_name || current_dir
+      @services = load_services(filename, service_list, service_prefix)
       if services.size > 0
-        Dir.chdir(File.dirname(filename))
         start_services(services)
       elsif !service_list.empty?
         puts "No such service: #{service_list.join(', ')}".colorize(:red)

data/lib/kontena/cli/apps/stop_command.rb

@@ -14,9 +14,11 @@ module Kontena::Cli::Apps
     attr_reader :services, :service_prefix
 
     def execute
-      @services = load_services_from_yml
+      require_config_file(filename)
+
+      @service_prefix = project_name || current_dir
+      @services = load_services(filename, service_list, service_prefix)
       if services.size > 0
-        Dir.chdir(File.dirname(filename))
         stop_services(services)
       elsif !service_list.empty?
         puts "No such service: #{service_list.join(', ')}".colorize(:red)

data/lib/kontena/cli/common.rb

@@ -8,7 +8,7 @@ module Kontena
       end
 
       def require_token
-        token = settings['server']['token']
+        token = ENV['KONTENA_TOKEN'] || settings['server']['token']
         unless token
           raise ArgumentError.new("Please login first using: kontena login")
         end
@@ -48,7 +48,7 @@ module Kontena
       end
 
       def api_url
-        url = settings['server']['url']
+        url = ENV['KONTENA_URL'] || settings['server']['url']
         unless url
           raise ArgumentError.new("It seem's that you are not logged into Kontena master, please login with: kontena login")
         end
@@ -72,7 +72,7 @@ module Kontena
       end
 
       def current_grid
-        settings['server']['grid']
+        ENV['KONTENA_GRID'] || settings['server']['grid']
       end
 
       def save_settings

data/lib/kontena/cli/container_command.rb

@@ -1,9 +1,12 @@
 require_relative 'containers/exec_command'
+require_relative 'containers/inspect_command'
 
 class Kontena::Cli::ContainerCommand < Clamp::Command
 
   subcommand "exec", "Execute command inside a container", Kontena::Cli::Containers::ExecCommand
 
+  subcommand "inspect", "Inspect the container", Kontena::Cli::Containers::InspectCommand
+
   def execute
   end
 end

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

@@ -0,0 +1,16 @@
+module Kontena::Cli::Containers
+  class InspectCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "CONTAINER_ID", "Container id"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      service_name = container_id.match(/(.+)-(\d+)/)[1]
+      result = client(token).get("containers/#{current_grid}/#{service_name}/#{container_id}/inspect")
+      puts JSON.pretty_generate(result)
+    end
+  end
+end

data/lib/kontena/cli/deploy_command.rb

@@ -148,6 +148,9 @@ class Kontena::Cli::DeployCommand < Clamp::Command
     data[:stateful] = options['stateful'] == true
     data[:cap_add] = options['cap_add'] if options['cap_add']
     data[:cap_drop] = options['cap_drop'] if options['cap_drop']
+    data[:log_driver] = options['log_driver'] if options['log_driver']
+    data[:log_opts] = options['log_opt'] if options['log_opt'] && !options['log_opt'].empty?
+
     data
   end
 

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

@@ -0,0 +1,21 @@
+
+module Kontena::Cli::Etcd
+  class GetCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "KEY", "Etcd key"
+
+    def execute
+      require_api_url
+      token = require_token
+      response = client(token).get("etcd/#{current_grid}/#{key}")
+      if response['value']
+        puts response['value']
+      elsif response['children']
+        abort "Cannot get value from a directory"
+      elsif response['error']
+        abort response['error']
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+
+module Kontena::Cli::Etcd
+  class ListCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "KEY", "Etcd key"
+
+    option "--recursive", :flag, "List keys recursively", default: false
+
+    def execute
+      require_api_url
+      token = require_token
+      opts = []
+      opts << 'recursive=true' if recursive?
+      response = client(token).get("etcd/#{current_grid}/#{key}?#{opts.join('&')}")
+      if response['children']
+        children = response['children'].map{|c| c['key'] }
+        puts children.join("\n")
+      elsif response['value']
+        abort "Not a directory"
+      elsif response['error']
+        abort response['error']
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,21 @@
+module Kontena::Cli::Etcd
+  class RemoveCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "KEY", "Etcd key"
+
+    option "--recursive", :flag, "Remove keys recursively"
+
+    def execute
+      require_api_url
+      token = require_token
+      data = {}
+      data[:recursive] = true if recursive?
+      response = client(token).delete("etcd/#{current_grid}/#{key}", data)
+
+      if response['error']
+        abort response['error']
+      end
+    end
+  end
+end

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

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

data/lib/kontena/cli/etcd_command.rb

@@ -0,0 +1,17 @@
+require_relative 'etcd/get_command'
+require_relative 'etcd/set_command'
+require_relative 'etcd/mkdir_command'
+require_relative 'etcd/list_command'
+require_relative 'etcd/remove_command'
+
+class Kontena::Cli::EtcdCommand < Clamp::Command
+
+  subcommand "get", "Get the current value for a single key", Kontena::Cli::Etcd::GetCommand
+  subcommand "set", "Set a value on the specified key", Kontena::Cli::Etcd::SetCommand
+  subcommand "mk", "Create a directory", Kontena::Cli::Etcd::MkdirCommand
+  subcommand "ls", "List a directory", Kontena::Cli::Etcd::ListCommand
+  subcommand "rm", "Remove a key or a directory", Kontena::Cli::Etcd::RemoveCommand
+
+  def execute
+  end
+end

data/lib/kontena/cli/grid_command.rb

@@ -2,6 +2,7 @@ require_relative 'grids/list_command'
 require_relative 'grids/create_command'
 require_relative 'grids/use_command'
 require_relative 'grids/show_command'
+require_relative 'grids/logs_command'
 require_relative 'grids/remove_command'
 require_relative 'grids/current_command'
 require_relative 'grids/audit_log_command'
@@ -15,6 +16,7 @@ class Kontena::Cli::GridCommand < Clamp::Command
   subcommand "create", "Create a new grid", Kontena::Cli::Grids::CreateCommand
   subcommand "use", "Switch to use specific grid", Kontena::Cli::Grids::UseCommand
   subcommand "show", "Show grid details", Kontena::Cli::Grids::ShowCommand
+  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 "audit-log", "Show audit log of the current grid", Kontena::Cli::Grids::AuditLogCommand

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

@@ -0,0 +1,71 @@
+module Kontena::Cli::Grids
+  class LogsCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    option ["-f", "--follow"], :flag, "Follow (tail) logs", default: false
+    option ["-s", "--search"], "SEARCH", "Search from logs"
+    option "--lines", "LINES", "Number of lines to show from the end of the logs"
+    option "--node", "NODE", "Filter by node name", multivalued: true
+    option "--service", "SERVICE", "Filter by service name", multivalued: true
+    option ["-c", "--container"], "CONTAINER", "Filter by container", multivalued: true
+
+    def execute
+      require_api_url
+      token = require_token
+
+      query_params = {}
+      query_params[:nodes] = node_list.join(",") unless node_list.empty?
+      query_params[:services] = service_list.join(",") unless service_list.empty?
+      query_params[:containers] = container_list.join(",") unless container_list.empty?
+      query_params[:search] = search if search
+      query_params[:limit] = lines if lines
+
+
+      if follow?
+        query_params[:follow] = 1
+        stream_logs(token, query_params)
+      else
+        list_logs(token, query_params)
+      end
+    end
+
+    def list_logs(token, query_params)
+      result = client(token).get("grids/#{current_grid}/container_logs", query_params)
+      result['logs'].each do |log|
+        color = color_for_container(log['name'])
+        puts "#{log['name'].colorize(color)} | #{log['data']}"
+      end
+    end
+
+    def stream_logs(token, query_params)
+      streamer = lambda do |chunk, remaining_bytes, total_bytes|
+        log = JSON.parse(chunk)
+        if log
+          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
+      )
+    end
+
+    def color_for_container(container_id)
+      color_maps[container_id] = colors.shift unless color_maps[container_id]
+      color_maps[container_id].to_sym
+    end
+
+    def color_maps
+      @color_maps ||= {}
+    end
+
+    def colors
+      if(@colors.nil? || @colors.size == 0)
+        @colors = [:green, :yellow, :magenta, :cyan, :red,
+          :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+      end
+      @colors
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Kontena::Cli::Master::Aws
+  class CreateCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    option "--access-key", "ACCESS_KEY", "AWS access key ID", required: true
+    option "--secret-key", "SECRET_KEY", "AWS secret key", required: true
+    option "--region", "REGION", "EC2 Region", default: 'eu-west-1'
+    option "--zone", "ZONE", "EC2 Availability Zone", default: 'a'
+    option "--vpc-id", "VPC ID", "Virtual Private Cloud (VPC) ID"
+    option "--subnet-id", "SUBNET ID", "VPC option to specify subnet to launch instance into"
+    option "--key-pair", "KEY_PAIR", "EC2 Key Pair", required: true
+    option "--type", "SIZE", "Instance type", default: 't2.small'
+    option "--storage", "STORAGE", "Storage size (GiB)", default: '30'
+    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
+
+    def execute
+      require 'kontena/machine/aws'
+
+      provisioner = Kontena::Machine::Aws::MasterProvisioner.new(access_key, secret_key, region)
+      provisioner.run!(
+          type: type,
+          vpc: vpc_id,
+          zone: zone,
+          subnet: subnet_id,
+          storage: storage,
+          version: version,
+          key_pair: key_pair,
+          auth_server: auth_provider_url
+      )
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Kontena::Cli::Master
+
+  require_relative 'aws/create_command'
+
+  class AwsCommand < Clamp::Command
+    subcommand "create", "Create a new AWS master", Aws::CreateCommand
+  end
+end

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

@@ -0,0 +1,33 @@
+module Kontena::Cli::Master::Azure
+  class CreateCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    option "--subscription-id", "SUBSCRIPTION ID", "Azure subscription id", required: true
+    option "--subscription-cert", "CERTIFICATE", "Path to Azure management certificate", attribute_name: :certificate, required: true
+    option "--size", "SIZE", "SIZE", default: 'Small'
+    option "--network", "NETWORK", "Virtual Network name"
+    option "--subnet", "SUBNET", "Subnet name"
+    option "--ssh-key", "SSH KEY", "SSH private key file", required: true
+    option "--password", "PASSWORD", "Password"
+    option "--location", "LOCATION", "Location", default: 'West Europe'
+    option "--ssl-cert", "SSL CERT", "SSL certificate file"
+    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
+    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+
+    def execute
+      require 'kontena/machine/azure'
+      provisioner = Kontena::Machine::Azure::MasterProvisioner.new(subscription_id, certificate)
+      provisioner.run!(
+          password: password,
+          ssh_key: ssh_key,
+          ssl_cert: ssl_cert,
+          size: size,
+          virtual_network: network,
+          subnet: subnet,
+          location: location,
+          auth_server: auth_provider_url,
+          version: version
+      )
+    end
+  end
+end