morpheus-cli 5.5.1.4 → 5.5.2

data/lib/morpheus/cli/commands/jobs_command.rb

@@ -42,27 +42,28 @@ class Morpheus::Cli::JobsCommand
       opts.on("--stats [true|false]", String, "Hide Execution Stats. Job statistics are displayed by default.") do |val|
         options[:show_stats] = (val.to_s != "false")
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List jobs."
     end
     optparse.parse!(args)
     connect(options)
-    if args.count != 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
-      return 1
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
     end
-
-
     params.merge!(parse_list_options(options))
-
     if !options[:source].nil?
       if !['all', 'user', 'discovered', 'sync'].include?(options[:source])
-        print_red_alert "Invalid source filter #{options[:source]}"
-        exit 1
+        raise_command_error("Invalid source filter #{options[:source]}", args, optparse)
       end
       params['itemSource'] = options[:source] == 'discovered' ? 'sync' : options[:source]
     end
-
     @jobs_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @jobs_interface.dry.list(params)
@@ -85,6 +86,7 @@ class Morpheus::Cli::JobsCommand
           "ID" => 'id',
           "Type" => lambda {|job| job['type'] ? job['type']['name'] : '' },
           "Name" => 'name',
+          "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
           "Details" => lambda {|job| job['jobSummary'] },
           "Enabled" => lambda {|job| "#{job['enabled'] ? '' : yellow}#{format_boolean(job['enabled'])}#{cyan}" },
           # "Date Created" => lambda {|job| format_local_dt(job['dateCreated']) },
@@ -135,41 +137,32 @@ class Morpheus::Cli::JobsCommand
       raise_command_error "wrong number of arguments, expected 1-N and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
-    return _get(args[0], args.count > 1 ? args[1].to_i : nil, options)
+    return _get(args[0], options, args.count > 1 ? args[1].to_i : nil)
   end
 
-  def _get(job_id, max_execs = 3, options = {})
-    begin
-      @jobs_interface.setopts(options)
-
-      if !(job_id.to_s =~ /\A\d{1,}\Z/)
-        job = find_by_name_or_id('job', job_id)
-
-        if !job
-          print_red_alert "Job #{job_id} not found"
-          exit 1
-        end
-        job_id = job['id']
-      end
-
-      max_execs = 3 if max_execs.nil?
+  def _get(job_id, options = {}, max_execs = 3)
+    @jobs_interface.setopts(options)
 
-      params = {'includeExecCount' => max_execs}
+    if !(job_id.to_s =~ /\A\d{1,}\Z/)
+      job = find_by_name_or_id('job', job_id)
 
-      if options[:dry_run]
-        print_dry_run @jobs_interface.dry.get(job_id, params)
-        return
+      if !job
+        print_red_alert "Job #{job_id} not found"
+        exit 1
       end
-      json_response = @jobs_interface.get(job_id, params)
+      job_id = job['id']
+    end
 
-      render_result = render_with_format(json_response, options, 'job')
-      return 0 if render_result
+    max_execs = 3 if max_execs.nil?
 
-      title = "Morpheus Job"
-      subtitles = []
-      subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
+    params = {'includeExecCount' => max_execs}
 
+    if options[:dry_run]
+      print_dry_run @jobs_interface.dry.get(job_id, params)
+      return
+    end
+    json_response = @jobs_interface.get(job_id, params)
+    render_response(json_response, options, 'job') do
       job = json_response['job']
       schedule_name = ''
       if !job['scheduleMode'].nil?
@@ -189,27 +182,44 @@ class Morpheus::Cli::JobsCommand
           end
         end
       end
-
+      title = "Morpheus Job"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
       print cyan
-      description_cols = {
-          "ID" => lambda {|it| it['id'] },
-          "Name" => lambda {|it| it['name']},
-          "Job Type" => lambda {|it| it['type']['name']},
-          "Enabled" => lambda {|it| format_boolean(it['enabled'])},
-          (job['workflow'] ? 'Workflow' : 'Task') => lambda {|it| it['jobSummary']},
-          "Schedule" => lambda {|it| schedule_name}
-      }
+      description_cols = [
+          {"ID" => lambda {|it| it['id'] } },
+          {"Name" => lambda {|it| it['name']} },
+          {"Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' } },
+          {"Job Type" => lambda {|it| it['type']['name']} },
+          {"Enabled" => lambda {|it| format_boolean(it['enabled'])} },
+          job['workflow'] ? {'Task' => lambda {|it| (it['workflow']['name'] rescue nil) || it['jobSummary']} } : nil,
+          job['task'] ? {'Workflow' => lambda {|it| (it['task']['name'] rescue nil) || it['jobSummary']} } : nil,
+          job['securityPackage'] ? {'Security Package' => lambda {|it| (it['securityPackage']['name'] rescue nil) || it['jobSummary']} } : nil,
+          job['securityPackage'] ? {'Scan Checklist' => lambda {|it| (it['scanPath'] rescue nil)} } : nil,
+          job['securityPackage'] ? {'Security Profile' => lambda {|it| (it['securityProfile'] rescue nil)} } : nil,
+          {"Schedule" => lambda {|it| schedule_name} }
+      ].compact
 
       if job['targetType']
-        description_cols["Context Type"] = lambda {|it| it['targetType'] == 'appliance' ? 'None' : it['targetType'] }
+        description_cols << {"Context Type" => lambda {|it| it['targetType'] == 'appliance' ? 'None' : it['targetType'] } }
 
         if job['targetType'] != 'appliance'
-          description_cols["Context #{job['targetType'].capitalize}#{job['targets'].count > 1 ? 's' : ''}"] = lambda {|it| it['targets'].collect {|it| it['name']}.join(', ')}
+          description_cols << {"Context #{job['targetType'].capitalize}#{job['targets'].count > 1 ? 's' : ''}" => lambda {|it| it['targets'].collect {|it| it['name']}.join(', ')} }
         end
       end
 
       print_description_list(description_cols, job)
 
+      # config = job['config']
+      # # prune config of stuff that user does not xare about
+      # config = config.reject! {|k,v| ["configList","workflowId","taskId","securitySpecId", "customConfig"].include?(k) }
+      # if config && !config.empty?
+      #   print_h2 "Configuration"
+      #   print_description_list(config.keys, config)
+      #   print reset,"\n"
+      # end
+
       if max_execs != 0
         print_h2 "Recent Executions"
         print_job_executions(json_response['executions']['jobExecutions'], options)
@@ -219,11 +229,8 @@ class Morpheus::Cli::JobsCommand
         end
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def add(args)
@@ -234,22 +241,44 @@ class Morpheus::Cli::JobsCommand
       opts.on("--name NAME", String, "Updates job name") do |val|
         params['name'] = val.to_s
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-a', '--active [on|off]', String, "Can be used to enable / disable the job. Default is on") do |val|
         params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on('-t', '--task [TASK]', String, "Task ID or code, assigns task to job. Incompatible with --workflow option.") do |val|
-        if options[:workflow].nil?
-          options[:task] = val
-        else
+      opts.on('--type [TYPE]', String, "Job Type Name, Code or ID. The available types are \"Security Scan Job\", \"Task Job\", and \"Workflow Job\"") do |val|
+        options[:type] = val
+      end
+      opts.on('-t', '--task [TASK]', String, "Task ID or name, assigns task to job. This sets the job type to \"Task Job\".") do |val|
+        if options[:workflow]
           raise_command_error "Options --task and --workflow are incompatible"
+        elsif options[:security_package]
+          raise_command_error "Options --task and --security-package are incompatible"
+        else
+          options[:task] = val
         end
+        options[:type] = 'morpheus.task'
       end
-      opts.on('-w', '--workflow [WORKFLOW]', String, "Workflow ID or code, assigns workflow to job. Incompatible with --task option.") do |val|
-        if options[:task].nil?
+      opts.on('-w', '--workflow [WORKFLOW]', String, "Workflow ID or name, assigns workflow to job. This sets the job type to \"Workflow Job\".") do |val|
+        if options[:task]
+          raise_command_error "Options --workflow and --task are incompatible"
+        elsif options[:security_package]
+          raise_command_error "Options --workflow and --security-package are incompatible"
+        else
           options[:workflow] = val
+        end
+        options[:type] = 'morpheus.workflow'
+      end
+      opts.on('--security-package [PACKAGE]', String, "Security Package ID or name, assigns security package to job. This sets the job type to \"Security Scan Job\".") do |val|
+        if options[:workflow]
+          raise_command_error "Options --security-package and --workflow are incompatible"
+        elsif options[:task]
+          raise_command_error "Options --security-package and --workflow are incompatible"
         else
-          raise_command_error "Options --task and --workflow are incompatible"
+          options[:security_package] = val
         end
+        options[:type] = 'morpheus.securityScan'
       end
       opts.on('--context-type [TYPE]', String, "Context type (instance|server|none). Default is none") do |val|
         params['targetType'] = (val == 'none' ? 'appliance' : val)
@@ -275,6 +304,16 @@ class Morpheus::Cli::JobsCommand
         options[:schedule] = 'dateTime'
         params['dateTime'] = val.to_s
       end
+      opts.on('--scan-checklist [VALUE]', String, "Scan Checklist. Only applicable to the security scan job type") do |val|
+        # params['config'] ||= {}
+        # params['config']['scanPath'] = val.to_s
+        params['scanPath'] = val.to_s
+      end
+      opts.on('--security-profile [VALUE]', String, "Security Profile. Only applicable to the security scan job type") do |val|
+        # params['config'] ||= {}
+        # params['config']['securityProfile'] = val.to_s
+        params['securityProfile'] = val.to_s
+      end
       build_standard_add_options(opts, options)
       opts.footer = "Create job."
     end
@@ -282,150 +321,196 @@ class Morpheus::Cli::JobsCommand
     connect(options)
     verify_args!(args:args, optparse:optparse, max:1)
 
-      if options[:payload]
-        payload = parse_payload(options, 'job')
-      else
-        apply_options(params, options)
-
-        # name
-        params['name'] = params['name'] || args[0] || name = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Job Name', 'required' => true, 'description' => 'Job Name.'}],options[:options],@api_client,{})['name']
-
-        if options[:task].nil? && options[:workflow].nil?
-          # prompt job type
-          job_types = @options_interface.options_for_source('jobTypes', {})['data']
+    if options[:payload]
+      payload = parse_payload(options, 'job')
+    else
+      apply_options(params, options)
+
+      # name
+      params['name'] = params['name'] || args[0] || name = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Job Name', 'required' => true, 'description' => 'Job Name.'}],options[:options],@api_client,{})['name']
+
+      # type id is needed to load the options right now..
+      job_type = nil
+      job_types = get_available_job_types()
+      if options[:task].nil? && options[:workflow].nil? && options[:security_package].nil?
+        if options[:type]
+          # match on value (id) or code or name
+          job_type = job_types.find {|it| it['value'].to_s.downcase == options[:type].to_s.downcase } || job_types.find {|it| it['code'].to_s.downcase == options[:type].to_s.downcase } || job_types.find {|it| it['name'].to_s.downcase == options[:type].to_s.downcase || it['name'].to_s.downcase == "#{options[:type]} Job".to_s.downcase }
+          if job_type.nil?
+            raise_command_error "Job Type not found for '#{options[:type]}'"
+          end
+        else
+          # prompt
           job_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobType', 'type' => 'select', 'fieldLabel' => 'Job Type', 'selectOptions' => job_types, 'required' => true, 'description' => 'Select Job Type.'}],options[:options],@api_client,{})['jobType']
           job_type = job_types.find {|it| it['value'] == job_type_id}
+        end
 
-          job_options = @jobs_interface.options(job_type_id)
-
-          # prompt task / workflow
-          if ['morpheus.task.jobType', 'morpheus.task'].include?(job_type['code'])
-            params['task'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'task.id', 'fieldLabel' => 'Task', 'type' => 'select', 'required' => true, 'optionSource' => 'tasks'}], options[:options], @api_client, {})['task']
-          else
-            params['workflow'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'workflow.id', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => true, 'optionSource' => 'operationTaskSets'}], options[:options], @api_client, {})['workflow']
-          end
+        # prompt task / workflow / securityPackage
+        if job_type['code'] == 'morpheus.task'
+          params['task'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'task.id', 'fieldLabel' => 'Task', 'type' => 'select', 'required' => true, 'optionSource' => 'tasks'}], options[:options], @api_client, {})['task']
+        elsif job_type['code'] == 'morpheus.workflow'
+          params['workflow'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'workflow.id', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => true, 'optionSource' => 'operationTaskSets'}], options[:options], @api_client, {})['workflow']
+        elsif job_type['code'] == 'morpheus.securityScan'
+          params['securityPackage'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'securityPackage.id', 'fieldLabel' => 'Security Package', 'type' => 'select', 'required' => true, 'optionSource' => 'securityPackages'}], options[:options], @api_client, {})['securityPackage']
         end
+        # type is not even included in the payload? lol
+        # params["type"] = {"code" => job_type["code"]}
+      end
 
-        # task
-        if !options[:task].nil?
-          task = find_by_name_or_id('task', options[:task])
+      # task
+      if !options[:task].nil?
+        task = find_by_name_or_id('task', options[:task])
 
-          if task.nil?
-            print_red_alert "Task #{options[:task]} not found"
-            exit 1
-          end
-          params['task'] = {'id' => task['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.task.jobType') || load_job_type_id_by_code('morpheus.task')
+        if task.nil?
+          print_red_alert "Task #{options[:task]} not found"
+          exit 1
         end
+        params['task'] = {'id' => task['id']}
+        job_type = job_types.find {|it| it['code'] == 'morpheus.task' } # || raise_command_error "Unable to find job type for 'morpheus.task'"
+      end
 
-        # workflow
-        task_set = nil
-        if !options[:workflow].nil?
-          task_set = find_by_name_or_id('task_set', options[:workflow])
+      # workflow
+      task_set = nil
+      if !options[:workflow].nil?
+        task_set = find_by_name_or_id('task_set', options[:workflow])
 
-          if task_set.nil?
-            print_red_alert "Workflow #{options[:workflow]} not found"
-            exit 1
-          end
-          params['workflow'] = {'id' => task_set['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.workflow.jobType') || load_job_type_id_by_code('morpheus.workflow')
-        end
-        # load workflow if we havent yet
-        if (params['workflow'] && params['workflow']['id']) && task_set.nil?
-          task_set = find_by_name_or_id('task_set', params['workflow']['id'])
-          if task_set.nil?
-            print_red_alert "Workflow #{params['workflow']['id']} not found"
-            exit 1
-          end
+        if task_set.nil?
+          print_red_alert "Workflow #{options[:workflow]} not found"
+          exit 1
         end
-        # prompt for custom options for workflow
-        custom_option_types = task_set ? task_set['optionTypes'] : nil
-        if custom_option_types && custom_option_types.size() > 0
-          # they are all returned in a single array right now, so skip prompting for the jobType optionTypes
-          custom_option_types.reject! { |it| it['code'] && it['code'].include?('job.type') }
-          custom_option_types = custom_option_types.collect {|it|
-            it['fieldContext'] = 'customOptions'
-            it
-          }
-          custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
-          params['customOptions'] = custom_options['customOptions']
+        params['workflow'] = {'id' => task_set['id']}
+        job_type = job_types.find {|it| it['code'] == 'morpheus.workflow' } # || raise_command_error "Unable to find job type for 'morpheus.workflow'"
+      end
+      # load workflow if we havent yet
+      if (params['workflow'] && params['workflow']['id']) && task_set.nil?
+        task_set = find_by_name_or_id('task_set', params['workflow']['id'])
+        if task_set.nil?
+          print_red_alert "Workflow #{params['workflow']['id']} not found"
+          exit 1
         end
+      end
+      # prompt for custom options for workflow
+      custom_option_types = task_set ? task_set['optionTypes'] : nil
+      if custom_option_types && custom_option_types.size() > 0
+        # they are all returned in a single array right now, so skip prompting for the jobType optionTypes
+        custom_option_types.reject! { |it| it['code'] && it['code'].include?('job.type') }
+        custom_option_types = custom_option_types.collect {|it|
+          it['fieldContext'] = 'customOptions'
+          it
+        }
+        custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
+        params['customOptions'] = custom_options['customOptions']
+      end
 
-
-        # load options based upon job type + task / taskset
-        job_options = @jobs_interface.options(job_type_id, {'taskId' => params['task'] ? params['task']['id'] : nil, 'workflowId' => params['workflow'] ? params['workflow']['id'] : nil})
-        option_type_id = job_options['optionTypes'][0]['id']
-
-        # context type
-        if params['targetType'].nil?
-          params['targetType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'targetType', 'fieldLabel' => 'Context Type', 'type' => 'select', 'required' => true, 'selectOptions' => job_options['targetTypes'], 'defaultValue' => job_options['targetTypes'].first['name']}], options[:options], @api_client, {})['targetType']
+      # security package
+      if !options[:security_package].nil?
+        # task = find_by_name_or_id('securityPackage', options[:security_package])
+        security_package = nil
+        if (options[:security_package].to_s =~ /\A\d{1,}\Z/)
+          security_package = @options_interface.options_for_source('securityPackages', {})['data'].find {|it| it['value'] == options[:security_package].to_i }['value']
+        else
+          security_package = @options_interface.options_for_source('securityPackages', {})['data'].find {|it| it['name'].to_s.downcase == options[:security_package].to_s.downcase }['value']
         end
-
-        # contexts
-        if ['instance', 'server'].include?(params['targetType']) && (params['targets'].nil? || params['targets'].empty?)
-          targets = []
-          if params['targetType'] == 'instance'
-            avail_targets = @instances_interface.list({max:10000})['instances'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
-          else
-            avail_targets = @servers_interface.list({max:10000, 'vmHypervisor' => nil, 'containerHypervisor' => nil})['servers'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
-          end
-          target_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'target', 'fieldLabel' => "Context #{params['targetType'].capitalize}", 'type' => 'select', 'required' => true, 'selectOptions' => avail_targets}], options[:options], @api_client, {}, options[:no_prompt], true)['target']
-          targets << target_id
-          avail_targets.reject! {|it| it['value'] == target_id}
-
-          while !target_id.nil? && !avail_targets.empty? && Morpheus::Cli::OptionTypes.confirm("Add another context #{params['targetType']}?", {:default => false})
-            target_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'target', 'fieldLabel' => "Context #{params['targetType'].capitalize}", 'type' => 'select', 'required' => false, 'selectOptions' => avail_targets}], options[:options], @api_client, {}, options[:no_prompt], true)['target']
-
-            if !target_id.nil?
-              targets << target_id
-              avail_targets.reject! {|it| it['value'] == target_id}
-            end
-          end
-          params['targets'] = targets.collect {|it| {'refId' => it}}
+        if security_package.nil?
+          print_red_alert "Security Package #{options[:security_package]} not found"
+          exit 1
         end
-
-        # schedule
-        if options[:schedule].nil?
-          options[:schedule] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'scheduleMode', 'fieldLabel' => "Schedule", 'type' => 'select', 'required' => true, 'selectOptions' => job_options['schedules'], 'defaultValue' => job_options['schedules'].first['name']}], options[:options], @api_client, {})['scheduleMode']
-          params['scheduleMode'] = options[:schedule]
+        params['securityPackage'] = {'id' => security_package['id']}
+        job_type = job_types.find {|it| it['code'] == 'morpheus.securityScan' } # || raise_command_error "Unable to find job type for 'morpheus.workflow'"
+      end
+
+      # load options based upon job type + task / workflow / securityPackage
+      job_options = @jobs_interface.options(job_type['id'], {'taskId' => params['task'] ? params['task']['id'] : nil, 'workflowId' => params['workflow'] ? params['workflow']['id'] : nil, 'securityPackageId' => params['securityPackage'] ? params['securityPackage']['id'] : nil})
+
+      # securityScan options
+      if job_type['code'] == 'morpheus.securityScan'
+        job_type_option_types = [
+          {'fieldName' => 'scanPath', 'fieldLabel' => "Scan Checklist", 'type' => 'text', 'required' => true, 'displayOrder' => 20},
+          {'fieldName' => 'securityProfile', 'fieldLabel' => "Security Profile", 'type' => 'text', 'required' => true, 'displayOrder' => 21}
+        ]
+        #job_type_option_types = job_options['optionTypes'] || []
+        # reject securitySpecId because already prompted for securityPackage above, 
+        # and it is passed as securityPackage.id instead of config.securitySpecId
+        # also remove config context because jobs return this configuration at the level too
+        #job_type_option_types.reject! {|it| it['fieldName'] == "securitySpecId" }
+        #job_type_option_types = job_type_option_types.collect {|it| it.delete("fieldContext") if it["fieldContext"] == "config" }
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(job_type_option_types, options[:options], @api_client, {})
+        v_prompt.deep_compact!
+        params.deep_merge!(v_prompt)
+      end
+
+      # context type
+      if params['targetType'].nil?
+        params['targetType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'targetType', 'fieldLabel' => 'Context Type', 'type' => 'select', 'required' => true, 'selectOptions' => job_options['targetTypes'], 'defaultValue' => job_options['targetTypes'].first['name']}], options[:options], @api_client, {})['targetType']
+      end
+
+      # contexts
+      if ['instance', 'server'].include?(params['targetType']) && (params['targets'].nil? || params['targets'].empty?)
+        targets = []
+        if params['targetType'] == 'instance'
+          avail_targets = @instances_interface.list({max:10000})['instances'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
+        else
+          avail_targets = @servers_interface.list({max:10000, 'vmHypervisor' => nil, 'containerHypervisor' => nil})['servers'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
         end
+        target_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'target', 'fieldLabel' => "Context #{params['targetType'].capitalize}", 'type' => 'select', 'required' => true, 'selectOptions' => avail_targets}], options[:options], @api_client, {}, options[:no_prompt], true)['target']
+        targets << target_id
+        avail_targets.reject! {|it| it['value'] == target_id}
 
-        if options[:schedule] == 'manual'
-          # cool
-        elsif options[:schedule].to_s.downcase == 'datetime'
-          # prompt for dateTime
-          if params['dateTime'].nil?
-            params['dateTime'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dateTime', 'fieldLabel' => "Date and Time", 'type' => 'text', 'required' => true}], options[:options], @api_client, {}, options[:no_prompt], true)['dateTime']
-          end
-        elsif options[:schedule].to_s != ''
-           # ok they passed a schedule name or id
-          schedule = job_options['schedules'].find {|it| it['name'] == options[:schedule] || it['value'] == options[:schedule].to_i}
+        while !target_id.nil? && !avail_targets.empty? && Morpheus::Cli::OptionTypes.confirm("Add another context #{params['targetType']}?", {:default => false})
+          target_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'target', 'fieldLabel' => "Context #{params['targetType'].capitalize}", 'type' => 'select', 'required' => false, 'selectOptions' => avail_targets}], options[:options], @api_client, {}, options[:no_prompt], true)['target']
 
-          if schedule.nil?
-            print_red_alert "Schedule #{options[:schedule]} not found"
-            exit 1
+          if !target_id.nil?
+            targets << target_id
+            avail_targets.reject! {|it| it['value'] == target_id}
           end
-          options[:schedule] = schedule['value']
         end
+        params['targets'] = targets.collect {|it| {'refId' => it}}
+      end
+
+      # schedule
+      if options[:schedule].nil?
+        options[:schedule] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'scheduleMode', 'fieldLabel' => "Schedule", 'type' => 'select', 'required' => true, 'selectOptions' => job_options['schedules'], 'defaultValue' => job_options['schedules'].first['name']}], options[:options], @api_client, {})['scheduleMode']
         params['scheduleMode'] = options[:schedule]
+      end
 
-        # custom config
-        if params['customConfig'].nil? && job_options['allowCustomConfig']
-          params['customConfig'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'config', 'fieldLabel' => "Custom Config", 'type' => 'text', 'required' => false}], options[:options], @api_client, {})['config']
+      if options[:schedule] == 'manual'
+        # cool
+      elsif options[:schedule].to_s.downcase == 'datetime'
+        # prompt for dateTime
+        if params['dateTime'].nil?
+          params['dateTime'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dateTime', 'fieldLabel' => "Date and Time", 'type' => 'text', 'required' => true}], options[:options], @api_client, {}, options[:no_prompt], true)['dateTime']
         end
-        payload = {'job' => params}
-      end
+      elsif options[:schedule].to_s != ''
+         # ok they passed a schedule name or id
+        schedule = job_options['schedules'].find {|it| it['name'] == options[:schedule] || it['value'] == options[:schedule].to_i}
 
-      @jobs_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @jobs_interface.dry.create(payload)
-        return
+        if schedule.nil?
+          print_red_alert "Schedule #{options[:schedule]} not found"
+          exit 1
+        end
+        options[:schedule] = schedule['value']
       end
-      json_response = @jobs_interface.create(payload)
-      render_response(json_response, options, 'job') do
-        print_green_success  "Job created"
-        _get(json_response['id'], 0, options)
+      params['scheduleMode'] = options[:schedule]
+
+      # custom config
+      if params['customConfig'].nil? && job_options['allowCustomConfig']
+        params['customConfig'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'config', 'fieldLabel' => "Custom Config", 'type' => 'text', 'required' => false}], options[:options], @api_client, {})['config']
       end
+      payload = {'job' => params}
+    end
+
+    @jobs_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @jobs_interface.dry.create(payload)
+      return
+    end
+    json_response = @jobs_interface.create(payload)
+    job = json_response['job'] || payload["job"] # api only recently started returning job!
+    render_response(json_response, options, 'job') do
+      # print_green_success  "Job created"
+      print_green_success "Added job #{job['name']}"
+      _get(job['id'], options)
+    end
   end
 
   def update(args)
@@ -436,21 +521,37 @@ class Morpheus::Cli::JobsCommand
       opts.on("--name NAME", String, "Updates job name") do |val|
         params['name'] = val.to_s
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-a', '--active [on|off]', String, "Can be used to enable / disable the job. Default is on") do |val|
         params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on('-t', '--task [TASK]', String, "Task ID or code, assigns task to job. Incompatible with --workflow option.") do |val|
-        if options[:workflow].nil?
-          options[:task] = val
-        else
+      opts.on('-t', '--task [TASK]', String, "Task ID or name, assigns task to job. Only compatible with workflow job type.") do |val|
+        if options[:workflow]
           raise_command_error "Options --task and --workflow are incompatible"
+        elsif options[:security_package]
+          raise_command_error "Options --task and --security-package are incompatible"
+        else
+          options[:task] = val
         end
       end
-      opts.on('-w', '--workflow [WORKFLOW]', String, "Workflow ID or code, assigns workflow to job. Incompatible with --task option.") do |val|
-        if options[:task].nil?
+      opts.on('-w', '--workflow [WORKFLOW]', String, "Workflow ID or name, assigns workflow to job. Only compatible with security scan job type.") do |val|
+        if options[:task]
+          raise_command_error "Options --workflow and --task are incompatible"
+        elsif options[:security_package]
+          raise_command_error "Options --workflow and --security-package are incompatible"
+        else
           options[:workflow] = val
+        end
+      end
+      opts.on('--security-package [PACKAGE]', String, "Security Package ID or name, assigns security package to job. Only compatible with security scan job type.") do |val|
+        if options[:workflow]
+          raise_command_error "Options --security-package and --workflow are incompatible"
+        elsif options[:task]
+          raise_command_error "Options --security-package and --workflow are incompatible"
         else
-          raise_command_error "Options --task and --workflow are incompatible"
+          options[:security_package] = val
         end
       end
       opts.on('--context-type [TYPE]', String, "Context type (instance|server|none). Default is none") do |val|
@@ -590,9 +691,10 @@ class Morpheus::Cli::JobsCommand
         return
       end
       json_response = @jobs_interface.update(job['id'], payload)
+      job = json_response["job"] || job # api only recently started returning job!
       render_response(json_response, options, 'job') do
-        print_green_success  "Job updated"
-        _get(job['id'], nil, options)
+        print_green_success "Updated job #{job['name']}"
+        _get(job['id'], options)
       end
   end
 
@@ -636,7 +738,7 @@ class Morpheus::Cli::JobsCommand
       elsif !options[:quiet]
         if json_response['success']
           print_green_success  "Job queued for execution"
-          _get(job['id'], nil, options)
+          _get(job['id'], options)
         else
           print_red_alert "Error executing job: #{json_response['msg'] || json_response['errors']}"
         end
@@ -831,8 +933,15 @@ class Morpheus::Cli::JobsCommand
 
   private
 
-  def load_job_type_id_by_code(code)
-    @options_interface.options_for_source('jobTypes', {})['data'].find {|it| it['code'] == code}['value'] rescue nil
+  def get_available_job_types()
+    job_types = @options_interface.options_for_source('jobTypes', {})['data']
+    # the jobType code has this ".jobType" added to the end for ui translation or something..
+    job_types.each do |jt| 
+      # jt['msgCode'] = jt['code']
+      jt['code'] = jt['code'].sub(/\.jobType\Z/,'')
+      # set id for convenience
+      jt['id'] = jt['value'] if !jt['id'] && jt['value']
+    end
+    job_types
   end
-
 end