kontena-cli 0.16.3 → 0.17.0.pre1

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

@@ -0,0 +1,31 @@
+module Kontena::Cli::Stacks
+  class LogsCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::LogHelper
+
+    parameter "NAME", "Stack name"
+    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"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      query_params = {}
+      query_params[:limit] = lines if lines
+      query_params[:since] = since if since
+
+      show_logs("stacks/#{current_grid}/#{name}/container_logs", query_params) do |log|
+        show_log(log)
+      end
+    end
+
+    def show_log(log)
+      color = color_for_container(log['name'])
+      prefix = "#{log['created_at']} [#{log['name']}]:".colorize(color)
+      puts "#{prefix} #{log['data']}"
+    end
+  end
+end

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

@@ -0,0 +1,91 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class MonitorCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    parameter "NAME", "Stack name"
+
+    attr_reader :services
+
+    def execute
+      require_api_url
+      token = require_token
+
+      response = client(token).get("grids/#{current_grid}/services?stack=#{name}")
+      show_monitor(response['services'])
+
+      @services = services_from_yaml(filename, service_list, service_prefix)
+      if services.size > 0
+        show_monitor(services)
+      elsif !service_list.empty?
+        puts "No such service: #{service_list.join(', ')}".colorize(:red)
+      end
+    end
+
+    def show_monitor(services)
+      loop do
+        nodes = {}
+        services.each do |service|
+          result = client(token).get("services/#{service['id']}/containers") rescue nil
+          if result
+            service['instances'] = result['containers'].size
+            result['containers'].each do |container|
+              container['service'] = service['name']
+              nodes[container['node']['name']] ||= []
+              nodes[container['node']['name']] << container
+            end
+          end
+        end
+        clear_terminal
+        puts "grid: #{current_grid}"
+        puts "stack: #{name}"
+        puts "services:"
+        services.each do |service|
+          color = color_for_service(service['name'])
+          puts "  #{"■".colorize(color)} #{service['name']} (#{service['instances']} instances)"
+        end
+        puts "nodes:"
+        node_names = nodes.keys.sort
+        node_names.each do |name|
+          containers = nodes[name]
+          puts "  #{name} (#{containers.size} instances)"
+          print "  "
+          containers.each do |container|
+            icon = "■"
+            if container['status'] != 'running'
+              icon = "□"
+            end
+            color = color_for_service(container['service'])
+            print icon.colorize(color)
+          end
+          puts ''
+        end
+        sleep 1
+      end
+    end
+
+    def color_for_service(service)
+      color_maps[service] = colors.shift unless color_maps[service]
+      color_maps[service].to_sym
+    end
+
+    def color_maps
+      @color_maps ||= {}
+    end
+
+    def colors
+      if(@colors.nil? || @colors.size == 0)
+        @colors = [:green, :magenta, :yellow, :cyan, :red,
+                   :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+      end
+      @colors
+    end
+
+    def clear_terminal
+      print "\e[H\e[2J"
+    end
+  end
+end

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

@@ -6,21 +6,38 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
-    parameter "NAME", "Service name"
+    parameter "NAME", "Stack name"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
-      require_token
+      token = require_token
 
-      remove_stack(name)
+      confirm_command(name) unless forced?
+      spinner "Removing stack #{pastel.cyan(name)} " do
+        remove_stack(token, name)
+        wait_stack_removal(token, name)
+      end
     end
 
-    private
-
-
-    def remove_stack(name)
+    def remove_stack(token, name)
       client(token).delete("stacks/#{current_grid}/#{name}")
     end
 
+    def wait_stack_removal(token, name)
+      removed = false
+      until removed == true
+        begin
+          client(token).get("stacks/#{current_grid}/#{name}")
+          sleep 1
+        rescue Kontena::Errors::StandardError => exc
+          if exc.status == 404
+            removed = true
+          else
+            raise exc
+          end
+        end
+      end
+    end
   end
 end

data/lib/kontena/cli/stacks/service_generator.rb

@@ -0,0 +1,115 @@
+require 'yaml'
+require 'shellwords'
+require_relative '../services/services_helper'
+
+module Kontena::Cli::Stacks
+  class ServiceGenerator
+    include Kontena::Cli::Services::ServicesHelper
+
+    attr_reader :service_config
+
+    def initialize(service_config)
+      @service_config = service_config
+    end
+
+    ##
+    # @return [Hash]
+    def generate
+      parse_data(service_config)
+    end
+
+    private
+
+    ##
+    # @param [Hash] options
+    # @return [Hash]
+    def parse_data(options)
+      data = {}
+      data['container_count'] = options['instances']
+      data['image'] = parse_image(options['image'])
+      data['env'] = options['environment'] if options['environment']
+      data['container_count'] = options['instances']
+      data['links'] = parse_links(options['links'] || [])
+      data['external_links'] = parse_links(options['external_links'] || [])
+      data['ports'] = parse_stringified_ports(options['ports'] || [])
+      data['memory'] = parse_memory(options['mem_limit'].to_s) if options['mem_limit']
+      data['memory_swap'] = parse_memory(options['memswap_limit'].to_s) if options['memswap_limit']
+      data['cpu_shares'] = options['cpu_shares'] if options['cpu_shares']
+      data['volumes'] = options['volumes'] || []
+      data['volumes_from'] = options['volumes_from'] || []
+      data['cmd'] = Shellwords.split(options['command']) if options['command']
+      data['affinity'] = options['affinity'] || []
+      data['user'] = options['user'] if options['user']
+      data['stateful'] = options['stateful'] == true
+      data['privileged'] = options['privileged'] unless options['privileged'].nil?
+      data['cap_add'] = options['cap_add'] if options['cap_add']
+      data['cap_drop'] = options['cap_drop'] if options['cap_drop']
+      data['net'] = options['net'] if options['net']
+      data['pid'] = options['pid'] if options['pid']
+      data['log_driver'] = options['log_driver'] if options['log_driver']
+      data['log_opts'] = options['log_opt'] if options['log_opt'] && !options['log_opt'].empty?
+      deploy_opts = options['deploy'] || {}
+      data['strategy'] = deploy_opts['strategy'] if deploy_opts['strategy']
+      deploy = {}
+      deploy['wait_for_port'] = deploy_opts['wait_for_port'] if deploy_opts.has_key?('wait_for_port')
+      deploy['min_health'] = deploy_opts['min_health'] if deploy_opts.has_key?('min_health')
+      deploy['interval'] = parse_relative_time(deploy_opts['interval']) if deploy_opts.has_key?('interval')
+      unless deploy.empty?
+        data['deploy_opts'] = deploy
+      end
+      data['hooks'] = options['hooks'] || {}
+      data['secrets'] = options['secrets'] if options['secrets']
+      data['build'] = parse_build_options(options) if options['build']
+      health_check = {}
+      health_opts = options['health_check'] || {}
+      health_check['protocol'] = health_opts['protocol'] if health_opts.has_key?('protocol')
+      health_check['uri'] = health_opts['uri'] if health_opts.has_key?('uri')
+      health_check['port'] = health_opts['port'] if health_opts.has_key?('port')
+      health_check['timeout'] = health_opts['timeout'] if health_opts.has_key?('timeout')
+      health_check['interval'] = health_opts['interval'] if health_opts.has_key?('interval')
+      health_check['initial_delay'] = health_opts['initial_delay'] if health_opts.has_key?('initial_delay')
+      unless health_check.empty?
+        data['health_check'] = health_check
+      end
+      data
+    end
+
+    # @param [Array<String>] port_options
+    # @return [Array<Hash>]
+    def parse_stringified_ports(port_options)
+      parse_ports(port_options).map {|p|
+        {
+          'ip' => p[:ip],
+          'container_port' => p[:container_port],
+          'node_port' => p[:node_port],
+          'protocol' => p[:protocol]
+        }
+      }
+    end
+
+    # @param [Array<String>] link_options
+    # @return [Array<Hash>]
+    def parse_links(link_options)
+      link_options.map{|l|
+        service_name, alias_name = l.split(':')
+        if service_name.nil?
+          raise ArgumentError.new("Invalid link value #{l}")
+        end
+        alias_name = service_name if alias_name.nil?
+        {
+            'name' => service_name,
+            'alias' => alias_name
+        }
+      }
+    end
+
+    # @param [Hash] options
+    # @return [Hash]
+    def parse_build_options(options)
+      build = {}
+      build['context'] = options['build'] if options['build']
+      build['dockerfile'] = options['dockerfile'] if options['dockerfile']
+      build
+    end
+  end
+end

data/lib/kontena/cli/stacks/service_generator_v2.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+require_relative 'service_generator'
+
+module Kontena::Cli::Stacks
+  class ServiceGeneratorV2 < ServiceGenerator
+
+    def parse_data(options)
+      data = super(options)
+      data['net'] = options['network_mode'] if options['network_mode']
+      data['log_driver'] = options.dig('logging', 'driver')
+      data['log_opts'] = options.dig('logging', 'options')
+      if options['depends_on']
+        data['links'] ||= []
+        data['links'] = (data['links'] + parse_links(options['depends_on'])).uniq
+      end
+      data
+    end
+
+    def parse_build_options(options)
+      unless options['build'].is_a?(Hash)
+        options['build'] = { 'context' => options['build']}
+      end
+      options['build']['args'] = parse_build_args(options['build']['args']) if options['build']['args']
+      options['build']
+    end
+  end
+end

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

@@ -6,33 +6,85 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
-    parameter "NAME", "Service name"
+    parameter "NAME", "Stack name"
 
     def execute
       require_api_url
-      require_token
-      
-      show_stack(name)
-      
-    end
+      token = require_token
 
-    private
+      show_stack(token, name)
+    end
 
-    def show_stack(name)
+    def show_stack(token, name)
       stack = client(token).get("stacks/#{current_grid}/#{name}")
 
-      puts stack
-
-      puts "#{stack['id']}:"
+      puts "#{stack['name']}:"
       puts "  state: #{stack['state']}"
       puts "  created_at: #{stack['created_at']}"
       puts "  updated_at: #{stack['updated_at']}"
       puts "  version: #{stack['version']}"
+      puts "  expose: #{stack['expose'] || '-'}"
       puts "  services:"
-      stack['grid_services'].each do |service|
-        puts "    id: #{service['id']}"
+      stack['services'].each do |service|
+        show_service(token, service['id'])
       end
     end
 
+    # @param [String] token
+    # @param [String] service_id
+    def show_service(token, service_id)
+      service = get_service(token, service_id)
+      pad = '    '.freeze
+      puts "#{pad}#{service['name']}:"
+      puts "#{pad}  image: #{service['image']}"
+      puts "#{pad}  status: #{service['state'] }"
+      if service['health_status']
+        puts "#{pad}  health_status:"
+        puts "#{pad}    healthy: #{service['health_status']['healthy']}"
+        puts "#{pad}    total: #{service['health_status']['total']}"
+      end
+      puts "#{pad}  revision: #{service['revision']}"
+      puts "#{pad}  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
+      puts "#{pad}  scaling: #{service['container_count'] }"
+      puts "#{pad}  strategy: #{service['strategy']}"
+      puts "#{pad}  deploy_opts:"
+      puts "#{pad}    min_health: #{service['deploy_opts']['min_health']}"
+      if service['deploy_opts']['wait_for_port']
+        puts "#{pad}  wait_for_port: #{service['deploy_opts']['wait_for_port']}"
+      end
+      if service['deploy_opts']['interval']
+        puts "#{pad}  interval: #{service['deploy_opts']['interval']}"
+      end
+      puts "#{pad}  dns: #{service['dns']}"
+
+      if service['affinity'].to_a.size > 0
+        puts "#{pad}  affinity: "
+        service['affinity'].to_a.each do |a|
+          puts "#{pad}    - #{a}"
+        end
+      end
+
+      unless service['cmd'].to_s.empty?
+        if service['cmd']
+          puts "#{pad}  cmd: #{service['cmd'].join(' ')}"
+        else
+          puts "#{pad}  cmd: "
+        end
+      end
+
+      if service['ports'].to_a.size > 0
+        puts "#{pad}  ports:"
+        service['ports'].to_a.each do |p|
+          puts "#{pad}    - #{p['node_port']}:#{p['container_port']}/#{p['protocol']}"
+        end
+      end
+
+      if service['links'].to_a.size > 0
+        puts "#{pad}  links: "
+        service['links'].to_a.each do |l|
+          puts "#{pad}    - #{l['alias']} => #{l['id']}"
+        end
+      end
+    end
   end
 end

data/lib/kontena/cli/stacks/upgrade_command.rb

@@ -0,0 +1,28 @@
+require_relative 'common'
+
+module Kontena::Cli::Stacks
+  class UpgradeCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    parameter "NAME", "Stack name"
+    parameter "FILE", "Kontena stack file"
+    option '--deploy', :flag, 'Deploy after upgrade'
+
+    def execute
+      require_api_url
+      token = require_token
+      require_config_file(file)
+      stack = stack_from_yaml(file)
+      spinner "Upgrading stack #{pastel.cyan(name)} " do
+        update_stack(token, stack)
+      end
+      Kontena.run("stack deploy #{name}")
+    end
+
+    def update_stack(token, stack)
+      client(token).put("stacks/#{current_grid}/#{name}", stack)
+    end
+  end
+end

data/lib/kontena/cli/stacks/yaml/custom_validators/affinities_validator.rb

@@ -0,0 +1,19 @@
+module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
+  class AffinitiesValidator < HashValidator::Validator::Base
+    def initialize
+      super('stacks_valid_affinities')
+    end
+
+    def validate(key, value, validations, errors)
+      unless value.is_a?(Array)
+        errors[key] = 'affinity must be array'
+        return
+      end
+
+      invalid_formats = value.find_all { |a| !a.match(/(?<=\!|\=)=/) }
+      if invalid_formats.count > 0
+        errors[key] = "affinity contains invalid formats: #{invalid_formats.join(', ')}"
+      end
+    end
+  end
+end