kontena-cli 1.2.0.dev1 → 1.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb3a720a442f0537a388e074fc06d2deca0fe61
-  data.tar.gz: abb0c04c02d70ea872693f70f972d26c06519fb7
+  metadata.gz: f03d83329e4ddcebc48f226b38df3d4eb9b6f96f
+  data.tar.gz: 451423d5bc02c8c01a18170cbb665a455d26a3d2
 SHA512:
-  metadata.gz: e6c457fe87e24961e71867cfdf13b03bbd0b342f51d78ecaf84a1d67d61aaa55bdba02d3005604dbf92bb55db4e1a64583a396bb232703af8d96b2877c961e62
-  data.tar.gz: 6d6502e6101bc887c366b4bdb49ac93480bf83ac23c8d411d9b294a95ce5835f9fa375b925a718653a4c06d76ca024e42a1bf2fea3042aa5fca3258757659670
+  metadata.gz: 24c1bd893acbaf99a21795710024e0673e79e0685f83f3478f6a708568c2f12f440f6caa463068406a22de4f232de2e6120017ca64334e8fc7dd7977932df3a1
+  data.tar.gz: c56ff810d3d4809d2c9d8c3c705389a0c801baf407290e89ec8ee718f3ef04b2d87112122eb379c498032da63994ee0b3f58cb609f24f45105ceeaca994819bf

data/VERSION

@@ -1 +1 @@
-1.2.0.dev1
+1.2.0.pre1

data/kontena-cli.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
-  spec.add_runtime_dependency "opto", "1.8.3"
+  spec.add_runtime_dependency "opto", "1.8.4"
   spec.add_runtime_dependency "semantic", "~> 1.5"
   spec.add_runtime_dependency "safe_yaml", "~> 1.0"
   spec.add_runtime_dependency "liquid", "~> 4.0.0"

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

@@ -41,6 +41,13 @@ module Kontena::Cli::Grids
         puts "  exports:"
         puts "    statsd: #{statsd['server']}:#{statsd['port']}"
       end
+      if logs = grid.dig('logs')
+        puts "logs:"
+        puts "  forwarder: #{logs['forwarder']}"
+        logs['opts'].each do |k,v|
+          puts "  #{k}: #{v}"
+        end
+      end
     end
 
     def grids

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

@@ -8,10 +8,13 @@ module Kontena::Cli::Grids
     parameter "NAME", "Grid name"
     option "--statsd-server", "STATSD_SERVER", "Statsd server address (host:port)"
     option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
+    option "--log-forwarder", "LOG_FORWARDER", "Set grid wide log forwarder"
+    option "--log-opt", "[LOG_OPT]", "Set log options (key=value)", multivalued: true
 
     def execute
       require_api_url
       token = require_token
+      validate_log_opts
       payload = {}
       if statsd_server
         server, port = statsd_server.split(':')
@@ -22,10 +25,33 @@ module Kontena::Cli::Grids
           }
         }
       end
+
+      if log_forwarder
+        payload[:logs] = {
+          forwarder: log_forwarder,
+          opts: parse_log_opts
+        }
+      end
+
       if default_affinity_list
         payload[:default_affinity] = default_affinity_list
       end
       client(token).put("grids/#{name}", payload)
     end
+
+    def validate_log_opts
+      if !log_opt_list.empty? && log_forwarder.nil?
+        raise Kontena::Errors::StandardError.new(1, "Need to specify --log-forwarder when using --log-opt")
+      end
+    end
+
+    def parse_log_opts
+      opts = {}
+      log_opt_list.each do |opt|
+        key, value = opt.split('=')
+        opts[key.to_sym] = value
+      end
+      opts
+    end
   end
 end

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

@@ -15,7 +15,7 @@ module Kontena::Cli::Services
       require_api_url
 
       query_params = {}
-      query_params[:container] = parse_container_name(name, instance) if instance
+      query_params[:instance] = instance if instance
 
       show_logs("services/#{parse_service_id(name)}/container_logs", query_params) do |log|
         show_log(log)

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

@@ -53,8 +53,10 @@ module Kontena::Cli::Services
       end
 
       cpu = stat['cpu'].nil? ? 'N/A' : stat['cpu']['usage']
-      network_in = stat['network'].nil? ? 'N/A' : filesize_to_human(stat['network']['rx_bytes'])
-      network_out = stat['network'].nil? ? 'N/A' : filesize_to_human(stat['network']['tx_bytes'])
+
+      network_in = stat['network'].nil? ? 'N/A' : filesize_to_human(network_bytes(stat['network'], 'rx_bytes'))
+      network_out = stat['network'].nil? ? 'N/A' : filesize_to_human(network_bytes(stat['network'], 'tx_bytes'))
+
       prefix = self.name.split('/')[0]
       instance_name = stat['container_id'].gsub("#{prefix}-", "")
       puts '%-30.30s %-15s %-20s %-15s %-15s' % [ instance_name, "#{cpu}%", "#{memory} / #{memory_limit}", "#{memory_pct}", "#{network_in}/#{network_out}"]
@@ -72,5 +74,13 @@ module Kontena::Cli::Services
     rescue FloatDomainError
       'N/A'
     end
+
+    ##
+    # @param [Hash] network
+    # @param [String] key
+    # @return [Integer]
+    def network_bytes(network, key)
+      (network.dig('internal', key) || 0) + (network.dig('external', key) || 0)
+    end
   end
 end

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

@@ -6,10 +6,16 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
 
     def validate(key, value, validations, errors)
       unless value.is_a?(Hash)
-        errors[key] = 'hooks must be array'
+        errors[key] = "must be a mapping, not #{value.class}"
         return
       end
 
+      value.keys.each do |hook|
+        unless %w(pre_build post_start).include?(hook)
+          errors[key] = "invalid hook #{hook}"
+        end
+      end
+
       if value['pre_build']
         validate_pre_build_hooks(key, value['pre_build'], errors)
       end
@@ -21,7 +27,7 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
 
     def validate_pre_build_hooks(key, pre_build_hooks, errors)
       unless pre_build_hooks.is_a?(Array)
-        errors[key] = 'pre_build must be array'
+        errors[key] = { 'pre_build' => "must be an array" }
         return
       end
       pre_build_validation = {
@@ -36,7 +42,7 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
 
     def validate_post_start_hooks(key, post_start_hooks, errors)
       unless post_start_hooks.is_a?(Array)
-        errors[key] = 'post_start must be array'
+        errors[key] = { 'post_start' => 'must be an array' }
         return
       end
       post_start_validation = {

data/lib/kontena/cli/volume_command.rb

@@ -0,0 +1,8 @@
+
+class Kontena::Cli::VolumeCommand < Kontena::Command
+
+  subcommand "create", "Create a managed volume", load_subcommand('volumes/create_command')
+  subcommand ["remove", "rm"], "Remove a managed volume", load_subcommand('volumes/remove_command')
+  subcommand ["list", "ls"], "List managed volumes", load_subcommand('volumes/list_command')
+
+end

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

@@ -0,0 +1,38 @@
+
+module Kontena::Cli::Volumes
+  class CreateCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+
+    banner "Creates a volume"
+    parameter 'NAME', 'Volume name'
+
+    option '--driver', 'DRIVER', 'Volume driver to be used'
+    option '--driver-opt', 'DRIVER_OPT', 'Volume driver options', multivalued: true
+    option '--scope', 'SCOPE', 'Volume scope'
+
+    requires_current_master
+    requires_current_master_token
+
+    def execute
+      volume = {
+        name: name,
+        scope: scope,
+        driver: driver,
+        driver_opts: parse_driver_opts
+      }
+      spinner "Creating volume #{pastel.cyan(name)} " do
+        create_volume(volume)
+      end
+    end
+
+    def parse_driver_opts
+      Hash[driver_opt_list.map{|opt| opt.split '='}]
+    end
+
+    def create_volume(volume)
+      client.post("volumes/#{current_grid}", volume)
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+
+module Kontena::Cli::Volumes
+  class ListCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+
+    requires_current_master
+    requires_current_master_token
+
+    def execute
+      volumes = client.get("volumes/#{current_grid}")['volumes']
+      columns = '%-25.25s %-25.25s %-25.25s %-25.25s'
+      puts columns % ['NAME', 'SCOPE', 'DRIVER', 'CREATED AT']
+      volumes.each do |volume|
+        puts columns % [volume['name'], volume['scope'], volume['driver'], volume['created_at']]
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,24 @@
+
+module Kontena::Cli::Volumes
+  class RemoveCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+
+    banner "Removes a volume"
+    parameter 'VOLUME', 'Volume'
+
+    requires_current_master
+    requires_current_master_token
+
+    def execute
+      spinner "Removing volume #{pastel.cyan(volume)} " do
+        remove_volume(volume)
+      end
+    end
+
+    def remove_volume(volume)
+      client.delete("volumes/#{current_grid}/#{volume}")
+    end
+  end
+end

data/lib/kontena/command.rb

@@ -213,7 +213,7 @@ class Kontena::Command < Clamp::Command
     end
   rescue Kontena::Errors::StandardError => exc
     raise exc if ENV['DEBUG']
-    puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
+    $stderr.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

data/lib/kontena/main_command.rb

@@ -36,6 +36,7 @@ class Kontena::MainCommand < Kontena::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')
+  subcommand "volume", "Volume specific commands", load_subcommand('volume_command')
 
   def execute
   end

data/omnibus/wrappers/sh/kontena

@@ -4,4 +4,4 @@ export PATH=/opt/kontena/embedded/bin:$PATH
 export GEM_HOME=/opt/kontena/embedded/lib/ruby/gems/2.1.0
 export GEM_PATH=$GEM_HOME
 
-exec /opt/kontena/embedded/bin/kontena $@
+exec /opt/kontena/embedded/bin/kontena "$@"

data/spec/kontena/cli/grids/update_command_spec.rb

@@ -0,0 +1,46 @@
+
+require_relative "../../../spec_helper"
+require 'kontena/cli/grids/update_command'
+
+describe Kontena::Cli::Grids::UpdateCommand do
+
+  include ClientHelpers
+
+  let(:client) do
+    Kontena::Client.new('https://foo', {access_token: 'abcd1234'})
+  end
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:server) do
+    Kontena::Cli::Config::Server.new(url: 'https://localhost', token: 'abcd1234')
+  end
+
+  describe "#update" do
+
+    context 'log options' do
+      it 'should fail if no driver specified' do
+        expect {
+          subject.run(['--log-opt', 'foo=bar', 'test'])
+        }.to exit_with_error
+
+      end
+
+      it 'should send valid options to server' do
+        expect(client).to receive(:put).with(
+          'grids/test', hash_including({
+            logs: {
+              forwarder: 'fluentd',
+              opts: {
+                foo: 'bar'
+              }
+            }
+          })
+        )
+        subject.run(['--log-forwarder', 'fluentd', '--log-opt', 'foo=bar', 'test'])
+      end
+    end
+  end
+end

data/spec/kontena/cli/services/logs_command_spec.rb

@@ -0,0 +1,41 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/services/logs_command"
+
+describe Kontena::Cli::Services::LogsCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    before(:each) do
+      allow(client).to receive(:get).and_return({
+        'logs' => []
+      })
+    end
+
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['service-a'])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).and_return(token)
+      subject.run(['service-a'])
+    end
+
+    it 'requests logs from master' do
+      expect(client).to receive(:get).with(
+        'services/test-grid/null/service-a/container_logs', {limit: 100}
+      )
+      subject.run(['service-a'])
+    end
+
+    context 'when passing instance option ' do
+      it 'adds it to query params' do
+        expect(client).to receive(:get).with(
+          'services/test-grid/null/service-a/container_logs', {instance: '1', limit: 100}
+        )
+        subject.run(['-i', '1', 'service-a'])
+      end
+    end
+  end
+end

data/spec/kontena/cli/stacks/yaml/validator_v3_spec.rb

@@ -165,6 +165,12 @@ describe Kontena::Cli::Stacks::YAML::ValidatorV3 do
     end
 
     context 'hooks' do
+      context 'validates hook name' do
+        it 'must be valid hook' do
+          result = subject.validate_options('hooks' => { 'pre-build' => {} })
+          expect(result.errors.key?('hooks')).to be_truthy
+        end
+      end
       context 'validates pre_build' do
         it 'must be array' do
           result = subject.validate_options('hooks' => { 'pre_build' => {} })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0.dev1
+  version: 1.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -456,6 +456,10 @@ files:
 - lib/kontena/cli/vault_command.rb
 - lib/kontena/cli/version.rb
 - lib/kontena/cli/version_command.rb
+- lib/kontena/cli/volume_command.rb
+- lib/kontena/cli/volumes/create_command.rb
+- lib/kontena/cli/volumes/list_command.rb
+- lib/kontena/cli/volumes/remove_command.rb
 - lib/kontena/cli/vpn/config_command.rb
 - lib/kontena/cli/vpn/create_command.rb
 - lib/kontena/cli/vpn/remove_command.rb
@@ -559,6 +563,7 @@ files:
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
+- spec/kontena/cli/grids/update_command_spec.rb
 - spec/kontena/cli/grids/use_command_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
@@ -576,6 +581,7 @@ files:
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
+- spec/kontena/cli/services/logs_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
 - spec/kontena/cli/services/secrets/link_command_spec.rb
 - spec/kontena/cli/services/secrets/unlink_command_spec.rb
@@ -695,6 +701,7 @@ test_files:
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
+- spec/kontena/cli/grids/update_command_spec.rb
 - spec/kontena/cli/grids/use_command_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
@@ -712,6 +719,7 @@ test_files:
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
+- spec/kontena/cli/services/logs_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
 - spec/kontena/cli/services/secrets/link_command_spec.rb
 - spec/kontena/cli/services/secrets/unlink_command_spec.rb