morpheus-cli 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cbee8120b32418f3b60a0b82950f9a3fc1eb2ad2101a905aea6ba6ca4cc67eb
-  data.tar.gz: 98038ba726c03fa7aeb3af77efdedcb535e6f4506fb26f0ccd5cb70456dd55f2
+  metadata.gz: 5e2f97549864e50c22d2a7f9e04ccf0cafb76ed6b833aef1271a8e0003716d90
+  data.tar.gz: a8924722ef5ab2feeb455ea7008f9681a374bf5f739a34b15131748371848889
 SHA512:
-  metadata.gz: 68c0c1c2c18173314f6d8fe73a184631609ad8b9a55d95bf35a2b797814ba5a65f2037b6638917c5c09640d7e91674a0356825849b04c375c4c88a35b715e5a3
-  data.tar.gz: 776cc9c571fac5fec546836d4ff6fd06e55c7635c7c63f8ed529e0880c96efa21c2d087fa7baac1bdf90c16b40ef4eaa847c7bc3fcf13c5092d4ebe3afcec303
+  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.6
+RUN gem install morpheus-cli -v 7.0.7
 
 ENTRYPOINT ["morpheus"]

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,16 +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']}
-          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
-
         # Multi-disk / prompt for volumes
         if provision_type['hasVolumes']
           volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options, @api_client, api_params)
@@ -653,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))
@@ -684,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))
 
@@ -729,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'

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/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.6"
+    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.6
+  version: 7.0.7
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix