kontena-cli 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac00bb9793205dc4895264f9ba4193d2a4cc45cc
-  data.tar.gz: 084768c69c7e9bd47ccf2337f70e13565b6893e0
+  metadata.gz: 109ecadbdb72e79172f5be44a7c0a38143c6d2a3
+  data.tar.gz: 5198dbcf298ffbcc0e84f4305800b3ed7f64c85a
 SHA512:
-  metadata.gz: 7635b70b87fec46a8ca174708bc84da6f8aaf41de60be336af25dd0d63122320f07535a6a24de4037fd9e92c5b10961c09fd3fe6719176f7034c76109297db3e
-  data.tar.gz: 0d1f75e407710b7ecc7127163c1fd161449c4d85b68d7eec0a272d1b31a2a9b5d34198281e3909d68e15fff32aec072f7f4de64e8012f91a011d25e4a8819018
+  metadata.gz: 3b385cb691cb135cf2de46abcff1d4784ef8aca31420fab414635f626e88a398946dba7e545f308b54d2951b762a9850a4bc2739ca23ce0d0cf3ef5cbb7caeb6
+  data.tar.gz: d6dfa8ffa29cf4ac9b2641f87ab7322f4455483e63f4e0ab0f64d57c88d26845177a59dfc990c0a7aa86752cde0b1e4590a50f6247d4e4599d66e946953efb2b

data/VERSION

@@ -1 +1 @@
-0.12.3
+0.13.0

data/bin/kontena

@@ -14,6 +14,7 @@ require 'clamp'
 require 'ruby_dig'
 require 'kontena/client'
 require 'kontena/cli/common'
+require 'kontena/cli/bytes_helper'
 require 'kontena/cli/grid_options'
 require 'kontena/cli/app_command'
 require 'kontena/cli/register_command'
@@ -34,6 +35,7 @@ require 'kontena/cli/external_registry_command'
 require 'kontena/cli/app_command'
 require 'kontena/cli/etcd_command'
 require 'kontena/cli/vault_command'
+require 'kontena/cli/user_command'
 require 'kontena/cli/version_command'
 
 class MainCommand < Clamp::Command
@@ -53,9 +55,7 @@ class MainCommand < Clamp::Command
   subcommand "login", "Login to Kontena Master", Kontena::Cli::LoginCommand
   subcommand "logout", "Logout from Kontena Master", Kontena::Cli::LogoutCommand
   subcommand "whoami", "Shows current logged in user", Kontena::Cli::WhoamiCommand
-  subcommand "verify-account", "Verify registered account", Kontena::Cli::VerifyAccountCommand
-  subcommand "forgot-password", "Request password reset for Kontena account", Kontena::Cli::ForgotPasswordCommand
-  subcommand "reset-password", "Reset Kontena account password", Kontena::Cli::ResetPasswordCommand
+  subcommand "user", "User related commands", Kontena::Cli::UserCommand
   subcommand "version", "Show version", Kontena::Cli::VersionCommand
 
   def execute
@@ -77,6 +77,8 @@ rescue => exc
   if ENV['DEBUG']
     raise exc
   else
-    abort(exc.message)
+    puts "Kontena error: #{exc.message}"
+    puts "Rerun the command with environment DEBUG=true set to get full the exception"
+    abort()
   end
 end

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

@@ -75,7 +75,8 @@ module Kontena::Cli::Apps
     # @return [Hash]
     def extend_options(options, file, service_name, prefix)
       parent_options = parse_services(file, service_name, prefix)
-      options['environment'] = extend_env_vars(parent_options, options)
+      options['environment'] = extend_env_vars(parent_options['environment'], options['environment'])
+      options['secrets'] = extend_secrets(parent_options['secrets'], options['secrets'])
       parent_options.merge(options)
     end
 
@@ -86,19 +87,32 @@ module Kontena::Cli::Apps
       end
     end
 
-    # @param [Hash] from
-    # @param [Hash] to
+    # @param [Array] from
+    # @param [Array] to
     # @return [Array]
     def extend_env_vars(from, to)
-      env_vars = to['environment'] || []
-      if from['environment']
-        from['environment'].each do |env|
-          env_vars << env unless to['environment'] && to['environment'].find {|key| key.split('=').first == env.split('=').first}
+      env_vars = to || []
+      if from
+        from.each do |env|
+          env_vars << env unless to && to.find {|key| key.split('=').first == env.split('=').first}
         end
       end
       env_vars
     end
 
+    # @param [Array] from
+    # @param [Array] to
+    # @return [Array]
+    def extend_secrets(from, to)
+      secrets = to || []
+      if from
+        from.each do |from_secret|
+          secrets << from_secret unless to && to.any? {|to_secret| to_secret['secret'] == from_secret['secret']}
+        end
+      end
+      secrets
+    end
+
     # @param [Hash] services
     # @param [String] file
     def create_yml(services, file = 'kontena.yml')

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

@@ -149,8 +149,8 @@ module Kontena::Cli::Apps
       data[:container_count] = options['instances']
       data[:links] = parse_links(options['links'] || [])
       data[:ports] = parse_ports(options['ports'] || [])
-      data[:memory] = parse_memory(options['mem_limit']) if options['mem_limit']
-      data[:memory_swap] = parse_memory(options['memswap_limit']) if options['memswap_limit']
+      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'] || []
@@ -169,8 +169,15 @@ module Kontena::Cli::Apps
       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')
+      if deploy_opts.has_key?('wait_for_port')
+        deploy[:wait_for_port] = deploy_opts['wait_for_port']
+      end
+      if deploy_opts.has_key?('min_health')
+        deploy[:min_health] = deploy_opts['min_health']
+      end
+      if deploy_opts.has_key?('interval')
+        deploy[:interval] = parse_relative_time(deploy_opts['interval'])
+      end
       unless deploy.empty?
         data[:deploy_opts] = deploy
       end

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

@@ -15,6 +15,10 @@ module Kontena::Cli::Apps
           dockerfile = service['dockerfile'] || 'Dockerfile'
           abort("'#{service['image']}' is not valid Docker image name") unless validate_image_name(service['image'])
           abort("'#{service['build']}' does not have #{dockerfile}") unless dockerfile_exist?(service['build'], dockerfile)
+          if service['hooks'] && service['hooks']['pre_build']
+            puts "Running pre_build hook".colorize(:cyan)
+            run_pre_build_hook(service['hooks']['pre_build'])
+          end
           puts "Building image #{service['image'].colorize(:cyan)}"
           build_docker_image(service['image'], service['build'], dockerfile, no_cache)
           puts "Pushing image #{service['image'].colorize(:cyan)} to registry"
@@ -65,5 +69,13 @@ module Kontena::Cli::Apps
       file = File.join(File.expand_path(path), dockerfile)
       File.exist?(file)
     end
+
+    # @param [Hash] hook
+    def run_pre_build_hook(hook)
+      hook.each do |h|
+        ret = system(h['cmd'])
+        abort("Failed to run pre_build hook: #{h['name']}!".colorize(:red)) unless ret
+      end
+    end
   end
 end

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

@@ -10,7 +10,6 @@ module Kontena::Cli::Apps
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
     option ["-l", "--lines"], "LINES", "How many lines to show", default: '100'
     option "--since", "SINCE", "Show logs since given timestamp"
-    option ["-s", "--search"], "SEARCH", "Search from logs"
     option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
     parameter "[SERVICE] ...", "Show only specified service logs"
 
@@ -36,7 +35,6 @@ module Kontena::Cli::Apps
         query_params << "from=#{last_id}" unless last_id.nil?
         query_params << "limit=#{lines}"
         query_params << "since=#{since}" if !since.nil? && last_id.nil?
-        query_params << "search=#{search}" if search
         logs = []
         services.each do |service_name, opts|
           service = get_service(token, prefixed_name(service_name)) rescue false

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

@@ -28,34 +28,43 @@ module Kontena::Cli::Apps
 
     end
 
+    private
     def remove_services(services)
       services.find_all {|service_name, options| options['links'] && options['links'].size > 0 }.each do |service_name, options|
-        delete(service_name, options)
+        delete(service_name, options, false)
         services.delete(service_name)
-        sleep 1
       end
       services.each do |service_name, options|
         delete(service_name, options)
       end
     end
 
-    def delete(name, options)
+    def delete(name, options, async = true)
       unless deleted_services.include?(name)
-        print "deleting #{name}"
-        service = get_service(token, prefixed_name(name)) rescue nil
-
-        if(!service.nil?)
-          print "."
-          delete_service(token, prefixed_name(name))
-          print ". done"
-          deleted_services << name
-          puts ''
-        else
-          puts "No such service: #{name}".colorize(:red)
+        print "deleting #{name.colorize(:cyan)}"
+        ShellSpinner " " do
+          service = get_service(token, prefixed_name(name)) rescue nil
+          if(service)
+            delete_service(token, prefixed_name(name))
+            unless async
+              wait_for_delete_to_finish(service)
+            end
+            deleted_services << name
+          else
+            puts "No such service: #{name}".colorize(:red)
+          end
         end
       end
     end
 
+    def wait_for_delete_to_finish(service)
+      until service.nil?
+        service = get_service(token, service['name']) rescue nil
+        sleep 0.5
+      end
+    end
+
+
     ##
     #
     # @return [Array]

data/lib/kontena/cli/bytes_helper.rb

@@ -0,0 +1,40 @@
+module Kontena
+  module Cli
+    module BytesHelper
+
+      KILOBYTE = 1024
+      MEGABYTE = KILOBYTE * 1024
+      GIGABYTE = MEGABYTE * 1024
+      TERABYTE = GIGABYTE * 1024
+
+      def to_kilobytes(bytes, ndigits=nil)
+        return 0.0 if bytes.nil?
+        round(bytes.to_f / KILOBYTE, ndigits)
+      end
+
+      def to_megabytes(bytes, ndigits=nil)
+        return 0.0 if bytes.nil?
+        round(bytes.to_f / MEGABYTE, ndigits)
+      end
+
+      def to_gigabytes(bytes, ndigits=nil)
+        return 0.0 if bytes.nil?
+        round(bytes.to_f / GIGABYTE, ndigits)
+      end
+
+      def to_terabytes(bytes, ndigits)
+        return 0.0 if bytes.nil?
+        round(bytes.to_f / TERABYTE, ndigits)
+      end
+
+      private
+      def round(value, ndigits=nil)
+        if ndigits.nil?
+          return value
+        end
+        value.round(ndigits)
+      end
+
+    end
+  end
+end

data/lib/kontena/cli/container_command.rb

@@ -4,7 +4,6 @@ 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

data/lib/kontena/cli/grid_command.rb

@@ -8,10 +8,9 @@ require_relative 'grids/remove_command'
 require_relative 'grids/current_command'
 require_relative 'grids/env_command'
 require_relative 'grids/audit_log_command'
-require_relative 'grids/list_users_command'
-require_relative 'grids/add_user_command'
-require_relative 'grids/remove_user_command'
+require_relative 'grids/user_command'
 require_relative 'grids/cloud_config_command'
+require_relative 'grids/trusted_subnet_command'
 
 class Kontena::Cli::GridCommand < Clamp::Command
 
@@ -25,10 +24,9 @@ class Kontena::Cli::GridCommand < Clamp::Command
   subcommand "current", "Show current grid details", Kontena::Cli::Grids::CurrentCommand
   subcommand "env", "Show the current grid environment details", Kontena::Cli::Grids::EnvCommand
   subcommand "audit-log", "Show audit log of the current grid", Kontena::Cli::Grids::AuditLogCommand
-  subcommand "list-users", "List current grid users", Kontena::Cli::Grids::ListUsersCommand
-  subcommand "add-user", "Add user to the current grid", Kontena::Cli::Grids::AddUserCommand
-  subcommand "remove-user", "Remove user from the current grid", Kontena::Cli::Grids::RemoveUserCommand
+  subcommand "user", "User specific commands", Kontena::Cli::Grids::UserCommand
   subcommand "cloud-config", "Generate cloud-config", Kontena::Cli::Grids::CloudConfigCommand
+  subcommand "trusted-subnet", "Trusted subnet related commands", Kontena::Cli::Grids::TrustedSubnetCommand
 
   def execute
   end

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

@@ -3,7 +3,6 @@ module Kontena::Cli::Grids
     include Kontena::Cli::Common
 
     option ["-t", "--tail"], :flag, "Tail (follow) 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 "--since", "SINCE", "Show logs since given timestamp"
     option "--node", "NODE", "Filter by node name", multivalued: true
@@ -18,7 +17,6 @@ module Kontena::Cli::Grids
       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
       query_params[:since] = since if since
 

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

@@ -0,0 +1,12 @@
+module Kontena::Cli::Grids
+
+  require_relative 'trusted_subnets/list_command'
+  require_relative 'trusted_subnets/add_command'
+  require_relative 'trusted_subnets/remove_command'
+
+  class TrustedSubnetCommand < Clamp::Command
+    subcommand ["list", "ls"], "List trusted subnets", TrustedSubnets::ListCommand
+    subcommand "add", "Add trusted subnet", TrustedSubnets::AddCommand
+    subcommand ["remove", "rm"], "Remove trusted subnet", TrustedSubnets::RemoveCommand
+  end
+end

data/lib/kontena/cli/grids/trusted_subnets/add_command.rb

@@ -0,0 +1,16 @@
+module Kontena::Cli::Grids::TrustedSubnets
+  class AddCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NAME", "Grid name"
+    parameter "SUBNET", "Trusted subnet"
+
+    def execute
+      require_api_url
+      token = require_token
+      grid = client(token).get("grids/#{name}")
+      data = {trusted_subnets: grid['trusted_subnets'] + [self.subnet]}
+      client(token).put("grids/#{name}", data)
+    end
+  end
+end

data/lib/kontena/cli/grids/trusted_subnets/list_command.rb

@@ -0,0 +1,17 @@
+module Kontena::Cli::Grids::TrustedSubnets
+  class ListCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NAME", "Grid name"
+
+    def execute
+      require_api_url
+      token = require_token
+      grid = client(token).get("grids/#{current_grid}")
+      trusted_subnets = grid['trusted_subnets'] || []
+      trusted_subnets.each do |subnet|
+        puts subnet
+      end
+    end
+  end
+end

data/lib/kontena/cli/grids/trusted_subnets/remove_command.rb

@@ -0,0 +1,20 @@
+module Kontena::Cli::Grids::TrustedSubnets
+  class RemoveCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "NAME", "Grid name"
+    parameter "SUBNET", "Trusted subnet"
+
+    def execute
+      require_api_url
+      token = require_token
+      grid = client(token).get("grids/#{name}")
+      trusted_subnets = grid['trusted_subnets'] || []
+      unless trusted_subnets.delete(self.subnet)
+        abort("Grid does not have trusted subnet #{self.subnet}")
+      end
+      data = {trusted_subnets: trusted_subnets}
+      client(token).put("grids/#{name}", data)
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Kontena::Cli::Grids
+
+  require_relative 'users/list_command'
+  require_relative 'users/add_command'
+  require_relative 'users/remove_command'
+
+  class UserCommand < Clamp::Command
+    subcommand ["list", "ls"], "List grid users", Users::ListCommand
+    subcommand "add", "Add user to grid", Users::AddCommand
+    subcommand ["remove", "rm"], "Remove user from grid", Users::RemoveCommand
+  end
+end

data/lib/kontena/cli/grids/{add_user_command.rb → users/add_command.rb}

@@ -1,10 +1,10 @@
-require_relative 'common'
+require_relative '../common'
 
-module Kontena::Cli::Grids
-  class AddUserCommand < Clamp::Command
+module Kontena::Cli::Grids::Users
+  class AddCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include Common
+    include Kontena::Cli::Grids::Common
 
     parameter "EMAIL", "Email address"
 

data/lib/kontena/cli/grids/{list_users_command.rb → users/list_command.rb}

@@ -1,9 +1,9 @@
-require_relative 'common'
+require_relative '../common'
 
-module Kontena::Cli::Grids
-  class ListUsersCommand < Clamp::Command
+module Kontena::Cli::Grids::Users
+  class ListCommand < Clamp::Command
     include Kontena::Cli::Common
-    include Common
+    include Kontena::Cli::Grids::Common
 
     def execute
       require_api_url