morpheus-cli 6.3.3 → 6.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94da7995030caa8d8370454c1a17ae68e314080fa52dde2d95b48122e69e5f6d
-  data.tar.gz: 19aa5d0040441e385606f43f1ae1b0d09e6eb5a3fa99958450acc6914dc8a803
+  metadata.gz: 044ab9d85780cd6e8c58298dd7eea8c389093c0c40f97e444c1050ecb9447d65
+  data.tar.gz: 54d733790244eea47f2310d0211dc4173ff26a89b9cde962cc64627f1ea8a68a
 SHA512:
-  metadata.gz: d718c881f79ecdf26a91172506f9500b69a3269bc1ae00bf53d0191fcbe484d10aea1e9919822c2a6fdf69d195b2d1c8009917d79ef9d5fd0df0a76962ba8f14
-  data.tar.gz: da197f17e1617a9f909bd61b92c3f82b79ab70b951603033b08cd6b86e5b5ff20b8f659cd48fd5823fea80afad02712be72ad202ec5ef0d3e179a12a503af225
+  metadata.gz: 527cceb963b7b673ec478a1717cf39b0481a295a59026430944621d6e9133044e6296107d90c336750ff5413599032379e0d012285a23a63e1ecd1287558a863
+  data.tar.gz: a160e2dc2676bcaaded2318268f72df801b9c6514293ba6c1ce59c54cc6803221e04885066d961bdb78dbcfa49855236f79ab24727685d35442e40dda5933ad5

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 6.3.3
+RUN gem install morpheus-cli -v 6.3.4
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -894,6 +894,10 @@ class Morpheus::APIClient
     Morpheus::BackupServiceTypesInterface.new(common_interface_options).setopts(@options)
   end
 
+  def backup_types
+    Morpheus::BackupTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def catalog_item_types
     Morpheus::CatalogItemTypesInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/backup_restores_interface.rb

@@ -15,6 +15,10 @@ class Morpheus::BackupRestoresInterface < Morpheus::APIClient
     execute(method: :get, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
+  def create(payload, params={}, headers={})
+    execute(method: :post, url: "#{base_path}", params: params, payload: payload, headers: headers)
+  end
+
   def destroy(id, params = {}, headers={})
     validate_id!(id)
     execute(method: :delete, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)

data/lib/morpheus/api/backup_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::BackupTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/backup-types"
+  end
+
+end

data/lib/morpheus/cli/cli_command.rb

@@ -200,6 +200,9 @@ module Morpheus
           #   value_label = 'SELECT'
           # elsif option['type'] == 'select'
           end
+          if option_type['optionalValue']
+            value_label = "[#{value_label}]"
+          end
           full_option = "--#{full_field_name} #{value_label}"
           # switch is an alias for the full option name, fieldName is the default
           if option_type['switch']

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

@@ -0,0 +1,53 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::BackupTypes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_description "View backup types."
+  set_command_name :'backup-types'
+  register_subcommands :list, :get
+  register_interfaces :backup_types
+
+  # This is a hidden command, could move to backup list-types and backup get-type
+  set_command_hidden
+
+  protected
+
+  def backup_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      # "Active" => lambda {|it| format_boolean it['active'] },
+      # "Provider Code" => 'providerCode',
+    }
+  end
+
+  def backup_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      #"Backup Format" => 'backupFormat',
+      "Active" => lambda {|it| format_boolean it['active'] },
+      # "Container Type" => 'containerType',
+      # "Container Format" => 'containerFormat',
+      # "Container Category" => 'containerCategory',
+      "Restore Type" => 'restoreType',
+      # "Has Stream To Store" => lambda {|it| format_boolean it['hasStreamToStore'] },
+      # "Has Copy To Store" => lambda {|it| format_boolean it['hasCopyToStore'] },
+      "Download" => lambda {|it| format_boolean it['downloadEnabled'] },
+      # "Download From Store Only" => lambda {|it| format_boolean it['downloadFromStoreOnly'] },
+      # "Copy To Store" => lambda {|it| format_boolean it['copyToStore'] },
+      "Restore Existing" => lambda {|it| format_boolean it['restoreExistingEnabled'] },
+      "Restore New" => lambda {|it| format_boolean it['restoreNewEnabled'] },
+      # "Restore New Mode" => 'restoreNewMode',
+      # "Prune Results On Restore Existing" => lambda {|it| format_boolean it['pruneResultsOnRestoreExisting'] },
+      # "Restrict Targets" => lambda {|it| format_boolean it['restrictTargets'] },
+      # "Provider Code" => 'providerCode',
+      "Plugin" => lambda {|it| format_boolean it['isPlugin'] },
+      "Embedded" => lambda {|it| format_boolean it['isEmbedded'] },
+    }
+  end
+end

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

@@ -9,7 +9,7 @@ class Morpheus::Cli::BackupsCommand
   
   set_command_description "View and manage backups"
   set_command_name :'backups'
-  register_subcommands :list, :get, :add, :update, :remove, :execute #, :restore
+  register_subcommands :list, :get, :add, :update, :remove, :execute, :restore
   register_subcommands :list_jobs, :get_job, :add_job, :update_job, :remove_job, :execute_job
   register_subcommands :list_results, :get_result, :remove_result
   register_subcommands :list_restores, :get_restore, :remove_restore
@@ -45,7 +45,7 @@ class Morpheus::Cli::BackupsCommand
     end
     params.merge!(parse_list_options(options))
     parse_options(options, params)
-    execute_api(@backups_interface, :list, [], options, 'backup') do |json_response|
+    execute_api(@backups_interface, :list, [], options, 'backups') do |json_response|
       backups = json_response['backups']
       print_h1 "Morpheus Backups", parse_list_subtitles(options), options
       if backups.empty?
@@ -315,19 +315,18 @@ EOT
   end
 
   def restore(args)
-    raise "Not Yet Implemented"
     options = {}
     params = {}
     payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[backup] [result] [options]")
-      build_standard_post_options(opts, options)
+      build_standard_post_options(opts, options, [:auto_confirm])
       opts.on('--result ID', String, "Backup Result ID that is being restored") do |val|
         options[:options]['backupResultId'] = val
       end
       opts.on('--restore-instance existing|new', String, "Instance being targeted for the restore, existing to restore the current instance or new to create a new instance. The current instance is targeted by default.") do |val|
-        # restoreInstanceSelect=current|new and the flag on the restore object is called 'restoreToNew'
-        options[:options]['restoreInstanceSelect'] = val
+        # restoreInstance=existing|new and the flag on the restore object is called 'restoreToNew'
+        options[:options]['restoreInstance'] = val
       end
       opts.footer = <<-EOT
 Restore a backup, replacing the existing target with the specified backup result.
@@ -350,32 +349,71 @@ EOT
         available_backups = @backups_interface.list({max:10000})['backups'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
         backup_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'backupId', 'fieldLabel' => 'Backup', 'type' => 'select', 'selectOptions' => available_backups, 'required' => true}], options[:options], @api_client)['backupId']
         backup = find_backup_by_name_or_id(backup_id)
-      return 1 if backup.nil?
+        return 1 if backup.nil?
       end
     end
     # Prompt for backup result
     if backup_result.nil?
-
-      # Instance
-        available_backup_results = @backups_interface.list({backupId: backup['id'], max:10000})['results'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
-        params['backupResultId'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'backupResultId', 'fieldLabel' => 'Backup Result', 'type' => 'select', 'selectOptions' => available_backup_results, 'required' => true}], options[:options], @api_client)['backupResultId']
-        # Name
-        params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Backup Name'}], options[:options], @api_client)['name']
+      #available_backup_results = @backup_results_interface.list({backupId: backup['id'], status: ['success', 'succeeded'], max:10000})['results'].collect {|it| {format_backup_result_option_name(it), 'value' => it['id']}}
+      available_backup_results = @backup_results_interface.list({backupId: backup['id'], max:10000})['results'].select {|it| it['status'].to_s.downcase == 'succeeded' || it['status'].to_s.downcase == 'success' }.collect {|it| {'name' => format_backup_result_option_name(it), 'value' => it['id']} }
+      params['backupResultId'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'backupResultId', 'fieldLabel' => 'Backup Result', 'type' => 'select', 'selectOptions' => available_backup_results, 'required' => true}], options[:options], @api_client)['backupResultId']
+      backup_result = @backup_results_interface.get(params['backupResultId'].to_i)['result']
     end
-    
     parse_payload(options, 'restore') do |payload|
       # Prompt for restore configuration
-      # We should probably require identifying the instance by name or id too, just to be safe.
+      # todo: These options should be based on backup type
+      #       Look at backup_type['restoreExistingEnabled'] and backup_type['restoreNewEnabled']
       # Target Instance
-      if backup_result['instance']
-        params['restoreInstanceSelect'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Instance being targeted for the restore, existing to restore the current instance or new to create a new instance. By default the existing instance is restored.'}], options[:options], @api_client)['restoreInstanceSelect']
+      #if backup_result['instanceId']
+      if backup['locationType'] == 'instance'
+        instance = backup['instance']
+        # could actually fetch the instance.., only need name and id right now though.
+        raise_command_error "Backup instance not found" if instance.nil?
+        params['restoreInstance'] = prompt_value({'fieldName' => 'restoreInstance', 'fieldLabel' => 'Restore Instance', 'type' => 'select', 'selectOptions' => [{'name' => 'Current Instance', 'value' => 'existing'}, {'name' => 'New Instance', 'value' => 'new'}], 'defaultValue' => 'existing', 'required' => true, 'description' => 'Restore the current instance or a new instance?'}, options)
+        if params['restoreInstance'] == 'new'
+          # new instance
+          config_map = prompt_restore_instance_config(options)
+          params['instanceConfig'] = config_map
+        else
+          # existing instance
+          # confirm the instance
+          keep_prompting = !options[:no_prompt]
+          while keep_prompting
+            instance_id = prompt_value({'fieldName' => 'instanceId', 'fieldLabel' => 'Confirm Instance ID', 'type' => 'text', 'required' => true, 'description' => "Enter the current instance ID to confirm that you wish to restore it."}, options)
+            if instance_id && instance_id.to_i == instance['id']
+              params['instanceId'] = instance_id.to_i
+              keep_prompting = false
+            elsif instance_id.to_s.downcase == instance['name'].to_s.downcase # allow matching on name too
+              params['instanceId'] = instance['id']
+              keep_prompting = false
+            else
+              print_red_alert "The value '#{instance_id}' does not match the existing instance #{instance['name']} [#{instance['id'] rescue ''}]. Please try again."
+            end
+          end
+        end
+      elsif backup['locationType'] == 'server'
+        # prompt for server type backup restore
+      elsif backup['locationType'] == 'storage'
+        # prompt for storage type backup restore
+      else
+        print yellow, "Backup location type is unknown: #{backup['locationType']}",reset,"\n"
       end
-      payload['backup'].deep_merge!(params)
+
+      payload['restore'].deep_merge!(params)
     end
 
-    print cyan,"#{bold}WARNING!#{reset}#{cyan} Restoring a backup will erase all data when restored to an existing instance.",reset,"\n"
-    confirm!("Are you sure you want to restore the backup result ID: #{backup_result['id']} Name: #{backup_result['backup']['name'] rescue ''} Date: (#{format_local_dt(backup_result['dateCreated'])})?", options)
-    execute_api(@backups_interface, :restore, [backup['id']], options, 'backup') do |json_response|
+    if params['restoreInstance'] != 'new'
+      if backup['instance']
+        print cyan,"You have selected to restore the existing instance #{backup['instance']['name'] rescue ''} [#{backup['instance']['id'] rescue ''}] with the backup result #{format_backup_result_option_name(backup_result)} [#{backup_result['id']}]",reset,"\n"
+      end
+      if backup['sourceProviderId']
+        print yellow,"#{bold}WARNING!#{reset}#{yellow} Restoring a backup will overwite objects when restored to an existing object store.",reset,"\n"
+      else
+        print yellow,"#{bold}WARNING!#{reset}#{yellow} Restoring a backup will erase all data when restored to an existing instance.",reset,"\n"
+      end
+    end
+    confirm!("Are you sure you want to restore the backup result?", options)
+    execute_api(@backup_restores_interface, :create, [], options, 'restore') do |json_response|
       print_green_success "Restoring backup result ID: #{backup_result['id']} Name: #{backup_result['backup']['name'] rescue ''} Date: (#{format_local_dt(backup_result['dateCreated'])}"
       # should get the restore maybe, or could even support refreshing until it is complete...
       # restore = json_response["restore"]
@@ -506,4 +544,45 @@ EOT
     ]
   end
 
+  def format_backup_result_option_name(result)
+    "#{result['backup']['name']} (#{format_local_dt(result['startDate'])})"
+  end
+
+  # prompt for an instance config (vdiPool.instanceConfig)
+  def prompt_restore_instance_config(options)
+    # use config if user passed one in..
+    scope_context = 'instanceConfig'
+    scoped_instance_config = {}
+    if options[:options][scope_context].is_a?(Hash)
+      scoped_instance_config = options[:options][scope_context]
+    end
+
+    # now configure an instance like normal, use the config as default options with :always_prompt
+    instance_prompt_options = {}
+    # instance_prompt_options[:group] = group ? group['id'] : nil
+    # #instance_prompt_options[:cloud] = cloud ? cloud['name'] : nil
+    # instance_prompt_options[:default_cloud] = cloud ? cloud['name'] : nil
+    # instance_prompt_options[:environment] = selected_environment ? selected_environment['code'] : nil
+    # instance_prompt_options[:default_security_groups] = scoped_instance_config['securityGroups'] ? scoped_instance_config['securityGroups'] : nil
+    
+    instance_prompt_options[:no_prompt] = options[:no_prompt]
+    #instance_prompt_options[:always_prompt] = options[:no_prompt] != true # options[:always_prompt]
+    instance_prompt_options[:options] = scoped_instance_config
+    #instance_prompt_options[:options][:always_prompt] = instance_prompt_options[:no_prompt] != true
+    instance_prompt_options[:options][:no_prompt] = instance_prompt_options[:no_prompt]
+    
+    #instance_prompt_options[:name_required] = true
+    # instance_prompt_options[:instance_type_code] = instance_type_code
+    # todo: an effort to render more useful help eg.  -O Web.0.instance.name
+    help_field_prefix = scope_context
+    instance_prompt_options[:help_field_prefix] = help_field_prefix
+    instance_prompt_options[:options][:help_field_prefix] = help_field_prefix
+    # instance_prompt_options[:locked_fields] = scoped_instance_config['lockedFields']
+    # instance_prompt_options[:for_app] = true
+    instance_prompt_options[:select_datastore] = true
+    instance_prompt_options[:name_required] = true
+    # this provisioning helper method handles all (most) of the parsing and prompting
+    instance_config_payload = prompt_new_instance(instance_prompt_options)
+    return instance_config_payload
+  end
 end

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

@@ -456,32 +456,6 @@ EOT
       opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
         options[:options]['labels'] = parse_labels(val)
       end
-      opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
-        filename = val
-        logo_file = nil
-        if filename == 'null'
-          logo_file = 'null' # clear it
-        else
-          filename = File.expand_path(filename)
-          if !File.exist?(filename)
-            raise_command_error "File not found: #{filename}"
-          end
-          logo_file = File.new(filename, 'rb')
-        end
-      end
-      opts.on('--dark-logo FILE', String, "Upload a custom dark logo icon") do |val|
-        filename = val
-        dark_logo_file = nil
-        if filename == 'null'
-          dark_logo_file = 'null' # clear it
-        else
-          filename = File.expand_path(filename)
-          if !File.exist?(filename)
-            raise_command_error "File not found: #{filename}"
-          end
-          dark_logo_file = File.new(filename, 'rb')
-        end
-      end
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
         file_content = nil

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

@@ -41,6 +41,12 @@ class Morpheus::Cli::Clouds
       opts.on( '-t', '--type TYPE', "Cloud Type" ) do |val|
         options[:zone_type] = val
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List clouds."
     end
@@ -179,6 +185,7 @@ class Morpheus::Cli::Clouds
         "Type" => lambda {|it| it['zoneType'] ? it['zoneType']['name'] : '' },
         "Code" => 'code',
         "Location" => 'location',
+        "Labels" => lambda {|it| format_list(it['labels'], '') rescue '' },
         "Region Code" => 'regionCode',
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Groups" => lambda {|it| it['groups'].collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
@@ -229,6 +236,9 @@ class Morpheus::Cli::Clouds
       opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
         options[:options]['credential'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
 
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
@@ -342,6 +352,9 @@ class Morpheus::Cli::Clouds
       # opts.on( '-d', '--description DESCRIPTION', "Description (optional)" ) do |desc|
       #   params[:description] = desc
       # end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--costing-mode VALUE', String, "Costing Mode can be off, costing, or full. Default is off." ) do |val|
         options[:options]['costingMode'] = val
       end
@@ -400,6 +413,9 @@ class Morpheus::Cli::Clouds
         if params['zone'].is_a?(Hash)
           cloud_payload.merge!(params.delete('zone'))
         end
+        if params.key?('labels')
+          params['labels'] = parse_labels(params['labels'])
+        end
         cloud_payload.merge!(params)
         payload = {zone: cloud_payload}
       end
@@ -1141,6 +1157,7 @@ EOT
       "ID" => 'id',
       "Name" => 'name',
       "Type" => lambda {|it| it['zoneType'] ? it['zoneType']['name'] : '' },
+      "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
       "Location" => 'location',
       "Region Code" => lambda {|it| it['regionCode'] },
       "Groups" => lambda {|it| (it['groups'] || []).collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
@@ -1155,10 +1172,11 @@ EOT
       #{'fieldName' => 'zoneType.code', 'fieldLabel' => 'Image Type', 'type' => 'select', 'selectOptions' => cloud_types_for_dropdown, 'required' => true, 'description' => 'Cloud Type.', 'displayOrder' => 0},
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
-      {'fieldName' => 'location', 'fieldLabel' => 'Location', 'type' => 'text', 'required' => false, 'displayOrder' => 3},
-      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private', 'displayOrder' => 4},
-      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 5},
-      {'fieldName' => 'autoRecoverPowerState', 'fieldLabel' => 'Automatically Power On VMs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 6}
+      {'shorthand' => '-l', 'optionalValue' => true, 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
+      {'fieldName' => 'location', 'fieldLabel' => 'Location', 'type' => 'text', 'required' => false, 'displayOrder' => 4},
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private', 'displayOrder' => 5},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 6},
+      {'fieldName' => 'autoRecoverPowerState', 'fieldLabel' => 'Automatically Power On VMs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 7}
     ]
 
     # TODO: Account

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

@@ -33,7 +33,7 @@ class Morpheus::Cli::CurlCommand
           raise ::OptionParser::InvalidOption.new("Failed to parse payload as JSON. Error: #{ex.message}")
         end
       end
-      opts.on('--absolute', "Absolute path, value can be used to prevent automatic using the automatic /api/ path prefix to the path by default.") do
+      opts.on('--absolute', "Absolute path, skip the addition of path prefix '/api/'") do
         options[:absolute_path] = true
       end
       opts.on('--inspect', "Inspect response, prints headers. By default only the body is printed.") do

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

@@ -31,6 +31,12 @@ class Morpheus::Cli::Groups
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List groups."
     end
@@ -100,6 +106,14 @@ EOT
       return 0 if render_result
 
       group = json_response['group']
+      group_stats = group['stats']
+      # serverCounts moved to zone.stats.serverCounts
+      server_counts = nil
+      instance_counts = nil
+      if group_stats
+        instance_counts = group_stats['instanceCounts']
+        server_counts = group_stats['serverCounts']
+      end
       is_active = @active_group_id && (@active_group_id == group['id'])
       print_h1 "Group Details"
       print cyan
@@ -108,10 +122,28 @@ EOT
         "Name" => 'name',
         "Code" => 'code',
         "Location" => 'location',
+        "Labels" => lambda {|it| format_list(it['labels'], '') rescue '' },
         "Clouds" => lambda {|it| it['zones'].collect {|z| z['name'] }.join(', ') },
-        "Hosts" => 'serverCount'
+        #"Instances" => lambda {|it| it['stats']['instanceCounts']['all'] rescue '' },
+        # "Hosts" => lambda {|it| it['stats']['serverCounts']['host'] rescue it['serverCount'] },
+        # "VMs" => lambda {|it| it['stats']['serverCounts']['vm'] rescue '' },
+        # "Bare Metal" => lambda {|it| it['stats']['serverCounts']['baremetal'] rescue '' },
       }
       print_description_list(description_cols, group)
+
+      if server_counts
+        print_h2 "Group Stats"
+        print cyan
+        print "Clouds: #{group['zones'].size}".center(20)
+        print "Instances: #{instance_counts['all']}".center(20) if instance_counts
+        print "Hosts: #{server_counts['host']}".center(20)
+        #print "Container Hosts: #{server_counts['containerHost']}".center(20)
+        #print "Hypervisors: #{server_counts['hypervisor']}".center(20)
+        print "Virtual Machines: #{server_counts['vm']}".center(20)
+        print "Bare Metal: #{server_counts['baremetal']}".center(20)
+        #print "Unmanaged: #{server_counts['unmanaged']}".center(20)
+        print "\n"
+      end
       # puts "ID: #{group['id']}"
       # puts "Name: #{group['name']}"
       # puts "Code: #{group['code']}"
@@ -211,10 +243,12 @@ EOT
       params = options[:options] || {}
 
       if params.empty?
-        puts optparse
-        exit 1
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
 
+      if params.key?('labels')
+        params['labels'] = parse_labels(params['labels'])
+      end
       group_payload.merge!(params)
 
       payload = {group: group_payload}
@@ -638,18 +672,26 @@ EOT
       {
         id: active_group ? (((@active_group_id && (@active_group_id == group['id'])) ? "=> " : "   ") + group['id'].to_s) : group['id'],
         name: group['name'],
+        labels: group['labels'],
         location: group['location'],
         cloud_count: group['zones'] ? group['zones'].size : 0,
-        server_count: group['serverCount']
+        instance_count: (group['stats']['instanceCounts']['all'] rescue ''),
+        host_count: (group['stats']['serverCounts']['host'] rescue group['serverCount']),
+        vm_count: (group['stats']['serverCounts']['vm'] rescue ''),
+        baremetal_count: (group['stats']['serverCounts']['baremetal'] rescue '')
       }
     end
     columns = [
       #{:active => {:display_name => ""}},
       {:id => {:display_name => (active_group ? "   ID" : "ID")}},
-      {:name => {:width => 16}},
+      {:name => {:width => 64}},
       {:location => {:width => 32}},
+      {:labels => {:display_method => lambda {|it| format_list(it[:labels], '', 3) rescue '' }}},
       {:cloud_count => {:display_name => "CLOUDS"}},
-      {:server_count => {:display_name => "HOSTS"}}
+      {:instance_count => {:display_name => "INSTANCES"}},
+      {:host_count => {:display_name => "HOSTS"}},
+      {:vm_count => {:display_name => "VMS"}},
+      {:baremetal_count => {:display_name => "BARE METAL"}},
     ]
     print as_pretty_table(rows, columns, opts)
   end
@@ -658,7 +700,8 @@ EOT
     tmp_option_types = [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
-      {'fieldName' => 'location', 'fieldLabel' => 'Location', 'type' => 'text', 'required' => false, 'displayOrder' => 3}
+      {'shorthand' => '-l', 'optionalValue' => true, 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
+      {'fieldName' => 'location', 'fieldLabel' => 'Location', 'type' => 'text', 'required' => false, 'displayOrder' => 4},
     ]
 
     # Advanced Options

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

@@ -323,7 +323,7 @@ EOT
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Form name'},
       {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => true, 'description' => 'Unique form code'},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
-      {'shorthand' => '-l', 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }},
+      {'shorthand' => '-l', 'optionalValue' => true, 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }},
     ]
   end
 

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

@@ -431,7 +431,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
         # rest
         {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
         {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-        {'shorthand' => '-l', 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
+        {'shorthand' => '-l', 'optionalValue' => true, 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
         {'code' => 'optionTypeList.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true, 'description' => 'Option List Type. eg. rest, api, ldap, manual', 'displayOrder' => 4},
         {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 5},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceUrl', 'fieldLabel' => 'Source Url', 'type' => 'text', 'required' => true, 'description' => "A REST URL can be used to fetch list data and is cached in the appliance database.", 'displayOrder' => 6},

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

@@ -302,7 +302,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'shorthand' => '-l', 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
+      {'shorthand' => '-l', 'optionalValue' => true, 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
       {'fieldName' => 'fieldName', 'fieldLabel' => 'Field Name', 'type' => 'text', 'required' => true, 'description' => 'This is the input property that the value gets assigned to.', 'displayOrder' => 4},
       {'code' => 'optionType.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Text', 'value' => 'text'}, {'name' => 'Password', 'value' => 'password'}, {'name' => 'Number', 'value' => 'number'}, {'name' => 'Checkbox', 'value' => 'checkbox'}, {'name' => 'Select', 'value' => 'select'}, {'name' => 'Hidden', 'value' => 'hidden'}], 'defaultValue' => 'text', 'required' => true, 'displayOrder' => 5},
       {'fieldName' => 'optionList', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'optionTypeLists', 'required' => true, 'dependsOnCode' => 'optionType.type:select', 'description' => "The Option List to be the source of options when type is 'select'.", 'displayOrder' => 6},

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

@@ -132,7 +132,7 @@ class Morpheus::Cli::NetworksCommand
                 pool: subnet['pool'] ? subnet['pool']['name'] : '',
                 dhcp: subnet['dhcpServer'] ? 'Yes' : 'No',
                 visibility: subnet['visibility'].to_s.capitalize,
-                active: format_boolean(network['active']),
+                active: format_boolean(subnet['active']),
                 tenants: subnet['tenants'] ? subnet['tenants'].collect {|it| it['name'] }.uniq.join(', ') : ''
               }
               rows << subnet_row

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

@@ -57,7 +57,7 @@ class Morpheus::Cli::SecurityPackagesCommand
         api_client.security_package_types.list({max:10000})['securityPackageTypes'].collect { |it| {"name" => it["name"], "value" => it["code"]} }
       }, 'required' => true, 'defaultValue' => 'SCAP Package'},      
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
-      {'shorthand' => '-l', 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }},
+      {'shorthand' => '-l', 'optionalValue' => true, 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
       {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true},
       # {'code' => 'securityPackage.sourceType', 'fieldName' => 'sourceType', 'fieldLabel' => 'Source', 'type' => 'select', 'selectOptions' => [{'name'=>'url','value'=>'url'}], 'defaultValue' => 'url', 'required' => true},

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

@@ -385,7 +385,7 @@ EOT
 
     if hubmode == 'skip'
       if ::Morpheus::Cli::OptionTypes::confirm("Would you like to install your License Key now?", options.merge({:default => true}))
-        cmd_res = Morpheus::Cli::License.new.apply([] + (options[:remote] ? ["-r",options[:remote]] : []))
+        cmd_res = Morpheus::Cli::License.new.install([] + (options[:remote] ? ["-r",options[:remote]] : []))
         # license_is_valid = cmd_res != false
       end
     end

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

@@ -1373,11 +1373,11 @@ class Morpheus::Cli::Tasks
     # this makes us all sad
     option_types.each do |option_type|
       if option_type['type'] == 'typeahead'
-        if ['operationalWorkflowName','containerScript','containerTemplate'].include?(option_type['code'])
+        if ['operationalWorkflowName','ifOperationalWorkflowName','elseOperationalWorkflowName','containerScript','containerTemplate'].include?(option_type['code'])
           option_type.deep_merge!({'config' => {'valueField' => 'name'}})
         end
       elsif option_type['type'] == 'hidden'
-        if ['operationalWorkflowId','containerScriptId','containerTemplateId'].include?(option_type['code'])
+        if ['operationalWorkflowId','ifOperationalWorkflowId','elseOperationalWorkflowId','containerScriptId','containerTemplateId'].include?(option_type['code'])
           option_type['processValue'] = lambda {|val| 
             if val.to_s.empty?
               selected_option = Morpheus::Cli::OptionTypes.get_last_select()

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

@@ -104,7 +104,16 @@ EOT
           "ACCESS TOKEN" => lambda {|it| it['maskedAccessToken'] },
           "REFRESH TOKEN" => lambda {|it| it['maskedRefreshToken'] },
           "ACCESS EXPIRATION" => lambda {|it| format_local_dt(it['expiration']) },
-          "ACCESS TTL" => lambda {|it| it['expiration'] ? (format_duration(it['expiration']) rescue '') : '' }
+          "ACCESS TTL" => lambda {|it| 
+            if it['expiration']
+              expires_on = parse_time(it['expiration'])
+              if expires_on && expires_on < Time.now
+                "Expired"
+              else
+                it['expiration'] ? (format_duration(it['expiration']) rescue '') : '' 
+              end
+            end
+          }
         }
         print cyan
         puts as_pretty_table(access_tokens, cols)

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

@@ -119,10 +119,10 @@ module Morpheus::Cli::BackupsHelper
       "Backup" => lambda {|it| it['backup']['name'] rescue '' },
       "Status" => lambda {|it| format_backup_result_status(it) },
       #"Duration" => lambda {|it| format_duration(it['startDate'], it['endDate']) },
-      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) },
+      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) if it['durationMillis'].to_i > 0 },
       "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
       "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-      "Size" => lambda {|it| format_bytes(it['sizeInMb'], 'MB') },
+      "Size" => lambda {|it| it['sizeInMb'].to_i != 0 ? format_bytes(it['sizeInMb'], 'MB') : '' },
     }
   end
 
@@ -155,7 +155,7 @@ module Morpheus::Cli::BackupsHelper
       "Target" => lambda {|it| it['instance']['name'] rescue '' },
       "Status" => lambda {|it| format_backup_result_status(it) },
       #"Duration" => lambda {|it| format_duration(it['startDate'], it['endDate']) },
-      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) },
+      "Duration" => lambda {|it| format_duration_milliseconds(it['durationMillis']) if it['durationMillis'].to_i > 0 },
       "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
       "End Date" => lambda {|it| format_local_dt(it['endDate']) },
     }
@@ -168,4 +168,5 @@ module Morpheus::Cli::BackupsHelper
   def format_backup_restore_status(backup_restore, return_color=cyan)
     format_backup_result_status(backup_restore, return_color)
   end
+  
 end

data/lib/morpheus/cli/option_types.rb

@@ -1113,8 +1113,15 @@ module Morpheus
         value_found = false
         value = nil
         while !value_found do
-          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
-          input = $stdin.gets.chomp!
+          # print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          # input = $stdin.gets.chomp!
+          Readline.completion_append_character = ""
+          Readline.basic_word_break_characters = ''
+          Readline.completion_proc = nil
+          prompt_label = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          input = Readline.readline(prompt_label, false).to_s
+          input = input.chomp #.strip
+
           value = input.empty? ? option_type['defaultValue'] : input
           if input == '?'
             help_prompt(option_type)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.3.3"
+    VERSION = "6.3.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.3.3
+  version: 6.3.4
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -204,6 +204,7 @@ files:
 - lib/morpheus/api/backup_service_types_interface.rb
 - lib/morpheus/api/backup_services_interface.rb
 - lib/morpheus/api/backup_settings_interface.rb
+- lib/morpheus/api/backup_types_interface.rb
 - lib/morpheus/api/backups_interface.rb
 - lib/morpheus/api/billing_interface.rb
 - lib/morpheus/api/blueprints_interface.rb
@@ -381,6 +382,7 @@ files:
 - lib/morpheus/cli/commands/backup_results_command.rb
 - lib/morpheus/cli/commands/backup_services_command.rb
 - lib/morpheus/cli/commands/backup_settings_command.rb
+- lib/morpheus/cli/commands/backup_types_command.rb
 - lib/morpheus/cli/commands/backups_command.rb
 - lib/morpheus/cli/commands/benchmark_command.rb
 - lib/morpheus/cli/commands/blueprints_command.rb