deploy_command.rb in kontena-cli-0.14.0

- old
+ new

@@ -15,19 +15,18 @@
     option '--async', :flag, 'Run deploys async/parallel'
     option '--force-deploy', :flag, 'Force deploy even if service does not have any changes'
 
     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)
     end
 
@@ -58,23 +57,23 @@
 
     # @param [String] name
     # @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)
       else
         service = create(name, options)
@@ -91,22 +90,21 @@
     # @param [String] name
     # @param [Hash] options
     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
 
     # @param [String] id
     # @param [Hash] options
     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
     def in_deploy_queue?(name)
       deploy_queue.find {|service| service['name'] == prefixed_name(name)} != nil
@@ -121,81 +119,14 @@
         name.sub("#{service_prefix}-", '')
       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']
         options['links'] ||= []
         options['links'] = options['links'] + options['external_links']
         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