kontena-cli 0.13.4 → 0.14.0

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

@@ -13,13 +13,12 @@ module Kontena::Cli::Apps
     option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
     parameter "[SERVICE] ...", "Show only specified service logs"
 
-    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_logs(services)
       elsif !service_list.empty?

data/lib/kontena/cli/apps/monitor_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_monitor(services)
       elsif !service_list.empty?

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

@@ -8,24 +8,24 @@ module Kontena::Cli::Apps
 
     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)'
+    option '--force', :flag, 'Force remove', default: false, attribute_name: :forced
 
     parameter "[SERVICE] ...", "Remove services"
 
-    attr_reader :services, :service_prefix
+    attr_reader :services
 
     def execute
       require_api_url
       require_token
       require_config_file(filename)
+      confirm unless forced?
 
-      @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
         remove_services(services)
       elsif !service_list.empty?
         puts "No such service: #{service_list.join(', ')}".colorize(:red)
       end
-
     end
 
     private

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

@@ -10,13 +10,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
         restart_services(services)
       elsif !service_list.empty?

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

@@ -12,16 +12,14 @@ module Kontena::Cli::Apps
     parameter "SERVICE", "Service to show"
     parameter "INSTANCES", "Scales service to given number of instances"
 
-    attr_reader :services, :service_prefix
+    attr_reader :services
 
     def execute
       require_config_file(filename)
-      @service_prefix = project_name || current_dir
-      yml_service = load_services(filename, [service], service_prefix)
+      yml_service = services_from_yaml(filename, [service], service_prefix)
       if yml_service[service]
         options = yml_service[service]
-        abort("Service has already instances defined in #{filename}. Please update #{filename} and deploy service instead") if options['instances']
-        @service_prefix = project_name || current_dir
+        abort("Service has already instances defined in #{filename}. Please update #{filename} and deploy service instead") if options['container_count']
         scale_service(require_token, prefixed_name(service), instances)
       else
         abort("Service not found")

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

@@ -0,0 +1,123 @@
+require 'yaml'
+require_relative '../services/services_helper'
+
+module Kontena::Cli::Apps
+  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'] = merge_env_vars(options)
+      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['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 = {}
+      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')
+      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']
+      data
+    end
+
+    # @param [Hash] options
+    def merge_env_vars(options)
+      return options['environment'] 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 [String] path
+    def read_env_file(path)
+      File.readlines(path).delete_if { |line| line.start_with?('#') || line.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
+        {
+            'container_port' => container_port,
+            'node_port' => node_port,
+            'protocol' => protocol || 'tcp'
+        }
+      }
+    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/apps/service_generator_v2.rb

@@ -0,0 +1,26 @@
+require 'yaml'
+require_relative 'service_generator'
+
+module Kontena::Cli::Apps
+  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']
+    end
+  end
+end

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

@@ -11,12 +11,11 @@ module Kontena::Cli::Apps
 
     parameter "SERVICE", "Service to show"
 
-    attr_reader :services, :service_prefix
+    attr_reader :services
 
     def execute
       require_config_file(filename)
 
-      @service_prefix = project_name || current_dir
       show_service(require_token, prefixed_name(service))
     end
   end

data/lib/kontena/cli/apps/start_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
         start_services(services)
       elsif !service_list.empty?

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

@@ -11,13 +11,12 @@ module Kontena::Cli::Apps
 
     parameter "[SERVICE] ...", "Services to stop"
 
-    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
         stop_services(services)
       elsif !service_list.empty?

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

@@ -0,0 +1,150 @@
+require 'yaml'
+require_relative 'service_extender'
+require_relative 'validator'
+require_relative 'validator_v2'
+
+module Kontena::Cli::Apps
+  module YAML
+    class Reader
+      attr_reader :yaml, :file, :errors, :notifications
+
+      def initialize(file, skip_validation = false)
+        @file = file
+        @errors = []
+        @notifications = []
+        @skip_validation = skip_validation
+        load_yaml
+        validate unless skip_validation?
+      end
+
+      ##
+      # @param [String] service_name
+      # @return [Hash]
+      def execute(service_name = nil)
+        result = {}
+        Dir.chdir(File.dirname(File.expand_path(file))) do
+          result[:version] = yaml['version'] || '1'
+          result[:name] = yaml['name']
+          result[:services] = parse_services(service_name)
+          result[:errors] = errors
+          result[:notifications] = notifications
+        end
+        result
+      end
+
+      ##
+      # @return [true|false]
+      def v2?
+        yaml['version'].to_s == '2'
+      end
+
+      private
+
+      def load_yaml
+        content = File.read(File.expand_path(file))
+        content = content % { project: ENV['project'], grid: ENV['grid'] }
+        interpolate(content)
+        replace_dollar_dollars(content)
+        @yaml = ::YAML.load(content)
+      end
+
+      # @return [Array] array of validation errors
+      def validate
+        result = validator.validate(yaml)
+        store_failures(result)
+        result
+      end
+
+      def skip_validation?
+        @skip_validation == true
+      end
+
+      def store_failures(data)
+        errors << { file => data[:errors] } unless data[:errors].empty?
+        notifications << { file => data[:notifications] } unless data[:notifications].empty?
+      end
+
+      # @return [Kontena::Cli::Apps::YAML::Validator]
+      def validator
+        if @validator.nil?
+          validator_klass = v2? ? YAML::ValidatorV2 : YAML::Validator
+          @validator = validator_klass.new
+        end
+        @validator
+      end
+
+      ##
+      # @param [String] service_name - optional service to parse
+      # @return [Hash]
+      def parse_services(service_name = nil)
+        if service_name.nil?
+          services.each { |name, config| services[name] = process_config(config) }
+          services
+        else
+          abort("Service '#{service_name}' not found in #{file}".colorize(:red)) unless services.key?(service_name)
+          process_config(services[service_name])
+        end
+      end
+
+      # @param [Hash] service_config
+      def process_config(service_config)
+        normalize_env_vars(service_config)
+        service_config = extend_config(service_config) if service_config.key?('extends')
+        service_config
+      end
+
+      # @return [Hash] - services from YAML file
+      def services
+        if v2?
+          yaml['services']
+        else
+          yaml
+        end
+      end
+
+      ##
+      # @param [String] text - content of YAML file
+      def interpolate(text)
+        text.gsub!(/(?<!\$)\$(?!\$)\{?\w+\}?/) do |v| # searches $VAR and ${VAR} and not $$VAR
+          var = v.tr('${}', '')
+          puts "The #{var} is not set. Substituting an empty string." if !ENV.key?(var) && !skip_validation?
+          ENV[var] # replace with equivalent ENV variables
+        end
+      end
+
+      ##
+      # @param [String] text - content of yaml file
+      def replace_dollar_dollars(text)
+        text.gsub!('$$', '$')
+      end
+
+      # @param [Hash] service_config
+      # @return [Hash] updated service config
+      def extend_config(service_config)
+        service_name = service_config['extends']['service']
+        filename = service_config['extends']['file']
+        if filename
+          parent_service = from_external_file(filename, service_name)
+        else
+          abort("Service '#{service_name}' not found in #{file}".colorize(:red)) unless services.key?(service_name)
+          parent_service = process_config(services[service_name])
+        end
+        ServiceExtender.new(service_config).extend(parent_service)
+      end
+
+      def from_external_file(filename, service_name)
+        outcome = Reader.new(filename, @skip_validation).execute(service_name)
+        errors.concat outcome[:errors] unless errors.any? { |item| item.key?(filename) }
+        notifications.concat outcome[:notifications] unless notifications.any? { |item| item.key?(filename) }
+        outcome[:services]
+      end
+
+      # @param [Hash] options - service config
+      def normalize_env_vars(options)
+        if options['environment'].is_a?(Hash)
+          options['environment'] = options['environment'].map { |k, v| "#{k}=#{v}" }
+        end
+      end
+    end
+  end
+end