kontena-cli 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da142dfc08d132509576f6528f71e4b7989ff75b
-  data.tar.gz: bbedea611445eb276e445b6f0b2347f649ace193
+  metadata.gz: 13295c1c17a8bc5e8a328ba103a1ce03d22f083e
+  data.tar.gz: d1c228f5eb5decefb19bf73892858161f69da2ad
 SHA512:
-  metadata.gz: 6c95f56157dd5994f2ef75853e3a4e07a0da432534f0840103347a8448bdf6379240a870db2d5fe32b8c61b3755c46e4a9b0c113f8fbd6ba1d9c483d6c51b438
-  data.tar.gz: ce206e77d23bd77af044692285cb5ba487fe91934c9bcb523590f64023851ebb777ebf0a0e56fcb3b34b63e8f7f77ae398465fcb22c5d5fcbc84f897a34ad89d
+  metadata.gz: cac1ed8d7f6c2f44621b7d3ccef67555b732a20e89e8213d9651f66c7b3b0f894826d7f25d176185600045c85b0b543cc23e4f10e0bd481c7b5dc626f7914b79
+  data.tar.gz: 770733acf831c0f155289952ec31a03cfbcbc1b3acb45ed7cce7d4bceee8e51c89c0ab68ba9451a90e174016725278ae72918db48aad11a26beb1cc9899c0cb5

data/VERSION

@@ -1 +1 @@
-0.13.4
+0.14.0

data/kontena-cli.gemspec

@@ -28,4 +28,6 @@ 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-logic', "0.2.2"  
 end

data/lib/kontena/cli/app_command.rb

@@ -1,5 +1,6 @@
 require_relative 'apps/init_command'
 require_relative 'apps/build_command'
+require_relative 'apps/config_command'
 require_relative 'apps/deploy_command'
 require_relative 'apps/start_command'
 require_relative 'apps/stop_command'
@@ -15,6 +16,7 @@ class Kontena::Cli::AppCommand < Clamp::Command
 
   subcommand "init", "Init Kontena application", Kontena::Cli::Apps::InitCommand
   subcommand "build", "Build Kontena services", Kontena::Cli::Apps::BuildCommand
+  subcommand "config", "View service configurations", Kontena::Cli::Apps::ConfigCommand
   subcommand "deploy", "Deploy Kontena services", Kontena::Cli::Apps::DeployCommand
   subcommand "scale", "Scale services", Kontena::Cli::Apps::ScaleCommand
   subcommand "start", "Start services", Kontena::Cli::Apps::StartCommand

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

@@ -1,5 +1,8 @@
 require 'yaml'
 require_relative '../services/services_helper'
+require_relative './service_generator'
+require_relative './service_generator_v2'
+require_relative './yaml/reader'
 
 module Kontena::Cli::Apps
   module Common
@@ -13,12 +16,55 @@ module Kontena::Cli::Apps
     # @param [Array<String>] service_list
     # @param [String] prefix
     # @return [Hash]
-    def load_services(filename, service_list, prefix)
-      services = parse_services(filename, nil, prefix)
-      services.delete_if { |name, service| !service_list.include?(name)} unless service_list.empty?
+    def services_from_yaml(filename, service_list, prefix)
+      set_env_variables(prefix, current_grid)
+      reader = YAML::Reader.new(filename)
+      outcome = reader.execute
+      hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0
+      abort_on_validation_errors(outcome[:errors]) if outcome[:errors].size > 0
+      kontena_services = generate_services(outcome[:services], outcome[:version])
+      kontena_services.delete_if { |name, service| !service_list.include?(name)} unless service_list.empty?
+      kontena_services
+    end
+
+    ##
+    # @param [Hash] yaml
+    # @param [String] version
+    # @return [Hash]
+    def generate_services(yaml_services, version)
+      services = {}
+      if version == '2'
+        generator_klass = ServiceGeneratorV2
+      else
+        generator_klass = ServiceGenerator
+      end
+      yaml_services.each do |service_name, config|
+        abort("Image is missing for #{service_name}. Aborting.") unless config['image']
+        services[service_name] = generator_klass.new(config).generate
+      end
       services
     end
 
+    def set_env_variables(project, grid)
+      ENV['project'] = project
+      ENV['grid'] = grid
+    end
+
+    def service_prefix
+      @service_prefix ||= project_name || project_name_from_yaml(filename) || current_dir
+    end
+
+    def project_name_from_yaml(file)
+      reader = YAML::Reader.new(file, true)
+      outcome = reader.execute      
+      if outcome[:version] == '2'
+        outcome[:name]
+      else
+        nil
+      end
+    end
+
+
     # @return [String]
     def token
       @token ||= require_token
@@ -28,7 +74,6 @@ module Kontena::Cli::Apps
     # @return [String]
     def prefixed_name(name)
       return name if service_prefix.strip == ""
-
       "#{service_prefix}-#{name}"
     end
 
@@ -43,76 +88,6 @@ module Kontena::Cli::Apps
       get_service(token, prefixed_name(name)) rescue false
     end
 
-    # @param [String] file
-    # @param [String,NilClass] name
-    # @param [String] prefix
-    # @return [Hash]
-    def parse_services(file, name = nil, prefix = '')
-      services = YAML.load(File.read(File.expand_path(file)) % {project: prefix, grid: current_grid})
-      Dir.chdir(File.dirname(File.expand_path(file))) do
-        services.each do |name, options|
-          normalize_env_vars(options)
-          if options.has_key?('extends')
-            extension_file = options['extends']['file']
-            service_name =  options['extends']['service']
-            options.delete('extends')
-            services[name] = extend_options(options, extension_file , service_name, prefix)
-          end
-        end
-      end
-      if name.nil?
-        services
-      else
-        abort("Service #{name} not found in #{file}") unless services.has_key?(name)
-        services[name]
-      end
-    end
-
-    # @param [Hash] options
-    # @param [String] file
-    # @param [String] service_name
-    # @param [String] prefix
-    # @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['environment'], options['environment'])
-      options['secrets'] = extend_secrets(parent_options['secrets'], options['secrets'])
-      parent_options.merge(options)
-    end
-
-    # @param [Hash] options
-    def normalize_env_vars(options)
-      if options['environment'].is_a?(Hash)
-        options['environment'] = options['environment'].map{|k, v| "#{k}=#{v}"}
-      end
-    end
-
-    # @param [Array] from
-    # @param [Array] to
-    # @return [Array]
-    def extend_env_vars(from, to)
-      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')
@@ -131,6 +106,37 @@ module Kontena::Cli::Apps
       @app_json
     end
 
+    def display_notifications(messages, color = :yellow)
+      messages.each do |files|
+        files.each do |file, services|
+          STDERR.puts "#{file}:".colorize(color)
+          services.each do |service|
+            service.each do |name, errors|
+              STDERR.puts "  #{name}:".colorize(color)
+              if errors.is_a?(String)
+                STDERR.puts "    - #{errors}".colorize(color)
+              else
+                errors.each do |key, error|
+                  STDERR.puts "    - #{key}: #{error.to_json}".colorize(color)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    def hint_on_validation_notifications(errors)
+      STDERR.puts "YAML contains the following unsupported options and they were rejected:".colorize(:yellow)
+      display_notifications(errors)
+    end
+
+    def abort_on_validation_errors(errors)
+      STDERR.puts "YAML validation failed! Aborting.".colorize(:red)
+      display_notifications(errors, :red)
+      abort
+    end
+
     def valid_addons(prefix=nil)
       if prefix
         prefix = "#{prefix}-"

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

@@ -0,0 +1,29 @@
+require_relative 'common'
+require 'pp'
+
+module Kontena::Cli::Apps
+  class ConfigCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Common
+
+    option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
+    option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+
+    parameter "[SERVICE] ...", "Services to view"
+
+    attr_reader :service_prefix
+
+    def execute
+      require_config_file(filename)
+      @service_prefix = project_name || current_dir
+      services = services_from_yaml(filename, service_list, service_prefix)
+      services.each do |name, config|
+        config['cmd'] = config['cmd'].join(" ") if config['cmd']
+        config.delete_if {|key, value| value.nil? || (value.respond_to?(:empty?) && value.empty?) }
+      end
+      services = { 'services' => services }
+      puts services.to_yaml
+    end
+  end
+end

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

@@ -17,15 +17,14 @@ module Kontena::Cli::Apps
 
     parameter "[SERVICE] ...", "Services to start"
 
-    attr_reader :services, :service_prefix, :deploy_queue
+    attr_reader :services, :deploy_queue
 
     def execute
       require_api_url
       require_token
       require_config_file(filename)
-      @deploy_queue = []
-      @service_prefix = project_name || current_dir
-      @services = load_services(filename, service_list, service_prefix)
+      @deploy_queue = []      
+      @services = services_from_yaml(filename, service_list, service_prefix)
       process_docker_images(services) if !no_build?
       create_or_update_services(services)
       deploy_services(deploy_queue)
@@ -60,19 +59,19 @@ module Kontena::Cli::Apps
     # @param [Hash] options
     def create_or_update_service(name, options)
       # skip if service is already processed or it's not present
-      return nil if in_deploy_queue?(name) || !services.keys.include?(name)
+      return nil if in_deploy_queue?(name) || !services.key?(name)
 
       # create/update linked services recursively before continuing
-      unless options['links'].nil?
-        parse_links(options['links']).each_with_index do |linked_service, index|
+      unless options['links'].empty?
+        options['links'].each_with_index do |linked_service, index|
           # change prefixed service name also to links options
-          options['links'][index] = "#{prefixed_name(linked_service[:name])}:#{linked_service[:alias]}"
-          create_or_update_service(linked_service[:name], services[linked_service[:name]]) unless in_deploy_queue?(linked_service[:name])
+          linked_service_name = linked_service['name']
+          options['links'][index]['name'] = "#{prefixed_name(linked_service['name'])}"
+          create_or_update_service(linked_service_name, services[linked_service_name]) unless in_deploy_queue?(linked_service_name)
         end
       end
 
       merge_external_links(options)
-      merge_env_vars(options)
 
       if service_exists?(name)
         service = update(name, options)
@@ -93,8 +92,8 @@ module Kontena::Cli::Apps
     def create(name, options)
       puts "creating #{name.colorize(:cyan)}"
       name = prefixed_name(name)
-      data = {name: name}
-      data.merge!(parse_data(options))
+      data = { 'name' => name }
+      data.merge!(options)
       create_service(token, current_grid, data)
     end
 
@@ -103,8 +102,7 @@ module Kontena::Cli::Apps
     def update(id, options)
       puts "updating #{id.colorize(:cyan)}"
       id = prefixed_name(id)
-      data = parse_data(options)
-      update_service(token, id, data)
+      update_service(token, id, options)
     end
 
     # @param [String] name
@@ -122,20 +120,6 @@ module Kontena::Cli::Apps
       end
     end
 
-    # @param [Hash] options
-    def merge_env_vars(options)
-      return unless options['env_file']
-
-      options['env_file'] = [options['env_file']] if options['env_file'].is_a?(String)
-      options['environment'] = [] unless options['environment']
-
-      options['env_file'].each do |env_file|
-        options['environment'].concat(read_env_file(env_file))
-      end
-
-      options['environment'].uniq! {|s| s.split('=').first}
-    end
-
     # @param [Hash] options
     def merge_external_links(options)
       if options['external_links']
@@ -144,58 +128,5 @@ module Kontena::Cli::Apps
         options.delete('external_links')
       end
     end
-
-    # @param [String] path
-    def read_env_file(path)
-      File.readlines(path).delete_if { |line| line.start_with?('#') || line.empty? }
-    end
-
-    ##
-    # @param [Hash] options
-    def parse_data(options)
-      data = {}
-      data[:image] = parse_image(options['image'])
-      data[:env] = options['environment']
-      data[:container_count] = options['instances']
-      data[:links] = parse_links(options['links'] || [])
-      data[:ports] = parse_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] = options['command'].split(" ") 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 = {}
-      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[:hooks] = options['hooks'] || {}
-      data[:secrets] = options['secrets'] if options['secrets']
-
-      data
-    end
   end
 end

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

@@ -12,15 +12,15 @@ module Kontena::Cli::Apps
 
       services.each do |name, service|
         if service['build'] && (!image_exist?(service['image']) || force_build)
-          dockerfile = service['dockerfile'] || 'Dockerfile'
+          dockerfile = service['build']['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)
+          abort("'#{service['build']['context']}' does not have #{dockerfile}") unless dockerfile_exist?(service['build']['context'], 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)
+          build_docker_image(service['image'], service['build']['context'], dockerfile, no_cache)
           puts "Pushing image #{service['image'].colorize(:cyan)} to registry"
           push_docker_image(service['image'])
         end

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

@@ -15,13 +15,10 @@ module Kontena::Cli::Apps
     option ["-b", "--base-image"], "BASE_IMAGE_NAME", "Specify a docker base image name", default: "kontena/buildstep"
     option ["-p", "--project-name"], "NAME", "Specify an alternate project name (default: directory name)"
 
-    attr_reader :service_prefix
 
     def execute
       require 'highline/import'
 
-      @service_prefix = project_name || File.basename(Dir.getwd)
-
       if File.exist?('Dockerfile')
         puts 'Found Dockerfile'
       elsif create_dockerfile?

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

@@ -11,13 +11,12 @@ module Kontena::Cli::Apps
 
     parameter "[SERVICE] ...", "Services to start"
 
-    attr_reader :services, :service_prefix
+    attr_reader :services
 
     def execute
       require_config_file(filename)
 
-      @service_prefix = project_name || current_dir
-      @services = load_services(filename, service_list, service_prefix)
+      @services = services_from_yaml(filename, service_list, service_prefix)
       if services.size > 0
         show_services(services)
       elsif !service_list.empty?