morpheus-cli 4.2.17 → 4.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca98cbe4891f98ca85702bb9794a0f255e8208a22b30189220bbec1a48dd3b0
-  data.tar.gz: 5c46ca8fc5d4944d7e5f363731652f1933e7a07226904d4b1c3829d9456ba64c
+  metadata.gz: f1e56f81e53557586c3a19751c97163f5c63ce1bda3ea04e5eadd54d7e1c08e0
+  data.tar.gz: 24c543afa2832100919d5451b8d8954952132db4b421cffe889882b5f7ef34e9
 SHA512:
-  metadata.gz: 5f8b8ead51a8d5953f51b3543e293eff03b329a5ec1f8194a5956426f7f38716a210c99d4114c5e14feff24f74f9756c88db71be0dd094db279a40122ef115f4
-  data.tar.gz: bf432f7ec48ea911a36029ae66f58339627e34a3548f60f36d7a49f7cc018728f3f77556d6abec53f1cff8490a6354db14b1664e3c546cf625dc2c637b573271
+  metadata.gz: 682d8dafc50d15c216470971f5c78ca09cba8feafa2d7f1cf0462a6368f88377a627411ba3d4287ff1669d321153be02f4db2e955606620d6a5bf8425b055e23
+  data.tar.gz: 60b6787aacf5b2275197c496a3ff9bc9018fe70e897def95bacb54268dbdf97d5dc362e3d8f7bbfb7b0db0b18cc8028ae99b2e1f2540bb821485c21ee27b945d

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.17
+RUN gem install morpheus-cli -v 4.2.22
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/backup_jobs_interface.rb

@@ -1,4 +1,4 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
 class Morpheus::BackupJobsInterface < Morpheus::RestInterface
 

data/lib/morpheus/api/backups_interface.rb

@@ -1,4 +1,4 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
 class Morpheus::BackupsInterface < Morpheus::RestInterface
 

data/lib/morpheus/api/deployments_interface.rb

@@ -1,4 +1,4 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
 class Morpheus::DeploymentsInterface < Morpheus::RestInterface
 

data/lib/morpheus/cli.rb

@@ -45,6 +45,7 @@ module Morpheus
     def self.load!()
       # load interfaces
       require 'morpheus/api/api_client.rb'
+      require 'morpheus/api/rest_interface.rb'
       Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each {|file| load file }
 
       # load mixins

data/lib/morpheus/cli/blueprints_command.rb

@@ -62,11 +62,15 @@ class Morpheus::Cli::BlueprintsCommand
         params['ownerId'] << val
       end
       opts.add_hidden_option('--created-by')
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "List blueprints."
     end
     optparse.parse!(args)
     connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     begin
       if params['ownerId']
         params['ownerId'] = params['ownerId'].collect do |owner_id|
@@ -125,7 +129,7 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on( '-c', '--config', "Display raw config only. Default is YAML. Combine with -j for JSON instead." ) do
         options[:show_config] = true
       end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :outfile, :dry_run, :remote])
+      build_standard_get_options(opts, options)
       opts.footer = "Get details about a blueprint.\n" +
                     "[blueprint] is required. This is the name or id of a blueprint. Supports 1-N [instance] arguments."
     end
@@ -154,8 +158,9 @@ class Morpheus::Cli::BlueprintsCommand
       end
       @blueprints_interface.setopts(options)
       blueprint = find_blueprint_by_name_or_id(arg)
-      exit 1 if blueprint.nil?
-
+      if blueprint.nil?
+        return 1, "blueprint not found"
+      end
       json_response = {'blueprint' => blueprint}  # skip redundant request
       #json_response = @blueprints_interface.get(blueprint['id'])
       blueprint = json_response['blueprint']
@@ -165,43 +170,13 @@ class Morpheus::Cli::BlueprintsCommand
         unless options[:json] || options[:yaml] || options[:csv]
           options[:yaml] = true
         end
-        blueprint_config = blueprint['config']
-        render_result = render_with_format(blueprint_config, options)
-        return 0 if render_result
+        return render_with_format(blueprint['config'], options)
       end
-
-      render_result = render_with_format(json_response, options, 'blueprint')
-      return 0 if render_result
-
-      print_h1 "Blueprint Details"
-      
-      print_blueprint_details(blueprint)
-
-      if blueprint['resourcePermission'].nil?
-        #print "\n", "No group access found", "\n"
-      else
-        # print_h2 "Group Access"
-        # rows = []
-        # if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
-        #   rows.push({"name" => 'All'})
-        # end
-        # if blueprint['resourcePermission']['sites']
-        #   blueprint['resourcePermission']['sites'].each do |site|
-        #     rows.push(site)
-        #   end
-        # end
-        # rows = rows.collect do |site|
-        #   {group: site['name'], default: site['default'] ? 'Yes' : ''}
-        # end
-        # # columns = [:group, :default]
-        # columns = [:group]
-        # print cyan
-        # print as_pretty_table(rows, columns)
-        # print reset,"\n"
-      end
-
-      #print reset,"\n"
-      return 0
+      render_response(json_response, options, 'blueprint') do
+        print_h1 "Blueprint Details"
+        print_blueprint_details(blueprint)
+      end
+      return 0, nil
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -216,17 +191,12 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on('-t', '--type TYPE', String, "Blueprint Type. Default is morpheus.") do |val|
         options[:blueprint_type] = parse_blueprint_type(val.to_s)
       end
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      build_standard_add_options(opts, options)
       opts.footer = "Create a new blueprint.\n" + 
                     "[name] is required. This is the name of the new blueprint."
     end
     optparse.parse!(args)
-    if args.count > 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} add expects 0-1 arguments and received #{args.count}: #{args}\n#{optparse}"
-      return 1
-    end
-    options[:options] ||= {}
+    verify_args!(args:args, optparse:optparse, min:0, max:1)
     if args[0]
       options[:options]['name'] = args[0]
     end
@@ -248,9 +218,7 @@ class Morpheus::Cli::BlueprintsCommand
         end
         params = Morpheus::Cli::OptionTypes.prompt(add_blueprint_option_types, options[:options], @api_client, options[:params])
         params.deep_compact!
-        #blueprint_payload = params.select {|k,v| ['name', 'description', 'category'].include?(k) }
         # expects no namespace, just the config
-        #payload = blueprint_payload
         payload.deep_merge!(params)
       end
       @blueprints_interface.setopts(options)
@@ -260,12 +228,8 @@ class Morpheus::Cli::BlueprintsCommand
       end
 
       json_response = @blueprints_interface.create(payload)
-
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      elsif !options[:quiet]
-        blueprint = json_response["blueprint"]
+      blueprint = json_response['blueprint']
+      render_response(json_response, options, 'blueprint') do
         print_green_success "Added blueprint #{blueprint['name']}"
         if !options[:no_prompt]
           if options[:payload].nil? && ::Morpheus::Cli::OptionTypes::confirm("Would you like to add a tier now?", options.merge({default: false}))
@@ -275,11 +239,11 @@ class Morpheus::Cli::BlueprintsCommand
             end
           else
             # print details
-            get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+            return _get(blueprint["id"], options)
           end
         end
       end
-      return 0
+      return 0, nil
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -294,7 +258,7 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on( '--owner USER', "Owner Username or ID" ) do |val|
         options[:owner] = val == 'null' ? nil : val
       end
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      build_standard_update_options(opts, options)
       opts.footer = "Update a blueprint.\n" + 
                     "[blueprint] is required. This is the name or id of a blueprint."
     end
@@ -388,7 +352,7 @@ class Morpheus::Cli::BlueprintsCommand
         options[:owner] = val == 'null' ? nil : val
       end
       build_option_type_options(opts, options, update_blueprint_option_types(false))
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      build_standard_update_options(opts, options)
       opts.footer = "Update a blueprint permissions.\n" + 
                     "[blueprint] is required. This is the name or id of a blueprint."
     end
@@ -586,7 +550,7 @@ class Morpheus::Cli::BlueprintsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[blueprint]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      build_standard_remove_options(opts, options)
       opts.footer = "Delete a blueprint." + "\n" +
                     "[blueprint] is required. This is the name or id of a blueprint."
     end
@@ -2123,6 +2087,7 @@ class Morpheus::Cli::BlueprintsCommand
     }
 
     print_description_list(description_cols, blueprint)
+    print reset,"\n"
     # print_h2 "Tiers"
     if blueprint["config"] && blueprint["config"]["tiers"] && blueprint["config"]["tiers"].keys.size != 0
       print cyan
@@ -2213,7 +2178,8 @@ class Morpheus::Cli::BlueprintsCommand
     else
       #print white,"\nTemplate is empty, use `blueprints add-tier \"#{blueprint['name']}\"`",reset,"\n"
     end
-    print reset,"\n"
+    # print reset,"\n"
+    print reset
   end
 
   # this parses the environments => groups => clouds tree structure

data/lib/morpheus/cli/budgets_command.rb

@@ -570,16 +570,16 @@ class Morpheus::Cli::BudgetsCommand
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 1},
       # {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true},
       {'fieldName' => 'scope', 'fieldLabel' => 'Scope', 'code' => 'budget.scope', 'type' => 'select', 'selectOptions' => [{'name'=>'Account','value'=>'account'},{'name'=>'Tenant','value'=>'tenant'},{'name'=>'Cloud','value'=>'cloud'},{'name'=>'Group','value'=>'group'},{'name'=>'User','value'=>'user'}], 'defaultValue' => 'account', 'required' => true, 'displayOrder' => 3},
-      {'fieldName' => 'tenant', 'fieldLabel' => 'Tenant', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldName' => 'tenant', 'fieldLabel' => 'Tenant', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
         @options_interface.options_for_source("tenants", {})['data']
       }, 'required' => true, 'dependsOnCode' => 'budget.scope:tenant', 'displayOrder' => 4},
-      {'fieldName' => 'user', 'fieldLabel' => 'User', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldName' => 'user', 'fieldLabel' => 'User', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params|
         @options_interface.options_for_source("users", {})['data']
       }, 'required' => true, 'dependsOnCode' => 'budget.scope:user', 'displayOrder' => 5},
-      {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
         @options_interface.options_for_source("groups", {})['data']
       }, 'required' => true, 'dependsOnCode' => 'budget.scope:group', 'displayOrder' => 6},
-      {'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
         @options_interface.options_for_source("clouds", {})['data']
       }, 'required' => true, 'dependsOnCode' => 'budget.scope:cloud', 'displayOrder' => 7},
       {'fieldName' => 'year', 'fieldLabel' => 'Period', 'type' => 'text', 'required' => true, 'defaultValue' => Time.now.year, 'description' => "The period (year) the budget applies to. Default is the current year.", 'displayOrder' => 8},

data/lib/morpheus/cli/cli_command.rb

@@ -524,6 +524,12 @@ module Morpheus
               end
             end
 
+          when :find_by_name
+            opts.on('--find-by-name', "Always treat the identifier argument as a name, never an ID. Useful for specifying names that look like numbers. eg. '1234'" ) do
+              options[:find_by_name] = true
+            end
+            # opts.add_hidden_option('--find-by-name') if opts.is_a?(Morpheus::Cli::OptionParser)
+
           when :remote
             opts.on( '-r', '--remote REMOTE', "Remote name. The current remote is used by default." ) do |val|
               options[:remote] = val
@@ -1237,17 +1243,18 @@ module Morpheus
           end
         end
         if options[:outfile]
+          full_outfile = File.expand_path(options[:outfile])
           if output
             print_to_file(output, options[:outfile], options[:overwrite])
-            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(options[:outfile])} B)\n" unless options[:quiet]
+            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(full_outfile)} B)\n" unless options[:quiet]
           else
             # uhhh ok lets try this
-            Morpheus::Logging::DarkPrinter.puts "using experimental feature: --outfile without a common format like json, yml or csv" if Morpheus::Logging.debug?
+            Morpheus::Logging::DarkPrinter.puts "using experimental feature: --out without a common format like json, yml or csv" if Morpheus::Logging.debug?
             result = with_stdout_to_file(options[:outfile], options[:overwrite], 'w+', &block)
-            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(options[:outfile])} B)\n" unless options[:quiet]
-            if result
+            if result && result != 0
               return result
             end
+            print "#{cyan}Wrote output to file #{options[:outfile]} (#{File.size(full_outfile)} B)\n" unless options[:quiet]
             return 0, nil
           end
         else

data/lib/morpheus/cli/cloud_resource_pools_command.rb

@@ -326,6 +326,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
+        options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a resource pool." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud."
@@ -437,6 +440,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         else
           payload['resourcePool']['active'] = true
         end
+
+        # Default
+        if options['defaultPool'] != nil
+          payload['resourcePool']['defaultPool'] = options['defaultPool']
+        end
         
         # Visibility
         if options['visibility'] != nil
@@ -552,6 +560,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
+        options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a resource pool." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud." + "\n"
@@ -641,6 +652,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         if options['active'] != nil
           payload['resourcePool']['active'] = options['active']
         end
+
+        # Default
+        if options['defaultPool'] != nil
+          payload['resourcePool']['defaultPool'] = options['defaultPool']
+        end
         
         # Visibility
         if options['visibility'] != nil

data/lib/morpheus/cli/clouds.rb

@@ -46,11 +46,15 @@ class Morpheus::Cli::Clouds
       opts.on( '-t', '--type TYPE', "Cloud Type" ) do |val|
         options[:zone_type] = val
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "List clouds."
     end
     optparse.parse!(args)
     connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     begin
       if options[:zone_type]
         cloud_type = cloud_type_for_name(options[:zone_type])
@@ -71,15 +75,7 @@ class Morpheus::Cli::Clouds
       end
 
       json_response = @clouds_interface.list(params)
-      if options[:json]
-        puts as_json(json_response, options, "zones")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "zones")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['zones'], options)
-      else
+      render_response(json_response, options, 'zones') do
         clouds = json_response['zones']
         title = "Morpheus Clouds"
         subtitles = []
@@ -99,6 +95,7 @@ class Morpheus::Cli::Clouds
         end
         print reset,"\n"
       end
+      return 0, nil
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/commands/standard/curl_command.rb

@@ -9,15 +9,20 @@ class Morpheus::Cli::CurlCommand
   set_command_hidden
 
   def handle(args)
-    split_args = args.join(" ").split(" -- ")
-    args = split_args[0].split(" ")
-    curl_args = split_args[1] ? split_args[1].split(" ") : []
+    # support syntax for arbitrary curl args after " -- " 
+    # eg. curl /api/instances -- -ksv
+    split_index = args.index("--")
+    curl_args = []
+    if split_index
+      if args.length > (split_index + 1)
+        curl_args = args[(split_index + 1)..-1]
+      end
+      args = args[0..(split_index - 1)]
+    end
     curl_method = nil
     curl_data = nil
     curl_verbsose = false
     show_progress = false
-    # puts "args is : #{args}"
-    # puts "curl_args is : #{curl_args}"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus curl [path] -- [*args]"
@@ -98,16 +103,27 @@ EOT
     end
     curl_cmd << " \"#{url}\""
     if @access_token
-      curl_cmd << " -H \"Authorization: Bearer #{@access_token}\""
+      if !(options[:headers] && options[:headers]['Authorization'])
+        curl_cmd << " -H \"Authorization: Bearer #{@access_token}\""
+      end
     end
     if curl_data
       #todo: curl_data.gsub("'","\\'")
       curl_cmd << " --data '#{curl_data}'"
+      if api_path !~ /^\/?oauth/
+        if !(options[:headers] && options[:headers]['Content-Type'])
+          curl_cmd << " -H \"Content-Type: application/json\""
+        end
+      end
+    end
+    if options[:headers]
+      options[:headers].each do |k,v|
+        curl_cmd << " -H \"#{k}: #{v}\""
+      end
     end
     if !curl_args.empty?
       curl_cmd << " " + curl_args.join(' ')
     end
-    
     # Morpheus::Logging::DarkPrinter.puts "#{curl_cmd}" if Morpheus::Logging.debug?
     curl_cmd_str = options[:scrub] ? Morpheus::Logging.scrub_message(curl_cmd) : curl_cmd
 

data/lib/morpheus/cli/deployments.rb

@@ -388,7 +388,7 @@ EOT
       deployment = find_deployment_by_name_or_id(args[0])
       return 1 if deployment.nil?
     else
-      deployment_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deploymentId', 'fieldLabel' => 'Deployment', 'type' => 'select', 'required' => true, 'description' => 'Deployment to add version to', 'optionSource' => lambda {
+      deployment_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deploymentId', 'fieldLabel' => 'Deployment', 'type' => 'select', 'required' => true, 'description' => 'Deployment to add version to', 'optionSource' => lambda { |api_client, api_params|
         @deployments_interface.list(max:10000)['deployments'].collect {|it|
           {'name' => it['name'], 'value' => it['id']}
         }

data/lib/morpheus/cli/invoices_command.rb

@@ -44,7 +44,7 @@ class Morpheus::Cli::InvoicesCommand
       opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
         options[:show_prices] = true
       end
-      opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+      opts.on('-t', '--type TYPE', "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
         params['refType'] ||= []
         values = val.split(",").collect {|it| it.strip }.select {|it| it != "" }
         values.each { |it| params['refType'] << parse_invoice_ref_type(it) }
@@ -193,9 +193,8 @@ class Morpheus::Cli::InvoicesCommand
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if invoices.empty?
-        unless options[:totals_only]
-          print cyan,"No invoices found.",reset,"\n"
-        end
+        print cyan,"No invoices found.",reset,"\n"
+        print reset,"\n"
       else
         # current_date = Time.now
         # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
@@ -300,8 +299,8 @@ class Morpheus::Cli::InvoicesCommand
             end
             if options[:show_estimates]
               cost_rows += [
-                {label: 'Estimated Cost'.upcase, compute: invoice_totals['estimatedComputeCost'], memory: invoice_totals['estimatedMemoryCost'], storage: invoice_totals['estimatedStorageCost'], network: invoice_totals['estimatedNetworkCost'], license: invoice_totals['estimatedLicenseCost'], extra: invoice_totals['estimatedExtraCost'], running: invoice_totals['estimatedRunningCost'], total: invoice_totals['estimatedTotalCost']},
-                {label: 'Estimated Price'.upcase, compute: invoice_totals['estimatedComputePrice'], memory: invoice_totals['estimatedMemoryPrice'], storage: invoice_totals['estimatedStoragePrice'], network: invoice_totals['estimatedNetworkPrice'], license: invoice_totals['estimatedLicensePrice'], extra: invoice_totals['estimatedExtraPrice'], running: invoice_totals['estimatedRunningPrice'], total: invoice_totals['estimatedTotalPrice']},
+                {label: 'Metered Cost'.upcase, compute: invoice_totals['estimatedComputeCost'], memory: invoice_totals['estimatedMemoryCost'], storage: invoice_totals['estimatedStorageCost'], network: invoice_totals['estimatedNetworkCost'], license: invoice_totals['estimatedLicenseCost'], extra: invoice_totals['estimatedExtraCost'], running: invoice_totals['estimatedRunningCost'], total: invoice_totals['estimatedTotalCost']},
+                {label: 'Metered Price'.upcase, compute: invoice_totals['estimatedComputePrice'], memory: invoice_totals['estimatedMemoryPrice'], storage: invoice_totals['estimatedStoragePrice'], network: invoice_totals['estimatedNetworkPrice'], license: invoice_totals['estimatedLicensePrice'], extra: invoice_totals['estimatedExtraPrice'], running: invoice_totals['estimatedRunningPrice'], total: invoice_totals['estimatedTotalPrice']},
               ]
             end
             cost_columns = {
@@ -534,8 +533,8 @@ EOT
       end
       if options[:show_estimates]
         cost_rows += [
-          {label: 'Estimated Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
-          {label: 'Estimated Price'.upcase, compute: invoice['estimatedComputePrice'], memory: invoice['estimatedMemoryPrice'], storage: invoice['estimatedStoragePrice'], network: invoice['estimatedNetworkPrice'], license: invoice['estimatedLicensePrice'], extra: invoice['estimatedExtraPrice'], running: invoice['estimatedRunningPrice'], total: invoice['estimatedTotalPrice']},
+          {label: 'Metered Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
+          {label: 'Metered Price'.upcase, compute: invoice['estimatedComputePrice'], memory: invoice['estimatedMemoryPrice'], storage: invoice['estimatedStoragePrice'], network: invoice['estimatedNetworkPrice'], license: invoice['estimatedLicensePrice'], extra: invoice['estimatedExtraPrice'], running: invoice['estimatedRunningPrice'], total: invoice['estimatedTotalPrice']},
         ]
       end
       cost_columns = {
@@ -683,7 +682,7 @@ EOT
         params['externalId'] ||= []
         params['externalId'] << val
       end
-      opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+      opts.on('-t', '--type TYPE', "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
         params['refType'] ||= []
         values = val.split(",").collect {|it| it.strip }.select {|it| it != "" }
         values.each { |it| params['refType'] << parse_invoice_ref_type(it) }

data/lib/morpheus/cli/jobs_command.rb

@@ -102,15 +102,15 @@ class Morpheus::Cli::JobsCommand
         if stats = json_response['stats']
           label_width = 17
 
-          print_h2 "Executions Stats - Last 7 Days"
+          print_h2 "Execution Stats - Last 7 Days"
           print cyan
 
           print "Jobs".rjust(label_width, ' ') + ": #{stats['jobCount']}\n"
           print "Executions Today".rjust(label_width, ' ') + ": #{stats['todayCount']}\n"
           print "Daily Executions".rjust(label_width, ' ') + ": " + stats['executionsPerDay'].join(' | ') + "\n"
           print "Total Executions".rjust(label_width, ' ') + ": #{stats['execCount']}\n"
-          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
-          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100, {bar_color:green}) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100, {bar_color:red}) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
         end
         print reset,"\n"
       end
@@ -304,7 +304,7 @@ class Morpheus::Cli::JobsCommand
           job_options = @jobs_interface.options(job_type_id)
 
           # prompt task / workflow
-          if job_type['code'] == 'morpheus.task'
+          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']
@@ -320,10 +320,11 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['task'] = {'id' => task['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.task')
+          job_type_id = load_job_type_id_by_code('morpheus.task.jobType') || load_job_type_id_by_code('morpheus.task')
         end
 
         # workflow
+        task_set = nil
         if !options[:workflow].nil?
           task_set = find_by_name_or_id('task_set', options[:workflow])
 
@@ -332,8 +333,29 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['workflow'] = {'id' => task_set['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.workflow')
+          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
+        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})
@@ -768,7 +790,7 @@ class Morpheus::Cli::JobsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      opts.on('-D', '--details [on|off]', String, "Can be used to enable / disable execution details. Default if on") do |val|
+      opts.on('-D', '--details [on|off]', String, "Can be used to enable / disable execution details. Default is on") do |val|
         options[:details] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
@@ -970,7 +992,7 @@ class Morpheus::Cli::JobsCommand
   def format_status(status_string, return_color=cyan)
     out = ""
     if status_string
-      if ['success', 'successful', 'ok'].include?(status_string)
+      if ['complete','success', 'successful', 'ok'].include?(status_string)
         out << "#{green}#{status_string.upcase}"
       elsif ['error', 'offline', 'failed', 'failure'].include?(status_string)
         out << "#{red}#{status_string.upcase}"

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -244,15 +244,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     options = {}
     params = {}
     logo_file = nil
-    option_type_ids = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_option_type_options(opts, options, add_instance_type_option_types())
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
-          option_type_ids = []
+          params['optionTypes'] = []
         else
-          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -348,6 +347,13 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_instance_type_option_types())
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+        if list.nil?
+          params['optionTypes'] = []
+        else
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
       opts.footer = "Update an instance type." + "\n" +
                     "[name] is required. This is the name or id of a instance type."
     end
@@ -375,6 +381,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         params['hasSettings'] = ['on','true','1'].include?(params['hasSettings'].to_s) if params.key?('hasSettings')
         params['hasAutoScale'] = ['on','true','1'].include?(params['hasAutoScale'].to_s) if params.key?('hasAutoScale')
         params['hasDeployment'] = ['on','true','1'].include?(params['hasDeployment'].to_s) if params.key?('hasDeployment')
+        if params['optionTypes']
+          prompt_results = prompt_for_option_types(params, options, @api_client)
+          if prompt_results[:success]
+            params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
+        end
         if params.empty?
           puts optparse
           #option_lines = update_instance_type_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")

data/lib/morpheus/cli/network_pools_command.rb

@@ -596,22 +596,28 @@ class Morpheus::Cli::NetworkPoolsCommand
   def add_ip(args)
     options = {}
     params = {}
+    next_free_ip = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[network-pool] [ip]")
+      opts.banner = subcommand_usage("[network-pool] [ip] [--next]")
       opts.on('--ip-address VALUE', String, "IP Address for this network pool IP") do |val|
         options[:options]['ipAddress'] = val
       end
+      opts.on('--next-free-ip', '--next-free-ip', "Use the next available ip address. This can be used instead of specifying an ip address") do
+        next_free_ip = true
+      end
       opts.on('--hostname VALUE', String, "Hostname for this network pool IP") do |val|
         options[:options]['hostname'] = val
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Create a new network pool IP." + "\n" +
                     "[network-pool] is required. This is the name or id of a network pool.\n" +
-                    "[ip] is required and can be passed as --ip-address instead."
+                    "[ip] is required or --next-free-ip to use the next available address instead."
     end
     optparse.parse!(args)
-    if args.count < 1 || args.count > 2
-      raise_command_error "wrong number of arguments, expected 1-2 and got (#{args.count}) #{args}\n#{optparse}"
+    if next_free_ip
+      verify_args!(args:args, count:1, optparse:optparse)
+    else
+      verify_args!(args:args, min:1, max:2, optparse:optparse)
     end
     connect(options)
     begin
@@ -639,8 +645,10 @@ class Morpheus::Cli::NetworkPoolsCommand
         payload['networkPoolIp'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
         # IP Address
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipAddress', 'fieldLabel' => 'IP Address', 'type' => 'text', 'required' => true, 'description' => 'IP Address for this network pool IP.'}], options[:options])
-        payload['networkPoolIp']['ipAddress'] = v_prompt['ipAddress'] unless v_prompt['ipAddress'].to_s.empty?
+        unless next_free_ip
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipAddress', 'fieldLabel' => 'IP Address', 'type' => 'text', 'required' => true, 'description' => 'IP Address for this network pool IP.'}], options[:options])
+          payload['networkPoolIp']['ipAddress'] = v_prompt['ipAddress'] unless v_prompt['ipAddress'].to_s.empty?
+        end
 
         # Hostname
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname for this network pool IP.'}], options[:options])

data/lib/morpheus/cli/projects_command.rb

@@ -102,7 +102,7 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[project]")
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_get_options(opts, options, [:find_by_name])
       opts.footer = <<-EOT
 Get details about a project.
 [project] is required. This is the name or id of a project.
@@ -127,8 +127,8 @@ EOT
       end
       return
     end
-    project = find_project_by_name_or_id(id)
-    exit 1 if project.nil?
+    project = options[:find_by_name] ? find_project_by_name(id) : find_project_by_name_or_id(id)
+    return 1, "project not found by '#{id}'" if project.nil?
     # refetch it by id
     json_response = {'project' => project}
     unless id.to_s =~ /\A\d{1,}\Z/
@@ -332,7 +332,7 @@ EOT
       opts.on('--remove-resources LIST', Array, "Remove Resources, comma separated list of resource names or IDs to remove.") do |list|
         remove_resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      build_standard_update_options(opts, options)
+      build_standard_update_options(opts, options, [:find_by_name])
       opts.footer = <<-EOT
 Update a project.
 [project] is required. This is the name or id of a project.
@@ -342,7 +342,7 @@ EOT
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     exit_code, err = 0, nil
-    project = find_project_by_name_or_id(args[0])
+    project = options[:find_by_name] ? find_project_by_name(args[0]) : find_project_by_name_or_id(args[0])
     return 1, "project not found by '#{args[0]}'" if project.nil?
     # construct payload
     if options[:payload]
@@ -433,7 +433,7 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[project]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      build_standard_remove_options(opts, options, [:find_by_name])
       # opts.on( '-f', '--force', "Force Delete" ) do
       #   params[:force] = true
       # end
@@ -446,7 +446,7 @@ EOT
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     exit_code, err = 0, nil
-    project = find_project_by_name_or_id(args[0])
+    project = options[:find_by_name] ? find_project_by_name(args[0]) : find_project_by_name_or_id(args[0])
     return 1, "project not found by '#{args[0]}'" if project.nil?
     unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the project #{project['name']}?")
       return 9, "aborted command"

data/lib/morpheus/cli/provisioning_licenses_command.rb

@@ -478,7 +478,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
 
   def add_license_option_types
     [
-      {'fieldName' => 'licenseType', 'fieldLabel' => 'License Type', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldName' => 'licenseType', 'fieldLabel' => 'License Type', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
         # @options_interface.options_for_source("licenseTypes", {})['data']
         get_license_types_dropdown()
       }, 'required' => true, 'displayOrder' => 1},
@@ -493,7 +493,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
         # @options_interface.options_for_source("virtualImages", {})['data']
         get_virtual_images_dropdown()
       }, 'displayOrder' => 9},
-      {'fieldName' => 'tenants', 'fieldLabel' => 'Tenants', 'type' => 'multiSelect', 'optionSource' => lambda { 
+      {'fieldName' => 'tenants', 'fieldLabel' => 'Tenants', 'type' => 'multiSelect', 'optionSource' => lambda { |api_client, api_params| 
         @options_interface.options_for_source("allTenants", {})['data']
       }, 'displayOrder' => 10},
     ]

data/lib/morpheus/cli/service_plans_command.rb

@@ -409,9 +409,9 @@ class Morpheus::Cli::ServicePlanCommand
           while Morpheus::Cli::OptionTypes.confirm("Add #{price_sets.empty? ? '' : 'another '}price set?", {:default => false}) do
             price_unit = prompt_price_unit(options)
 
-            avail_price_sets ||= @price_sets_interface.list['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
+            avail_price_sets ||= @price_sets_interface.list({'priceUnit' => price_unit, 'max' => 10000})['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
 
-            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets.reject {|it| it['priceUnit'] != price_unit}, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
+            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
               price_set = avail_price_sets.find {|it| it['value'] == price_set_id}
               price_sets << {'id' => price_set['value'], 'priceUnit' => price_set['priceUnit']}
               avail_price_sets.reject! {|it| it['value'] == price_set_id}

data/lib/morpheus/cli/tasks.rb

@@ -832,6 +832,7 @@ class Morpheus::Cli::Tasks
         payload = options[:payload]
         payload.deep_merge!({'job' => passed_options})  unless passed_options.empty?
       else
+        # always parse instances and/or hosts
         if instance_ids.size > 0 && server_ids.size > 0
           raise_command_error "Pass --instance or --host, not both.\n#{optparse}"
         elsif instance_ids.size > 0
@@ -848,19 +849,30 @@ class Morpheus::Cli::Tasks
             servers << server
           end
           params['servers'] = servers.collect {|it| it['id'] }
-        elsif target_type == 'appliance'
-          # cool, run it locally.
+        end
+        # validate requires inputs based on task executeTarget
+        if task['executeTarget'] == 'resource'
+          if instance_ids.empty? && server_ids.empty?
+            # todo: prompt for Context: None,Instance,Server and then Instance(s) or Server(s)
+            raise_command_error "missing required option: --instance or --host\n#{optparse}"
+          end
+        elsif task['executeTarget'] == 'local'
+          # no targetType required for local
+        elsif task['executeTarget'] == 'remote'
+          # not sure about this one
         else
-          raise_command_error "missing required option: --instance or --host\n#{optparse}"
+          # unknown executeTarget
         end
+        
+
 
         # todo: prompt to task optionTypes for customOptions
         if task['optionTypes']
           
         end
-
-        params['targetType'] = target_type
-
+        if target_type
+          params['targetType'] = target_type
+        end
         job_payload = {}
         job_payload.deep_merge!(params)
         job_payload.deep_merge!(passed_options) unless passed_options.empty?
@@ -877,15 +889,17 @@ class Morpheus::Cli::Tasks
         puts as_json(json_response, options)
         return json_response['success'] ? 0 : 1
       else
-        target_desc = ""
+        target_desc = nil
         if instances.size() > 0
           target_desc = (instances.size() == 1) ? "instance #{instances[0]['name']}" : "#{instances.size()} instances"
         elsif servers.size() > 0
           target_desc = (servers.size() == 1) ? "host #{servers[0]['name']}" : "#{servers.size()} hosts"
-        elsif target_type == 'appliance'
-          target_desc = "appliance"
         end
-        print_green_success "Executing task #{task['name']} on #{target_desc}"
+        if target_desc
+          print_green_success "Executing task #{task['name']} on #{target_desc}"
+        else
+          print_green_success "Executing task #{task['name']}"
+        end
         # todo: refresh, use get processId and load process record isntead? err
         if json_response["jobExecution"] && json_response["jobExecution"]["id"]
           get_args = [json_response["jobExecution"]["id"], "--details"] + (options[:remote] ? ["-r",options[:remote]] : [])

data/lib/morpheus/cli/tenants_command.rb

@@ -295,7 +295,7 @@ EOT
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldContext' => 'role', 'fieldName' => 'id', 'fieldLabel' => 'Base Role', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldContext' => 'role', 'fieldName' => 'id', 'fieldLabel' => 'Base Role', 'type' => 'select', 'optionSource' => lambda {  |api_client, api_params|
         @roles_interface.list(nil, {roleType:'account'})['roles'].collect {|it|
           {"name" => (it["authority"] || it["name"]), "value" => it["id"]}
         }

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.17"
+    VERSION = "4.2.22"
   end
 end

data/lib/morpheus/cli/workflows.rb

@@ -619,10 +619,11 @@ class Morpheus::Cli::Workflows
         elsif target_type == 'appliance'
           # cool, run it locally.
         else
-          raise_command_error "missing required option: --instance, --host or --appliance\n#{optparse}"
+          # cool, run it locally.
+          #raise_command_error "missing required option: --instance, --host or --appliance\n#{optparse}"
         end
 
-        # todo: prompt to workflow optionTypes for customOptions
+        # prompt to workflow optionTypes for customOptions
         custom_options = nil
         if workflow['optionTypes'] && workflow['optionTypes'].size() > 0
           custom_option_types = workflow['optionTypes'].collect {|it|
@@ -631,9 +632,9 @@ class Morpheus::Cli::Workflows
           }
           custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
         end
-
-        params['targetType'] = target_type
-
+        if target_type
+          params['targetType'] = target_type
+        end
         job_payload = {}
         job_payload.deep_merge!(params)
         passed_options.delete('customOptions')
@@ -655,15 +656,17 @@ class Morpheus::Cli::Workflows
         puts as_json(json_response, options)
         return json_response['success'] ? 0 : 1
       else
-        target_desc = ""
+        target_desc = nil
         if instances.size() > 0
           target_desc = (instances.size() == 1) ? "instance #{instances[0]['name']}" : "#{instances.size()} instances"
         elsif servers.size() > 0
           target_desc = (servers.size() == 1) ? "host #{servers[0]['name']}" : "#{servers.size()} hosts"
-        elsif target_type == 'appliance'
-          target_desc = "appliance"
         end
-        print_green_success "Executing workflow #{workflow['name']} on #{target_desc}"
+        if target_desc
+          print_green_success "Executing workflow #{workflow['name']} on #{target_desc}"
+        else
+          print_green_success "Executing workflow #{workflow['name']}"
+        end
         # todo: refresh, use get processId and load process record isntead? err
         if json_response["jobExecution"] && json_response["jobExecution"]["id"]
           get_args = [json_response["jobExecution"]["id"], "--details"] + (options[:remote] ? ["-r",options[:remote]] : [])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.17
+  version: 4.2.22
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler