morpheus-cli 7.0.5 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c637503347782a4af2b9a03bf3431165a3863bd1dff90c10e948ee8d568bfd82
-  data.tar.gz: e5717d140527a65dbd43dc2ac9cefa196562cd416bb4a64c7303cff16396fb4a
+  metadata.gz: 5e2f97549864e50c22d2a7f9e04ccf0cafb76ed6b833aef1271a8e0003716d90
+  data.tar.gz: a8924722ef5ab2feeb455ea7008f9681a374bf5f739a34b15131748371848889
 SHA512:
-  metadata.gz: afdee7c74a1a220ffe339687604dbde26b514c742261ab30d5b41cd7234ce85da04df48cce18c25ea40fac3c82dffa0ca0b1e44df62e8954bdccb44d0a59fd00
-  data.tar.gz: 6d7e829d26c6a7e58a4548f4cec8e374b386843a3a251de78822066a7042a32cfda5ccb23ada084c2c9295e8fe518c89b22afefbf1c086aed1b5f020d490396d
+  metadata.gz: d7fafa4ba44a2c600055b47bc5178c3b667ca238b5080d355c01682679124ee71b12991d5b52bd85958b429ab2747f680e27a47fe1192179b8c5ff417b486035
+  data.tar.gz: 50d06718a2b68a42ac4997a1bf6248c0ae4ce9b975747f972bfa4e718b4c6514af31a06a59bc70ad2e1642b8252896ead095b1a93b512f7d7c6d9cc963807c5e

data/Dockerfile

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

data/lib/morpheus/api/servers_interface.rb

@@ -191,5 +191,26 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def maintenance(serverId, payload = {}, params = {})
+    url = "#{@base_url}/api/servers/#{serverId}/maintenance"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def leave_maintenance(serverId, payload = {}, params = {})
+    url = "#{@base_url}/api/servers/#{serverId}/leave-maintenance"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def placement(serverId, payload = {}, params = {})
+    url = "#{@base_url}/api/servers/#{serverId}/placement"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
 
 end

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

@@ -526,12 +526,7 @@ class Morpheus::Cli::Clusters
         resourceName = options[:resourceName]
 
         if !resourceName
-          if options[:no_prompt]
-            print_red_alert "No resource name provided"
-            exit 1
-          else
-            resourceName = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourceName', 'type' => 'text', 'fieldLabel' => 'Resource Name', 'required' => true, 'description' => 'Resource Name.'}],options[:options],@api_client,{})['resourceName']
-          end
+          resourceName = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourceName', 'type' => 'text', 'fieldLabel' => 'Resource Name', 'required' => false, 'description' => 'Resource Name.'}],options[:options],@api_client,{})['resourceName']
         end
 
         server_payload['name'] = resourceName
@@ -594,9 +589,17 @@ class Morpheus::Cli::Clusters
         # Provision Type
         provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
         provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
-
         api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}
 
+        # Service Plan
+        service_plan = prompt_service_plan(api_params, options)
+        if service_plan
+          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code']}
+          api_params['planId'] = service_plan['id']
+          plan_opts = prompt_service_plan_options(service_plan, provision_type, options)
+          server_payload['servicePlanOptions'] = plan_opts if plan_opts && !plan_opts.empty?
+        end
+
         # Controller type
         server_types = @server_types_interface.list({computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes'].reject {|it| it['provisionType']['code'] == 'manual'}
         controller_provision_type = nil
@@ -613,7 +616,7 @@ class Morpheus::Cli::Clusters
             end
           end
 
-          if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
+          if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, service_plan, controller_provision_type, options)
             server_payload['config']['resourcePoolId'] = resource_pool['id']
             api_params['config'] ||= {}
             api_params['config']['resourcePool'] = resource_pool['id']
@@ -622,14 +625,6 @@ class Morpheus::Cli::Clusters
           end
         end
 
-        # Service Plan
-        service_plan = prompt_service_plan(api_params, options)
-
-        if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, provision_type, options)}
-          api_params['planId'] = service_plan['id']
-        end
-
         # Multi-disk / prompt for volumes
         if provision_type['hasVolumes']
           volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options, @api_client, api_params)
@@ -651,6 +646,8 @@ class Morpheus::Cli::Clusters
         metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
         option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
 
+        server_count = layout['serverCount']
+
         # KLUDGE: google zone required for network selection
         if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
           server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt([option_type], options[:options], @api_client, api_params))
@@ -682,6 +679,10 @@ class Morpheus::Cli::Clusters
         # Layout template options
         cluster_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(load_layout_options(cluster_payload), options[:options], @api_client, api_params, options[:no_prompt], true))
 
+        # Set node count for ssh hosts
+        ssh_host_option = option_type_list.select{|it| it['fieldName'] == 'sshHosts'}.first
+        ssh_host_option['minCount'] = server_count unless ssh_host_option.nil?
+
         # Server options
         server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options].deep_merge({:context_map => {'domain' => ''}}), @api_client, api_params, options[:no_prompt], true))
 
@@ -727,7 +728,7 @@ class Morpheus::Cli::Clusters
 
         # Host / Domain
         server_payload['networkDomain'] = options[:domain] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkDomain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'required' => false, 'optionSource' => 'networkDomains'}], options[:options], @api_client, api_params)['networkDomain']
-        server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
+        server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => false, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Kube Default Repo
         if cluster_payload['type'] == 'kubernetes-cluster'
@@ -1289,7 +1290,9 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
 
         if service_plan
-          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, nil, options)}
+          server_payload['plan'] = {'code' => service_plan['code']}
+          plan_opts = prompt_service_plan_options(service_plan, nil, options)
+          server_payload['servicePlanOptions'] = plan_opts if plan_opts && !plan_opts.empty?
         end
 
         if resource_pool = prompt_resource_pool(cluster, cloud, service_plan, server_type['provisionType'], options)

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

@@ -11,7 +11,8 @@ class Morpheus::Cli::Hosts
                        :run_workflow, :make_managed, :upgrade_agent, :snapshots, :software, :software_sync, :update_network_label,
                        {:'types' => :list_types},
                        {:exec => :execution_request},
-                       :wiki, :update_wiki
+                       :wiki, :update_wiki,
+                       :maintenance, :leave_maintenance, :placement
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -2149,6 +2150,232 @@ EOT
     end
   end
 
+  def update_network_label(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[server] [options]")
+      opts.on('--network NETWORK', "Network Interface ID" ) do |val|
+        options[:network] = val
+      end
+      opts.on('--label LABEL', "label") do |val|
+        options[:label] = val
+      end
+      opts.footer = "Change the label of a Network Interface.\n" +
+                    "Editing an Interface will not apply changes to the physical hardware. The purpose is for a manual override or data correction (mostly for self managed or baremetal servers where cloud sync is not available)\n" +
+                    "[name or id] is required. The name or the id of the server.\n" +
+                    "[network] ID of the Network Interface. (optional).\n" +
+                    "[label] New Label name for the Network Interface (optional)"
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      puts_error  "#{Morpheus::Terminal.angry_prompt}wrong number of arguments. Expected 1 and received #{args.count} #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    connect(options)
+
+    begin
+      host = find_host_by_name_or_id(args[0])
+      return 1 if host.nil?
+
+      network_id = options[:network]
+      if network_id != nil && network_id.to_i == 0
+        print_red_alert  "network must be an ID/integer above 0, not a name/string value."
+        network_id = nil
+      end
+
+
+      if !network_id
+        available_networks = get_available_networks(host)
+        network_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'network', 'fieldLabel' => 'Network', 'type' => 'select', 'selectOptions' => available_networks, 'required' => true, 'defaultValue' => available_networks[0], 'description' => "The networks available for relabeling"}], options[:options])
+        network_id = network_prompt['network']
+      end
+
+      label = options[:label]
+      while label.nil? do
+        label_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'label', 'fieldLabel' => 'Label', 'type' => 'text', 'required' => true}], options[:options])
+        label = label_prompt['label']
+      end
+      payload = { "name" => label }
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.update_network_label(network_id, host["id"], payload)
+        return
+      end
+      json_response = @servers_interface.update_network_label(network_id, host["id"], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Updated label for host #{host['name']} network #{network_id} to #{label}"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
+  def maintenance(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[host]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Enable maintenance mode for a host.
+[host] is required. This is the name or id of a host.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    
+    server = find_host_by_name_or_id(args[0])
+    return 1 if server.nil?
+
+    # Just let the API return this error instead
+
+    # # load server type to determine if maintenance mode is supported
+    # server_type_id = server['computeServerType']['id']
+    # server_type = @server_types_interface.get(server_type_id)['serverType']
+    # if !server_type['hasMaintenanceMode']
+    #   raise_command_error "Server type does not support maintenance mode"
+    # end
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+    end
+    params = {}
+    params.merge!(parse_query_options(options))
+
+    confirm!("Are you sure you would like to enable maintenance mode on host '#{server['name']}'?", options)
+
+    @servers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @servers_interface.dry.maintenance(server['id'], payload, params)
+      return
+    end
+    json_response = @servers_interface.maintenance(server['id'], payload, params)
+    render_response(json_response, options) do
+      print_green_success "Maintenance mode enabled for host #{server['name']}"
+      #get([server['id']])
+    end
+    return 0, nil
+  end
+
+  def leave_maintenance(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[host]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Disable maintenance mode for a host.
+[host] is required. This is the name or id of a host.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    
+    server = find_host_by_name_or_id(args[0])
+    return 1 if server.nil?
+
+    # Just let the API return this error instead
+    
+    # # load server type to determine if maintenance mode is supported
+    # server_type_id = server['computeServerType']['id']
+    # server_type = @server_types_interface.get(server_type_id)['serverType']
+    # if !server_type['hasMaintenanceMode']
+    #   raise_command_error "Server type does not support maintenance mode"
+    # end
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+    end
+    params = {}
+    params.merge!(parse_query_options(options))
+
+    confirm!("Are you sure you would like to leave maintenance mode on host '#{server['name']}'?", options)
+
+    @servers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @servers_interface.dry.leave_maintenance(server['id'], payload, params)
+      return
+    end
+    json_response = @servers_interface.leave_maintenance(server['id'], payload, params)
+    render_response(json_response, options) do
+      print_green_success "Maintenance mode enabled for host #{server['name']}"
+      #get([server['id']])
+    end
+    return 0, nil
+  end
+
+  def placement(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[host]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Update placement for a host.
+[host] is required. This is the name or id of a host.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    
+    server = find_host_by_name_or_id(args[0])
+    return 1 if server.nil?
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'server' => parse_passed_options(options)})
+    else
+      payload.deep_merge!({'server' => parse_passed_options(options)})
+      # prompt 
+      # Host (preferredParentServer.id)
+      if payload['server']['host']
+        options[:options] = payload['server'].remove('host')
+      end
+      default_host = (server['preferredParentServer'] ? server['preferredParentServer']['id'] : (server['parentServer'] ? server['parentServer']['id'] : nil))
+      host = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'host', 'type' => 'select', 'fieldLabel' => 'Host', 'optionSource' => 'parentServers', 'required' => false, 'description' => 'Choose the preferred parent host for this virtual machine to be placed on.', 'defaultValue' => default_host}],options[:options],@api_client,{'serverId' => server['id']})['host']
+      if !host.to_s.empty?
+        payload['server']['preferredParentServer'] = {'id' => host}
+      end
+
+
+      # Placement Strategy (placementStrategy)
+      placement_strategy = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'placementStrategy', 'type' => 'select', 'fieldLabel' => 'Placement Strategy', 'optionSource' => 'placementStrategies', 'required' => false, 'description' => 'Choose the placement strategy for this virtual machine.', 'defaultValue' => server['placementStrategy']}],options[:options],@api_client,{'serverId' => server['id']})['placementStrategy']
+      if !placement_strategy.to_s.empty?
+        payload['server']['placementStrategy'] = placement_strategy
+      end
+    end
+    params = {}
+    params.merge!(parse_query_options(options))
+
+    confirm!("Are you sure you would like to update placement for host '#{server['name']}'?", options)
+
+    @servers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @servers_interface.dry.placement(server['id'], payload, params)
+      return
+    end
+    json_response = @servers_interface.placement(server['id'], payload, params)
+    render_response(json_response, options) do
+      print_green_success "Maintenance mode enabled for host #{server['name']}"
+      #get([server['id']])
+    end
+    return 0, nil
+  end
+
   private
 
   def find_host_by_id(id)
@@ -2297,71 +2524,6 @@ EOT
     out
   end
 
-  def update_network_label(args)
-    options = {}
-    params = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[server] [options]")
-      opts.on('--network NETWORK', "Network Interface ID" ) do |val|
-        options[:network] = val
-      end
-      opts.on('--label LABEL', "label") do |val|
-        options[:label] = val
-      end
-      opts.footer = "Change the label of a Network Interface.\n" +
-                    "Editing an Interface will not apply changes to the physical hardware. The purpose is for a manual override or data correction (mostly for self managed or baremetal servers where cloud sync is not available)\n" +
-                    "[name or id] is required. The name or the id of the server.\n" +
-                    "[network] ID of the Network Interface. (optional).\n" +
-                    "[label] New Label name for the Network Interface (optional)"
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
-    end
-    optparse.parse!(args)
-    if args.count != 1
-      puts_error  "#{Morpheus::Terminal.angry_prompt}wrong number of arguments. Expected 1 and received #{args.count} #{args.inspect}\n#{optparse}"
-      return 1
-    end
-    connect(options)
-
-    begin
-      host = find_host_by_name_or_id(args[0])
-      return 1 if host.nil?
-
-      network_id = options[:network]
-      if network_id != nil && network_id.to_i == 0
-        print_red_alert  "network must be an ID/integer above 0, not a name/string value."
-        network_id = nil
-      end
-
-
-      if !network_id
-        available_networks = get_available_networks(host)
-        network_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'network', 'fieldLabel' => 'Network', 'type' => 'select', 'selectOptions' => available_networks, 'required' => true, 'defaultValue' => available_networks[0], 'description' => "The networks available for relabeling"}], options[:options])
-        network_id = network_prompt['network']
-      end
-
-      label = options[:label]
-      while label.nil? do
-        label_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'label', 'fieldLabel' => 'Label', 'type' => 'text', 'required' => true}], options[:options])
-        label = label_prompt['label']
-      end
-      payload = { "name" => label }
-      if options[:dry_run]
-        print_dry_run @servers_interface.dry.update_network_label(network_id, host["id"], payload)
-        return
-      end
-      json_response = @servers_interface.update_network_label(network_id, host["id"], payload)
-      if options[:json]
-        puts as_json(json_response, options)
-      else
-        print_green_success "Updated label for host #{host['name']} network #{network_id} to #{label}"
-      end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
   def get_available_networks(host)
     results = @options_interface.options_for_source('availableNetworksForHost',{serverId: host['id'].to_i})
     available_networks = results['data'].collect {|it|

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

@@ -16,7 +16,7 @@ class Morpheus::Cli::PluginsCommand
     params = {}
     filename = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] [file]")
+      opts.banner = subcommand_usage("[file]")
       build_standard_post_options(opts, options)
       opts.footer = <<-EOT
 Upload a plugin file.
@@ -55,7 +55,7 @@ EOT
     params = {}
     filename = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name] [file]")
+      opts.banner = subcommand_usage("")
       build_standard_post_options(opts, options)
       opts.footer = <<-EOT
 Check for installed plugins that have available updates.

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

@@ -127,7 +127,6 @@ class Morpheus::Cli::ProvisioningLicensesCommand
         {"Copies" => lambda {|license| 
           "#{license['reservationCount']}/#{license['copies']}"
         } },
-        {"Description" => lambda {|license| license['description'] } },
         {"Virtual Images" => lambda {|it| it['virtualImages'] ? it['virtualImages'].collect {|v| v['name']}.join(', ') : '' } },
         {"Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|acnt| acnt['name']}.join(', ') : '' } },
       ]

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

@@ -1722,6 +1722,8 @@ module Morpheus::Cli::ProvisioningHelper
 
       if ip_required == false && network_interface['ipAddress'] == nil && selected_network['dhcpServer'] == true
         network_interface['ipMode'] = 'dhcp'
+      elsif network_interface['ipAddress']
+        network_interface['ipMode'] = 'static'
       end
 
       network_interfaces << network_interface

data/lib/morpheus/cli/option_types.rb

@@ -1324,15 +1324,19 @@ module Morpheus
 
         # supports multi-part fields via config.fields
         # {"fields": [{"name":"tag", "required":true, "label": "Tag"}, {"name":"value", "required":false, "label": "Scope"}]}
+        min_count = option_type['minCount'] || 1
+        count = 0
+
         if option_type['config']['fields']
-          while (option_type['required'] && rtn.empty?) || self.confirm("Add#{rtn.empty? ? '': ' more'} #{option_type['fieldLabel']}?", {:default => false})
+          while (option_type['required'] && (rtn.empty? || count < min_count)) || self.confirm("Add#{rtn.empty? ? '': ' more'} #{option_type['fieldLabel']}?", {:default => false})
             rtn ||= []
             value = {}
             option_type['config']['fields'].each do |field|
               field_label = field['label'] || field['name'].capitalize
-              value[field['name']] = generic_prompt(option_type.merge({'fieldLabel' => field_label, 'required' => field['required'], 'description' => "#{option_type['fieldLabel']} #{field_label}"}))
+              value[field['name']] = generic_prompt(option_type.merge({'fieldLabel' => min_count > 1 ? "#{field_label} #{count + 1}" : field_label, 'required' => field['required'], 'description' => "#{option_type['fieldLabel']} #{field_label}"}))
             end
             rtn << value
+            count += 1
           end
         else
           if rtn = generic_prompt(option_type)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "7.0.5"
+    VERSION = "7.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.0.7
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix