morpheus-cli 4.2.18 → 4.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625ac78e3858476f22af0b74911f623680b61a1f02808d7af341a49e591bd679
-  data.tar.gz: 9ba142c3499a5fbb16b5e920c19c2fc3efa0c3617b3d29b4766bc960f6372a51
+  metadata.gz: 016e1e5944640601028a71e3ab47affa1bc478ce84f67153e64082f4c2a66054
+  data.tar.gz: e9a23006ef89a10875b7cd75fe67cab362d4a444e9c85d5ff2cbd2ac0496ebbb
 SHA512:
-  metadata.gz: 9ab2c8609c0fbc67d11a59db49b7dfb19b6f6bac97cea016797d5d43e56a620d74e0c2d125234aef996e6900afbab6258b7a069f6c36984f31760acd22023f54
-  data.tar.gz: eddf3b6dca658ee215313f7970af3377ad6c284bf127869b2b8c4ddeb212081dead70a909d6ee1740aba849a415e8d64c49859ecfba160fed2f36d395e447197
+  metadata.gz: 0eeedbb93fd5da660cb68578efb3d81e1f1565461b48557ca405e40e2ae34b9916325feba18dea0af7d234fff7004a72adbe6b1750a8dda17ac0b538b0af9318
+  data.tar.gz: e5c7f57aa7f1ffa962d23bba8faa341bf98fb653042c332e7998a940e03988dd71539f6fcf84fb152eb0896a8bedc1a918156ddef6626d71fb34785f63582318

data/Dockerfile

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

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/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/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/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

@@ -768,7 +768,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 +970,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/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/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/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.18"
+    VERSION = "4.2.19"
   end
 end

data/lib/morpheus/cli/workflows.rb

@@ -619,7 +619,8 @@ 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
@@ -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.18
+  version: 4.2.19
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler