kontena-cli 0.14.7 → 0.15.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d545f80b75358410ec8c63e5dab5c812b26a5f7
-  data.tar.gz: dbe846306bd4acb2e9553ae3cb10e818577eaae8
+  metadata.gz: d2097ac9b19a1b3ffe77759d51f750de06bab2af
+  data.tar.gz: 0484b872ce20c995506cba6cc651716b7a4ffec3
 SHA512:
-  metadata.gz: 6eb29482b3ca4974650f298e1ddd08e15743fba9fe65bd22cd32cfce918de3c6718920b3cde4ec1981d5b5147d1dcf5d278c41ccf45c3ed43c3db3ff38aa3c3f
-  data.tar.gz: c9962f99d9a34403912c449ef6037f27b523c6c22fe511f767f30b8bf56c3fed41a8223c6425be4bcad2858fb482bc97816bccc07d89afe7c9debdcd3d71d8a5
+  metadata.gz: 6fce1e0c1cac772357d580e0c05284130ad1632a234c47e48f722028d37bc5ec6c025628e343fe5cc6567e9703775c64bd04a34e46ee71d072c52525d1ace02e
+  data.tar.gz: 929389765338d0c8db3dbc56973052f4cb5b7c384ea37f6ba2125a393436b83260161c1ff9aa0111aa1f6446e1afe8d9fe3cd5a7f6ccb2928e7369ef03938421

data/Gemfile

@@ -4,4 +4,5 @@ source 'https://rubygems.org'
 gemspec
 group :development, :test do
   gem "rspec"
-end
+  gem "kontena-plugin-hello", path: "./examples/kontena-plugin-hello"
+end

data/VERSION

@@ -1 +1 @@
-0.14.7
+0.15.0.rc1

data/bin/kontena

@@ -8,59 +8,12 @@ bin_file = Pathname.new(__FILE__).realpath
 # add self to libpath
 $:.unshift File.expand_path('../../lib', bin_file)
 
+require 'kontena_cli'
 STDOUT.sync = true
 
-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'
-require 'kontena/cli/login_command'
-require 'kontena/cli/logout_command'
-require 'kontena/cli/whoami_command'
-require 'kontena/cli/container_command'
-require 'kontena/cli/grid_command'
-require 'kontena/cli/master_command'
-require 'kontena/cli/node_command'
-require 'kontena/cli/service_command'
-require 'kontena/cli/vpn_command'
-require 'kontena/cli/registry_command'
-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
-
-  subcommand "grid", "Grid specific commands", Kontena::Cli::GridCommand
-  subcommand "app", "App specific commands", Kontena::Cli::AppCommand
-  subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
-  subcommand "vault", "Vault specific commands", Kontena::Cli::VaultCommand
-  subcommand "node", "Node specific commands", Kontena::Cli::NodeCommand
-  subcommand "master", "Master specific commands", Kontena::Cli::MasterCommand
-  subcommand "vpn", "VPN specific commands", Kontena::Cli::VpnCommand
-  subcommand "registry", "Registry specific commands", Kontena::Cli::RegistryCommand
-  subcommand "container", "Container specific commands", Kontena::Cli::ContainerCommand
-  subcommand "etcd", "Etcd specific commands", Kontena::Cli::EtcdCommand
-  subcommand "external-registry", "External registry specific commands", Kontena::Cli::ExternalRegistryCommand
-  subcommand "register", "Register Kontena Account", Kontena::Cli::RegisterCommand
-  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 "user", "User related commands", Kontena::Cli::UserCommand
-  subcommand "version", "Show version", Kontena::Cli::VersionCommand
-
-  def execute
-  end
-end
-
 begin
-  MainCommand.run
+  Kontena::PluginManager.instance.load_plugins
+  Kontena::MainCommand.run
 rescue Excon::Errors::SocketError => exc
   if exc.message.include?('Unable to verify certificate')
     $stderr.puts "The server uses a certificate signed by an unknown authority.".colorize(:red)

data/examples/kontena-plugin-hello/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/examples/kontena-plugin-hello/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in kontena-plugin-hello.gemspec
+gemspec

data/examples/kontena-plugin-hello/README.md

@@ -0,0 +1,3 @@
+# Kontena Hello World Plugin
+
+Just an example how to write Kontena cli plugins.

data/examples/kontena-plugin-hello/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "kontena/plugin/hello"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/examples/kontena-plugin-hello/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/examples/kontena-plugin-hello/kontena-plugin-hello.gemspec

@@ -0,0 +1,22 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'kontena/plugin/hello'
+
+Gem::Specification.new do |spec|
+  spec.name          = "kontena-plugin-hello"
+  spec.version       = Kontena::Plugin::Hello::VERSION
+  spec.authors       = ["Kontena, Inc."]
+  spec.email         = ["info@kontena.io"]
+
+  spec.summary       = "Kontena hello world plugin"
+  spec.description   = "This plugin is just an example"
+  spec.homepage      = "https://github.com/kontena/kontena/cli/examples/kontena-plugin-hello"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency 'kontena-cli', '~> 0.14', '>= 0.14.0'
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

data/examples/kontena-plugin-hello/lib/kontena/plugin/hello.rb

@@ -0,0 +1,7 @@
+module Kontena
+  module Plugin
+    module Hello
+      VERSION = '0.1.0'
+    end
+  end
+end

data/examples/kontena-plugin-hello/lib/kontena/plugin/hello/world_command.rb

@@ -0,0 +1,6 @@
+class Kontena::Plugin::Hello::WorldCommand < Kontena::Command
+
+  def execute
+    puts "hello world!"
+  end
+end

data/examples/kontena-plugin-hello/lib/kontena/plugin/hello_command.rb

@@ -0,0 +1,9 @@
+require_relative 'hello/world_command'
+
+class Kontena::Plugin::HelloCommand < Kontena::Command
+
+  subcommand 'world', 'Hello world related commands', Kontena::Plugin::Hello::WorldCommand
+
+  def execute
+  end
+end

data/examples/kontena-plugin-hello/lib/kontena_cli_plugin.rb

@@ -0,0 +1,5 @@
+require 'kontena_cli'
+require_relative 'kontena/plugin/hello'
+require_relative 'kontena/plugin/hello_command'
+
+Kontena::MainCommand.register("hello", "Hello specific commands", Kontena::Plugin::HelloCommand)

data/kontena-cli.gemspec

@@ -28,7 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "highline"
   spec.add_runtime_dependency "shell-spinner"
   spec.add_runtime_dependency "ruby_dig"
-  spec.add_runtime_dependency "dry-validation", "0.7.4"
-  spec.add_runtime_dependency "dry-types", "0.7.1"
-  spec.add_runtime_dependency "dry-logic", "0.2.2"
+  spec.add_runtime_dependency "dry-validation", "~> 0.8.0"
 end

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

@@ -17,6 +17,9 @@ module Kontena::Cli::Apps
     def execute
       require_config_file(filename)
       @services = services_from_yaml(filename, service_list, service_prefix)
+      if services.none?{ |name, service| service['build'] }
+        abort 'Not found any service with build option'.colorize(:red)
+      end
       process_docker_images(services, true, no_cache?)
     end
   end

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

@@ -45,6 +45,12 @@ module Kontena::Cli::Apps
       services
     end
 
+    def read_yaml(filename)
+      reader = YAML::Reader.new(filename)
+      outcome = reader.execute
+      outcome
+    end
+
     def set_env_variables(project, grid)
       ENV['project'] = project
       ENV['grid'] = grid
@@ -64,7 +70,6 @@ module Kontena::Cli::Apps
       end
     end
 
-
     # @return [String]
     def token
       @token ||= require_token

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

@@ -23,7 +23,7 @@ module Kontena::Cli::Apps
       require_api_url
       require_token
       require_config_file(filename)
-      @deploy_queue = []      
+      @deploy_queue = []
       @services = services_from_yaml(filename, service_list, service_prefix)
       process_docker_images(services) if !no_build?
       create_or_update_services(services)

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

@@ -5,11 +5,6 @@ module Kontena::Cli::Apps
     # @param [Boolean] force_build
     # @param [Boolean] no_cache
     def process_docker_images(services, force_build = false, no_cache = false)
-      if services.none?{|name, service| service['build']}
-        puts "Not found any service with build option"
-        return
-      end
-
       services.each do |name, service|
         if service['build'] && (!image_exist?(service['image']) || force_build)
           dockerfile = service['build']['dockerfile'] || 'Dockerfile'
@@ -20,7 +15,7 @@ module Kontena::Cli::Apps
             run_pre_build_hook(service['hooks']['pre_build'])
           end
           puts "Building image #{service['image'].colorize(:cyan)}"
-          build_docker_image(service['image'], service['build']['context'], dockerfile, no_cache)
+          build_docker_image(service, no_cache)
           puts "Pushing image #{service['image'].colorize(:cyan)} to registry"
           push_docker_image(service['image'])
         end
@@ -33,18 +28,22 @@ module Kontena::Cli::Apps
       !(/^[\w.\/\-:]+:?+[\w+.]+$/ =~ name).nil?
     end
 
-    # @param [String] name
-    # @param [String] path
-    # @param [String] dockerfile
+    # @param [Hash] service
     # @param [Boolean] no_cache
     # @return [Integer]
-    def build_docker_image(name, path, dockerfile, no_cache=false)
-      cmd = ["docker build -t #{name}"]
-      cmd << "-f #{File.join(File.expand_path(path), dockerfile)}" if dockerfile != "Dockerfile"
+    def build_docker_image(service, no_cache = false)
+      dockerfile = dockerfile = service['build']['dockerfile'] || 'Dockerfile'
+      build_context = service['build']['context']
+      cmd = ["docker build -t #{service['image']}"]
+      cmd << "-f #{File.join(File.expand_path(build_context), dockerfile)}" if dockerfile != "Dockerfile"
       cmd << "--no-cache" if no_cache
-      cmd << path
+      args = service['build']['args'] || {}
+      args.each do |k, v|
+        cmd << "--build-arg #{k}=#{v}"
+      end
+      cmd << build_context
       ret = system(cmd.join(' '))
-      abort("Failed to build image #{name.colorize(:cyan)}") unless ret
+      abort("Failed to build image #{service['image'].colorize(:cyan)}") unless ret
       ret
     end
 

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

@@ -30,7 +30,7 @@ module Kontena::Cli::Apps
       data['container_count'] = options['instances']
       data['links'] = parse_links(options['links'] || [])
       data['external_links'] = parse_links(options['external_links'] || [])
-      data['ports'] = parse_ports(options['ports'] || [])
+      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']
@@ -59,6 +59,17 @@ module Kontena::Cli::Apps
       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
 
@@ -77,21 +88,18 @@ module Kontena::Cli::Apps
 
     # @param [String] path
     def read_env_file(path)
-      File.readlines(path).delete_if { |line| line.start_with?('#') || line.empty? }
+      File.readlines(path).delete_if { |line| line.start_with?('#') || line.strip.empty? }
     end
 
     # @param [Array<String>] port_options
     # @return [Array<Hash>]
-    def parse_ports(port_options)
-      port_options.map{|p|
-        node_port, container_port, protocol = p.split(':')
-        if node_port.nil? || container_port.nil?
-          raise ArgumentError.new("Invalid port value #{p}")
-        end
+    def parse_stringified_ports(port_options)
+      parse_ports(port_options).map {|p|
         {
-            'container_port' => container_port,
-            'node_port' => node_port,
-            'protocol' => protocol || 'tcp'
+          'ip' => p[:ip],
+          'container_port' => p[:container_port],
+          'node_port' => p[:node_port],
+          'protocol' => p[:protocol]
         }
       }
     end

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

@@ -20,6 +20,7 @@ module Kontena::Cli::Apps
       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

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

@@ -89,6 +89,7 @@ module Kontena::Cli::Apps
       # @param [Hash] service_config
       def process_config(service_config)
         normalize_env_vars(service_config)
+        normalize_build_args(service_config)
         service_config = extend_config(service_config) if service_config.key?('extends')
         service_config
       end
@@ -145,6 +146,20 @@ module Kontena::Cli::Apps
           options['environment'] = options['environment'].map { |k, v| "#{k}=#{v}" }
         end
       end
+      
+      # @param [Hash] options - service config
+      def normalize_build_args(options)
+        if v2? && options.dig('build', 'args')
+          if options['build']['args'].is_a?(Array)
+            args = options['build']['args'].dup
+            options['build']['args'] = {}
+            args.each do |arg|
+              k,v = arg.split('=')
+              options['build']['args'][k] = v
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -21,11 +21,29 @@ module Kontena::Cli::Apps
           from['secrets'],
           service_config['secrets']
         )
+        build_args = extend_build_args(safe_dig(from, 'build', 'args'), safe_dig(service_config, 'build', 'args'))
+        unless build_args.empty?
+          service_config['build'] = {} unless service_config['build']
+          service_config['build']['args'] = build_args
+        end
+        
         from.merge(service_config)
       end
 
       private
 
+      # Compatibility between ruby_dig and Ruby 2.3. Ruby_dig returns
+      # nil when trying to dig into a string, Ruby 2.3 dig raises
+      # TypeError.
+      #
+      # @param [Hash] source_hash
+      # @param [*keys] list_of_keys
+      def safe_dig(hash, *keys)
+        hash.dig(*keys)
+      rescue TypeError
+        nil
+      end
+
       # @param [Array] from
       # @param [Array] to
       # @return [Array]
@@ -55,6 +73,16 @@ module Kontena::Cli::Apps
         end
         secrets
       end
+
+      def extend_build_args(from, to)
+        args = to || {}
+        if from
+          from.each do |k,v|
+            args[k] = v unless args.has_key?(k)
+          end
+        end
+        args
+      end
     end
   end
 end

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

@@ -3,16 +3,18 @@ module Kontena::Cli::Apps::YAML
 
    def append_common_validations(base)
      base.optional('image').maybe(:str?)
+
      base.optional('extends').schema do
-       key('service').required(:str?)
-       optional('file') { str? }
-     end    
+       required('service').filled(:str?)
+       optional('file').value(:str?)
+     end
+
      base.optional('stateful') { bool? }
      base.optional('affinity') { array? { each { format?(/(?<=\!|\=)=/) } } }
-     base.optional('cap_add') { array? | none? }
-     base.optional('cap_drop') { array? | none? }
-     base.optional('command') { str? | none? }
-     base.optional('cpu_shares') { int? | none? }
+     base.optional('cap_add').maybe(:array?)
+     base.optional('cap_drop').maybe(:array?)
+     base.optional('command').maybe(:str?)
+     base.optional('cpu_shares').maybe(:int?)
      base.optional('external_links') { array? }
      base.optional('mem_limit') { int? | str? }
      base.optional('memswap_limit') { int? | str? }
@@ -20,30 +22,42 @@ module Kontena::Cli::Apps::YAML
      base.optional('env_file') { str? | array? }
      base.optional('instances') { int? }
      base.optional('links') { array? | empty? }
-     base.optional('ports') { array? }
-     base.optional('volumes') { array? }
-     base.optional('volumes_from') { array? }
+     base.optional('ports').value(:array?)
+     base.optional('volumes').value(:array?)
+     base.optional('volumes_from').value(:array?)
+
      base.optional('deploy').schema do
-       optional('strategy') { inclusion?(%w(ha daemon random)) }
-       optional('wait_for_port') { int? }
-       optional('min_health') { float? }
-       optional('interval') { format?(/^\d+(min|h|d|)$/) }
+       optional('strategy').value(included_in?: %w(ha daemon random))
+       optional('wait_for_port').value(:int?)
+       optional('min_health').value(:float?)
+       optional('interval').value(format?: /^\d+(min|h|d|)$/)
      end
+
      base.optional('hooks').schema do
        optional('post_start').each do
-         key('name').required
-         key('cmd').required
-         key('instances') { int? | eql?('*') }
-         optional('oneshot') { bool? }
+         required('name').filled
+         required('cmd').filled
+         required('instances') { int? | eql?('*') }
+         optional('oneshot').value(:bool?)
        end
+
        optional('pre_build').each do
-         key('cmd').required
+         required('cmd').filled
        end
      end
+
      base.optional('secrets').each do
-       key('secret').required
-       key('name').required
-       key('type').required
+       required('secret').filled
+       required('name').filled
+       required('type').filled
+     end
+     base.optional('health_check').schema do
+      required('protocol').filled(format?: /^(http|tcp)$/)
+      required('port').filled(:int?)
+      optional('uri').value(format?: /\/[\S]*/)
+      optional('timeout').value(:int?)
+      optional('interval').value(:int?)
+      optional('initial_delay').value(:int?)
      end
    end
 
@@ -59,7 +73,7 @@ module Kontena::Cli::Apps::YAML
    def validate_keys(service_config)
      errors = {}
      service_config.keys.each do |key|
-       error = validate_key(key)
+       error = validate_required(key)
        errors[key] = error if error
      end
      errors
@@ -67,7 +81,7 @@ module Kontena::Cli::Apps::YAML
 
    ##
    # @param [String] key
-   def validate_key(key)
+   def validate_required(key)
      if self.class::UNSUPPORTED_KEYS.include?(key)
        ['unsupported option']
      elsif !self.class::VALID_KEYS.include?(key)