morpheus-cli 5.5.1.4 → 5.5.2

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -57,6 +57,10 @@ module Morpheus::Cli::ProvisioningHelper
     @api_client.accounts
   end
 
+  def datastores_interface
+    @api_client.datastores
+  end
+
   def get_available_groups(params = {}, refresh=false)
     if !@available_groups || refresh
       option_results = options_interface.options_for_source('groups', params)
@@ -601,11 +605,13 @@ module Morpheus::Cli::ProvisioningHelper
     payload['instance']['instanceContext'] = v_prompt['environment'] if !v_prompt['environment'].empty?
 
     # Labels (used to be called tags)
-    if options[:labels]
-      payload['instance']['labels'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
-    else
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_labels]}], options[:options])
-      payload['instance']['labels'] = v_prompt['labels'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['labels'].empty?
+    unless options[:skip_labels_prompt]
+      if options[:labels]
+        payload['instance']['labels'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
+      else
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_labels]}], options[:options])
+        payload['instance']['labels'] = v_prompt['labels'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['labels'].empty?
+      end
     end
 
     # Version and Layout
@@ -634,6 +640,8 @@ module Morpheus::Cli::ProvisioningHelper
           version_value = options[:options]['version']
         else
           available_versions = options_interface.options_for_source('instanceVersions',{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})['data']
+          # filter versions with no layouts.. api should probably do that too eh?
+          available_versions.reject! { |available_version| available_version["layouts"].nil? || available_version["layouts"].empty? }
           default_version_value = payload['instance']['version'] ? payload['instance']['version'] : payload['version']
           #default_layout_value = options[:layout]
           if default_layout_value.nil?
@@ -953,6 +961,14 @@ module Morpheus::Cli::ProvisioningHelper
     api_params['config'] = payload['config'] if payload['config']
     api_params['poolId'] = payload['config']['resourcePoolId'] if payload['config'] && payload['config']['resourcePoolId']
     api_params['resourcePoolId'] = api_params['poolId']
+    # some option sources expect networkIntefaces passed as networkInterfaceIds[] eg. oraclecloudAvailabilityDomains
+    if payload['networkInterfaces']
+      begin
+        api_params['networkInterfaceIds[]'] = payload['networkInterfaces'].collect {|it| it['network']['id'] }
+      rescue => netex
+        Morpheus::Logging::DarkPrinter.puts "Unable to parse networkInterfaces parameter" if Morpheus::Logging.debug?
+      end
+    end
 
     # set option type defaults from config
     if options[:default_config]
@@ -1338,7 +1354,7 @@ module Morpheus::Cli::ProvisioningHelper
         'id' => current_root_volume['id'],
         'rootVolume' => true,
         'name' => current_root_volume['name'],
-        'size' => current_root_volume['size'] > (plan_size || 0) ? current_root_volume['size'] : plan_size,
+        'size' => current_root_volume['size'] > 0 ? current_root_volume['size'] : plan_size,
         'sizeId' => nil,
         'storageType' => storage_type_id,
         'datastoreId' => current_root_volume['datastoreId']
@@ -1464,9 +1480,11 @@ module Morpheus::Cli::ProvisioningHelper
         while add_another_volume do
             #puts "Configure Data #{volume_index} Volume"
 
+            current_root_volume_type = current_root_volume['type']
+            storage_type_match = storage_types.find {|type| type['value'] == current_root_volume_type}
+            default_storage_type = storage_type_match ? current_root_volume_type : storage_types[0]['value']
             field_context = "dataVolume#{volume_index}"
-
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'defaultValue' => default_storage_type, 'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
             storage_type_id = v_prompt[field_context]['storageType']
             storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
 
@@ -1510,8 +1528,19 @@ module Morpheus::Cli::ProvisioningHelper
               # volume['size'] = plan_size
               # volume['sizeId'] = nil #volume.delete('sizeId')
             end
+            
+            if datastore_options.empty? && storage_type['hasDatastore'] != false
+              begin
+                datastore_res = datastores_interface.list({'resourcePoolId' => current_root_volume['resourcePoolId'], 'zoneId' => options['zoneId'], 'siteId' => options['siteId']})['datastores']
+                datastore_res.each do |opt|
+                  datastore_options << {'name' => opt['name'], 'value' => opt['id']}
+                end
+              rescue
+                datastore_options = []
+              end
+            end
             if !datastore_options.empty?
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'defaultValue' => current_root_volume['datastoreId'],'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
               volume['datastoreId'] = v_prompt[field_context]['datastoreId']
             end
 

data/lib/morpheus/cli/mixins/rest_command.rb

@@ -425,10 +425,6 @@ module Morpheus::Cli::RestCommand
     self.class.rest_type_arg
   end
 
-  def rest_has_name
-    self.class.rest_type_arg
-  end
-
   def rest_type_label
     self.class.rest_type_label
   end
@@ -524,7 +520,10 @@ EOT
     json_response = rest_interface.list(params)
     render_response(json_response, options, rest_list_key) do
       records = json_response[rest_list_key]
-      print_h1 "Morpheus #{rest_label_plural}"
+      title = "Morpheus #{rest_label_plural}"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles, options
       if records.nil? || records.empty?
         print cyan,"No #{rest_label_plural.downcase} found.",reset,"\n"
       else
@@ -586,7 +585,7 @@ EOT
       #   print_description_list(config.keys, config)
       # end
       # Option Types
-      if record['optionTypes'] && record['optionTypes'].size > 0
+      if record['optionTypes'] && record['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.size > 0
         print_h2 "Option Types", options
         print format_option_types_table(record['optionTypes'], options, rest_object_key)
       end
@@ -603,7 +602,11 @@ EOT
     advanced_option_types = respond_to?("add_#{rest_key}_advanced_option_types", true) ? send("add_#{rest_key}_advanced_option_types") : []
     type_option_type = option_types.find {|it| it['fieldName'] == 'type'} 
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[#{rest_arg}]")
+      if rest_has_name
+        opts.banner = subcommand_usage("[name]")
+      else
+        opts.banner = subcommand_usage()
+      end
       if rest_has_type && type_option_type.nil?
         opts.on( '-t', "--#{rest_type_arg} TYPE", "#{rest_type_label}" ) do |val|
           record_type_id = val
@@ -614,7 +617,7 @@ EOT
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a new #{rest_label.downcase}.
-[#{rest_arg}] is required. This is the name of the new #{rest_label.downcase}.
+[name] is required. This is the name of the new #{rest_label.downcase}.
 EOT
       opts.footer += send "add_#{rest_key}_footer_addn" if respond_to?("add_#{rest_key}_footer_addn", true)
     end
@@ -888,5 +891,100 @@ EOT
     return 0, nil
   end
 
+  def list_types(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[search]")
+      build_list_options(opts, options, params)
+      opts.footer = <<-EOT
+List #{rest_type_label_plural.downcase}.
+[search] is optional. This is a search phrase to filter the results.
+EOT
+    end
+    optparse.parse!(args)
+    connect(options)
+    parse_list_options!(args, options, params)
+    rest_type_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run rest_type_interface.dry.list(params)
+      return
+    end
+    json_response = rest_type_interface.list(params)
+    render_response(json_response, options, rest_type_list_key) do
+      records = json_response[rest_type_list_key]
+      title = "Morpheus #{rest_type_label_plural}"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles, options
+      if records.nil? || records.empty?
+        print cyan,"No #{rest_type_label_plural.downcase} found.",reset,"\n"
+      else
+        print as_pretty_table(records, rest_type_list_column_definitions(options).upcase_keys!, options)
+        print_results_pagination(json_response) if json_response['meta']
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def get_type(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[#{rest_type_arg}]")
+      build_get_options(opts, options, params)
+      opts.footer = <<-EOT
+Get details about #{a_or_an(rest_type_label)} #{rest_type_label.downcase}.
+[#{rest_type_arg}] is required. This is the name or id of #{a_or_an(rest_type_label)} #{rest_type_label.downcase}.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
+    connect(options)
+    parse_get_options!(args, options, params)
+    id = args.join(" ")
+    _get_type(id, params, options)
+  end
+
+  def _get_type(id, params, options)
+    if id !~ /\A\d{1,}\Z/ # && rest_type_has_name
+      record = rest_type_find_by_name_or_id(id)
+      if record.nil?
+        return 1, "#{rest_type_label} not found for '#{id}'"
+      end
+      id = record['id']
+    end
+    rest_type_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run rest_type_interface.dry.get(id, params)
+      return
+    end
+    json_response = rest_type_interface.get(id, params)
+    render_response_for_get_type(json_response, options)
+    return 0, nil
+  end
+
+  def render_response_for_get_type(json_response, options)
+    render_response(json_response, options, rest_type_object_key) do
+      record = json_response[rest_type_object_key]
+      print_h1 rest_type_label, [], options
+      print cyan
+      print_description_list(rest_type_column_definitions(options), record, options)
+      # # could always show config eh? or maybe only with --config if that is nicer.
+      # # config = record['config'].is_a?(Hash) && !record['config'].empty?
+      # if config && !config.empty?
+      #   print_h2 "Configuration"
+      #   print_description_list(config.keys, config)
+      # end
+      # Option Types
+      if record['optionTypes'] && record['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.size > 0
+        print_h2 "Option Types", options
+        print format_option_types_table(record['optionTypes'], options, rest_object_key)
+      end
+      print reset,"\n"
+    end
+  end
+
 end
 

data/lib/morpheus/cli/mixins/secondary_rest_command.rb

@@ -369,7 +369,11 @@ EOT
     advanced_option_types = respond_to?("add_#{rest_key}_advanced_option_types", true) ? send("add_#{rest_key}_advanced_option_types") : []
     type_option_type = option_types.find {|it| it['fieldName'] == 'type'} 
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[#{rest_parent_arg}] [#{rest_arg}]")
+      if rest_has_name
+        opts.banner = subcommand_usage("[#{rest_parent_arg}] [name]")
+      else
+        opts.banner = subcommand_usage("[#{rest_parent_arg}]")
+      end
       if rest_has_type && type_option_type.nil?
         opts.on( '-t', "--#{rest_type_arg} TYPE", "#{rest_type_label}" ) do |val|
           record_type_id = val
@@ -381,7 +385,7 @@ EOT
       opts.footer = <<-EOT
 Create a new #{rest_label.downcase}.
 [#{rest_parent_arg}] is required. This is the #{rest_parent_has_name ? 'name or id' : 'id'} of #{a_or_an(rest_parent_label)} #{rest_parent_label.downcase}.
-[#{rest_arg}] is required. This is the name of the new #{rest_label.downcase}.
+[name] is required. This is the name of the new #{rest_label.downcase}.
 EOT
     end
     optparse.parse!(args)

data/lib/morpheus/cli/option_types.rb

@@ -75,6 +75,10 @@ module Morpheus
 
         # puts "Options Prompt #{options}"
         # Sort options by default, group, advanced
+        # add displayOrder if it's missing, so it doesn't end up using a random order
+        if !option_types.find {|it| it['displayOrder'] }
+          option_types.each_with_index {|it, i| it['displayOrder'] = i+1 }
+        end
         cur_field_group = 'default'
         prompt_local_credentials = true
         self.sort_option_types(option_types.reject {|it| it[:for_help_only]}).each do |option_type|
@@ -86,7 +90,7 @@ module Morpheus
 
           if cur_field_group != field_group
             cur_field_group = field_group
-            if !no_prompt 
+            if !no_prompt && option_type['noPrompt'] != true
               print "\n#{cur_field_group.upcase} OPTIONS\n#{"=" * ("#{cur_field_group} OPTIONS".length)}\n\n"
             end
           end
@@ -114,8 +118,11 @@ module Morpheus
           if !option_type['visibleOnCode'].to_s.empty?
             visible_option_check_value = option_type['visibleOnCode']
           end
-
-          if !visible_option_check_value.to_s.empty?
+          # adding a slight hack for dependencies on the network component since its not an option type
+          extra_option_params = {}
+          if visible_option_check_value == 'networkInterfaces'
+            # extra_option_params["networkInterfaceIds[]"] = []
+          elsif !visible_option_check_value.to_s.empty?
             match_type = 'any'
 
             if visible_option_check_value.include?('::')
@@ -161,6 +168,7 @@ module Morpheus
           # build parameters for option source api request
           option_params = (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results))
           option_params.merge!(option_type['optionParams']) if option_type['optionParams']
+          # option_params.merge!(extra_option_params) if extra_option_params && !extra_option_params.empty?
 
           cur_namespace = options
           parent_context_map = context_map
@@ -243,7 +251,7 @@ module Morpheus
           end
           # no_prompt means skip prompting and instead
           # use default value or error if a required option is not present
-          if no_prompt
+          if no_prompt || option_type['noPrompt'] == true
             if !value_found
               if option_type['defaultValue'] != nil && !['select', 'multiSelect','typeahead','multiTypeahead'].include?(option_type['type'])
                 value = option_type['defaultValue']
@@ -356,6 +364,11 @@ module Morpheus
             end
           end
 
+          # --labels x,y,z uses processValue proc to convert strings to an array
+          if option_type['processValue'].is_a?(Proc)
+            value = option_type['processValue'].call(value)
+          end
+
           if option_type['type'] == 'multiSelect'
             value = [value] if !value.nil? && !value.is_a?(Array)
           elsif option_type['type'] == 'multiText'
@@ -474,7 +487,22 @@ module Morpheus
 
         # ensure the preselected value (passed as an option) is in the dropdown
         if !use_value.nil?
-          matched_option = select_options.find {|opt| opt[value_field].to_s == use_value.to_s || opt['name'].to_s == use_value.to_s }
+          matched_option = select_options.find {|it| it[value_field].to_s == use_value.to_s }
+          if matched_option.nil?
+            matched_options = select_options.select {|it| opt['name'].to_s == use_value.to_s }
+            if matched_options.size > 1
+              print Term::ANSIColor.red, "\nInvalid Option #{option_type['fieldLabel']}: [#{use_value}]\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
+              display_select_options(option_type, matched_options)
+              print "The value '#{input}' matched #{matched_options.size()} options.\n"
+              # print "Perhaps you meant one of these? #{ored_list(matched_options.collect {|i|i[value_field]}, 3)}\n"
+              print "Try using value instead of name.\n"
+              print "\n"
+              exit 1
+            elsif matched_options.size == 1
+              matched_option = matched_options[0]
+            end
+          end
           if !matched_option.nil?
             value = matched_option[value_field]
             value_found = true
@@ -522,10 +550,39 @@ module Morpheus
 
         if no_prompt
           if !value_found
-            if !default_value.nil? && !select_options.nil? && select_options.find {|it| it['name'] == default_value || it[value_field].to_s == default_value.to_s}
-              value_found = true
-              value = select_options.find {|it| it['name'] == default_value || it[value_field].to_s == default_value.to_s}[value_field]
-            elsif !select_options.nil? && select_options.count > 1 && option_type['autoPickOption'] == true
+            if !default_value.nil? && !select_options.nil?
+              matched_option = select_options.find {|it| it[value_field].to_s == default_value.to_s }
+              if matched_option.nil?
+                matched_options = select_options.select {|it| it['name'].to_s == default_value.to_s }
+                if matched_options.size > 1
+                  print Term::ANSIColor.red, "\nInvalid Option #{option_type['fieldLabel']}: [#{default_value}]\n\n", Term::ANSIColor.reset
+                  print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
+                  display_select_options(option_type, matched_options)
+                  print "The value '#{default_value}' matched #{matched_options.size()} options.\n"
+                  # print "Perhaps you meant one of these? #{ored_list(matched_options.collect {|i|i[value_field]}, 3)}\n"
+                  print "Try using value instead of name.\n"
+                  print "\n"
+                  exit 1
+                elsif matched_options.size == 1
+                  matched_option = matched_options[0]
+                end
+              end
+              if !matched_option.nil?
+                value = matched_option[value_field]
+                value_found = true
+              else
+                print Term::ANSIColor.red, "\nInvalid Option #{option_type['fieldLabel']}: [#{default_value}]\n\n", Term::ANSIColor.reset
+                print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
+                if select_options && select_options.size > 10
+                  display_select_options(option_type, select_options.first(10))
+                  puts " (#{select_options.size-10} more)"
+                else
+                  display_select_options(option_type, select_options)
+                end
+                print "\n"
+                exit 1
+              end
+            elsif !select_options.nil? && select_options.count > 0 && option_type['autoPickOption'] == true
               value_found = true
               value = select_options[0][value_field]
             elsif option_type['required']
@@ -577,10 +634,26 @@ module Morpheus
           if input.empty? && default_value
             input = default_value.to_s
           end
-          select_option = select_options.find{|b| b['name'] == input || (!b['value'].nil? && b['value'].to_s == input) || (!b[value_field].nil? && b[value_field].to_s == input) || (b[value_field].nil? && input.empty?)}
-          if select_option
-            value = select_option[value_field]
-            set_last_select(select_option)
+          matched_option = select_options.find{|it| (!it['value'].nil? && it['value'].to_s == input) || (!it[value_field].nil? && it[value_field].to_s == input) || (it[value_field].nil? && input.empty?)}
+          if matched_option.nil?
+            matched_options = select_options.select {|it| it['name'] == input } # should probably be case insensitive 
+            if matched_options.size > 1
+              print Term::ANSIColor.red, "\nInvalid Option #{option_type['fieldLabel']}: [#{input}]\n\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
+              display_select_options(option_type, matched_options)
+              print "The value '#{input}' matched #{matched_options.size()} options.\n"
+              # print "Perhaps you meant one of these? #{ored_list(matched_options.collect {|i|i[value_field]}, 3)}\n"
+              print "Try using value instead of name.\n"
+              print "\n"
+              exit 1
+            elsif matched_options.size == 1
+              matched_option = matched_options[0]
+            end
+          end
+
+          if matched_option
+            value = matched_option[value_field]
+            set_last_select(matched_option)
           elsif !input.nil?  && !input.to_s.empty?
             input = '?'
           end
@@ -780,32 +853,28 @@ module Morpheus
         value
       end
 
-      # this is a funky one, the user is prompted for yes/no
-      # but the return value is 'on','off',nil
-      # todo: maybe make this easier to use, and have the api's be flexible too..
-      # @param option_type [Hash] option type object with type,fieldName,fieldLabel,etc..
-      # @return 'on', 'off' or nil
       def self.checkbox_prompt(option_type)
         value_found = false
         value = nil
         has_default = option_type['defaultValue'] != nil
-        default_yes = has_default ? ['on', 'true', 'yes', '1'].include?(option_type['defaultValue'].to_s.downcase) : false
+        default_on = has_default ? ['on', 'true', 'yes', '1'].include?(option_type['defaultValue'].to_s.downcase) : false
         while !value_found do
-          print "#{option_type['fieldLabel']} (yes/no)#{has_default ? ' ['+(default_yes ? 'yes' : 'no')+']' : ''}: "
+          print "#{option_type['fieldLabel']} (on/off)#{has_default ? ' ['+(default_on ? 'on' : 'off')+']' : ''}: "
           input = $stdin.gets.chomp!
           if input == '?'
             help_prompt(option_type)
             next
           end
-          if input.downcase == 'yes' || input.downcase == 'y' || input.downcase == 'on'
+          check_value = input.downcase.strip
+          if check_value == 'yes' || check_value == 'y' || check_value == 'on' || check_value == 'true' || check_value == '1'
             value_found = true
             value = 'on'
-          elsif input.downcase == 'no' || input.downcase == 'n' || input.downcase == 'off'
+          elsif check_value == 'no' || check_value == 'n' || check_value == 'off' || check_value == 'true' || check_value == '0'
             value_found = true
             value = 'off'
           elsif input == '' && has_default
             value_found = true
-            value = default_yes ? 'on' : 'off'
+            value = default_on ? 'on' : 'off'
           elsif input != ""
             puts "Invalid Option... Please try again."
             next
@@ -1170,6 +1239,7 @@ module Morpheus
       def self.format_select_options_help(opt, select_options = [], paging = nil)
         out = ""
         header = opt['fieldLabel'] ? "#{opt['fieldLabel']} Options" : "Options"
+        value_field = (opt['config'] ? opt['config']['valueField'] : nil) || 'value'
         if paging
           offset = paging[:cur_page] * paging[:page_size]
           limit = [offset + paging[:page_size], select_options.count].min - 1
@@ -1180,9 +1250,8 @@ module Morpheus
         out << "\n"
         out << "#{header}\n"
         out << "#{'=' * header.length}\n"
-
         select_options.each do |option|
-          out << (option['isGroup'] ? "- #{option['name']}\n" : " * #{option['name']} [#{option['value']}]\n")
+          out << (option['isGroup'] ? "- #{option['name']}\n" : " * #{option['name']} [#{option[value_field]}]\n")
         end
         return out
       end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.1.4"
+    VERSION = "5.5.2"
   end
 end

data/lib/morpheus/formatters.rb

@@ -1,6 +1,7 @@
 require 'time'
 require 'filesize'
 require 'money'
+require 'cgi'
 
 DEFAULT_DATE_FORMAT = "%x"
 DEFAULT_TIME_FORMAT = "%x %I:%M %p"
@@ -366,7 +367,11 @@ def format_number(n, opts={})
   decimal = parts[1] ? parts[1..-1].join('.') : nil
   i = 0
   whole_number.reverse.each_char do |c|
-    out = (i > 0 && i % 3 == 0) ? "#{c}#{delim}#{out}" : "#{c}#{out}"
+    if c == "-"
+      out = "#{c}#{out}"
+    else
+      out = (i > 0 && i % 3 == 0) ? "#{c}#{delim}#{out}" : "#{c}#{out}"
+    end
     i+= 1
   end
   if decimal
@@ -488,3 +493,7 @@ def format_ok_status(status)
   end
   "#{color}#{status.to_s.upcase}#{cyan}"
 end
+
+def escape_filepath(filepath)
+  filepath.to_s.split("/").select {|it| !it.to_s.empty? }.collect {|it| CGI::escape(it) }.join("/")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.5.1.4
+  version: 5.5.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,10 +191,12 @@ files:
 - lib/morpheus/api/backups_interface.rb
 - lib/morpheus/api/billing_interface.rb
 - lib/morpheus/api/blueprints_interface.rb
+- lib/morpheus/api/body_io.rb
 - lib/morpheus/api/budgets_interface.rb
 - lib/morpheus/api/catalog_item_types_interface.rb
 - lib/morpheus/api/certificate_types_interface.rb
 - lib/morpheus/api/certificates_interface.rb
+- lib/morpheus/api/clients_interface.rb
 - lib/morpheus/api/cloud_datastores_interface.rb
 - lib/morpheus/api/cloud_folders_interface.rb
 - lib/morpheus/api/cloud_policies_interface.rb
@@ -264,6 +266,7 @@ files:
 - lib/morpheus/api/network_edge_clusters_interface.rb
 - lib/morpheus/api/network_groups_interface.rb
 - lib/morpheus/api/network_pool_ips_interface.rb
+- lib/morpheus/api/network_pool_server_types_interface.rb
 - lib/morpheus/api/network_pool_servers_interface.rb
 - lib/morpheus/api/network_pools_interface.rb
 - lib/morpheus/api/network_proxies_interface.rb
@@ -280,6 +283,7 @@ files:
 - lib/morpheus/api/options_interface.rb
 - lib/morpheus/api/packages_interface.rb
 - lib/morpheus/api/ping_interface.rb
+- lib/morpheus/api/plugins_interface.rb
 - lib/morpheus/api/policies_interface.rb
 - lib/morpheus/api/power_schedules_interface.rb
 - lib/morpheus/api/price_sets_interface.rb
@@ -300,6 +304,9 @@ files:
 - lib/morpheus/api/secondary_rest_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
 - lib/morpheus/api/security_groups_interface.rb
+- lib/morpheus/api/security_package_types_interface.rb
+- lib/morpheus/api/security_packages_interface.rb
+- lib/morpheus/api/security_scans_interface.rb
 - lib/morpheus/api/server_types_interface.rb
 - lib/morpheus/api/servers_interface.rb
 - lib/morpheus/api/service_catalog_interface.rb
@@ -355,6 +362,7 @@ files:
 - lib/morpheus/cli/commands/catalog_item_types_command.rb
 - lib/morpheus/cli/commands/certificates_command.rb
 - lib/morpheus/cli/commands/change_password_command.rb
+- lib/morpheus/cli/commands/clients_command.rb
 - lib/morpheus/cli/commands/cloud_datastores_command.rb
 - lib/morpheus/cli/commands/cloud_folders_command.rb
 - lib/morpheus/cli/commands/cloud_resource_pools_command.rb
@@ -429,6 +437,7 @@ files:
 - lib/morpheus/cli/commands/network_edge_clusters_command.rb
 - lib/morpheus/cli/commands/network_firewalls_command.rb
 - lib/morpheus/cli/commands/network_groups_command.rb
+- lib/morpheus/cli/commands/network_pool_server_types.rb
 - lib/morpheus/cli/commands/network_pool_servers_command.rb
 - lib/morpheus/cli/commands/network_pools_command.rb
 - lib/morpheus/cli/commands/network_proxies_command.rb
@@ -441,6 +450,7 @@ files:
 - lib/morpheus/cli/commands/options.rb
 - lib/morpheus/cli/commands/packages_command.rb
 - lib/morpheus/cli/commands/ping.rb
+- lib/morpheus/cli/commands/plugins.rb
 - lib/morpheus/cli/commands/policies_command.rb
 - lib/morpheus/cli/commands/power_schedules_command.rb
 - lib/morpheus/cli/commands/preseed_scripts_command.rb
@@ -459,6 +469,9 @@ files:
 - lib/morpheus/cli/commands/search_command.rb
 - lib/morpheus/cli/commands/security_group_rules.rb
 - lib/morpheus/cli/commands/security_groups.rb
+- lib/morpheus/cli/commands/security_package_types.rb
+- lib/morpheus/cli/commands/security_packages.rb
+- lib/morpheus/cli/commands/security_scans.rb
 - lib/morpheus/cli/commands/service_catalog_command.rb
 - lib/morpheus/cli/commands/service_plans_command.rb
 - lib/morpheus/cli/commands/set_prompt_command.rb