morpheus-cli 8.0.12.1 → 8.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c05f2fa9d8da972dd6bae523d49b6d412fb950904455b3131920ecee8607a5e
-  data.tar.gz: 97c511ce59d17d9e3bfa0a5d99b84396470663933bbb1071b28d98532ffa1b81
+  metadata.gz: aad3ce7f814765f24cd6d8c0c54c234d6c745be616536a92b3005e127740f2d0
+  data.tar.gz: af0212f0f02ee8f85133c36790493e09542112e9e21ee183692cce150a029e29
 SHA512:
-  metadata.gz: 97121f62137da57bd2fffeef54c6b5ecfdaaa5da44369a9fa6366e09db33d64f931ed80f999f38d7aa28762eeaa382a17fcf16dc3fa5008bae422d4809787941
-  data.tar.gz: 8f55bd7a9e5c45297617284133de343b49795942fd4d091757d56e84bc6ca10b1ff276424b5ce87e4ad8ed4fc2ea43e143a280217e7fc267f2900dffb5266259
+  metadata.gz: 648640393d42c0a3dc358a198baf5c513cbf48e8c58202143974f7bbd15e2acc06f7cd3c35305a6404ddabb9ed0ee64c16c4beb84bbda588d7c03df4debca69d
+  data.tar.gz: 4a1b6e530ebcb825f2c1bc54e04ea29ad0ec249f1b3ddc65d1bfce2144db1f17c1389d2368ee9f4dbb4398f5be911b1509f418f6ee9a28c8c42bd1e4e95b3cc2

data/Dockerfile

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

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

@@ -316,9 +316,8 @@ EOT
         parse_result = parse_json_or_yaml(file_content)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = file_content
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
           options[:options]['config'] = params['config'] # or file_content
@@ -386,9 +385,8 @@ EOT
         parse_result = parse_json_or_yaml(config)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = config
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
         end
@@ -466,9 +464,8 @@ EOT
         parse_result = parse_json_or_yaml(file_content)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = file_content
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
           options[:options]['config'] = params['config'] # or file_content
@@ -529,9 +526,8 @@ EOT
         parse_result = parse_json_or_yaml(config)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = config
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
         end

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

@@ -1599,14 +1599,14 @@ EOT
       {'fieldName' => 'affinityType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Keep Separate', 'value' => 'KEEP_SEPARATE'}, {'name' => 'Keep Together', 'value' => 'KEEP_TOGETHER'}], 'description' => 'Choose affinity type.', 'required' => true, 'defaultValue' => 'KEEP_SEPARATE'},
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'defaultValue' => true},
       {'fieldName' => 'pool.id', 'fieldLabel' => 'Cluster', 'type' => 'select', 'optionSourceType' => 'vmware', 'optionSource' => 'vmwareZonePoolClusters', 'description' => 'Select cluster for the affinity group.', 'required' => true},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 
   def update_cloud_affinity_group_option_types
     [
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox'},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 

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

@@ -499,7 +499,7 @@ class Morpheus::Cli::Clusters
 
         # Group / Site
         group = load_group(cluster_type['code'], options)
-        cluster_payload['group'] = {'id' => group['id']}
+        cluster_payload['group'] = {'id' => group['id']} if group
 
         # Cluster Name
         if args.empty? && options[:no_prompt]
@@ -561,19 +561,19 @@ class Morpheus::Cli::Clusters
 
         # Cloud / Zone
         cloud_id = nil
-        cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group['id'], options[:cloud]) : nil
+        cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group ? group['id'] : nil, options[:cloud]) : nil
         if cloud
           # load full cloud
           cloud = @clouds_interface.get(cloud['id'])['zone']
           cloud_id = cloud['id']
         else
-          available_clouds = get_available_clouds(group['id'], {groupType: cluster_payload['type']})
+          available_clouds = get_available_clouds(group ? group['id'] : nil, {groupType: cluster_payload['type']})
 
           if available_clouds.empty?
-            print_red_alert "Group #{group['name']} has no available clouds"
+            print_red_alert group ? "Group #{group['name']} has no available clouds" : "No available clouds"
             exit 1
           else
-            cloud_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => available_clouds, 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: group['id']})['cloud']
+            cloud_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => available_clouds, 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: group ? group['id'] : nil})['cloud']
           end
           cloud = @clouds_interface.get(cloud_id)['zone']
         end
@@ -598,7 +598,7 @@ 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']}
+        api_params = {zoneId: cloud['id'], siteId: group ? group['id'] : nil, layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}.compact
 
         # Service Plan
         service_plan = prompt_service_plan(api_params, options)
@@ -809,7 +809,7 @@ class Morpheus::Cli::Clusters
           elsif server_payload['sshHosts'].is_a?(Array)
             server_payload['sshHosts'] = server_payload['sshHosts'].collect {|it| it.is_a?(String) ? {"ip" => it} : it }
           end
-
+          server_payload['sshHosts'] = server_payload['sshHosts'].flatten
           # inject the optionalNames array into the sshHosts if present
           if server_payload['optionalNames']
             optional_names = server_payload['optionalNames'].is_a?(String) ? server_payload['optionalNames'].split(",") : [server_payload['optionalNames']].flatten
@@ -1344,7 +1344,7 @@ class Morpheus::Cli::Clusters
         server_payload['labels'] = labels if labels
 
         # Cloud
-        available_clouds = options_interface.options_for_source('clouds', {groupId: cluster['site']['id'], clusterId: cluster['id'], ownerOnly: true})['data']
+        available_clouds = options_interface.options_for_source('clouds', {groupId: cluster['site'] ? cluster['site']['id'] : nil, clusterId: cluster['id'], ownerOnly: true}.compact)['data']
         cloud_id = nil
 
         if options[:cloud]
@@ -1366,12 +1366,12 @@ class Morpheus::Cli::Clusters
         # resources (zone pools)
         cloud = @clouds_interface.get(cloud_id)['zone']
         cloud['zoneType'] = get_cloud_type(cloud['zoneType']['id'])
-        group = @groups_interface.get(cluster['site']['id'])['group']
+        group = cluster['site'] ? @groups_interface.get(cluster['site']['id'])['group'] : nil
         provision_type = server_type['provisionType'] || {}
         provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
         
         server_payload['cloud'] = {'id' => cloud_id}
-        service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
+        service_plan = prompt_service_plan({zoneId: cloud_id, siteId: group ? group['id'] : nil, provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id']}.compact, options)
 
         if service_plan
           server_payload['plan'] = {'code' => service_plan['code']}
@@ -1420,7 +1420,7 @@ class Morpheus::Cli::Clusters
         metadata_option_type = cluster_type['optionTypes'].find {|type| type['fieldName'] == 'metadata' }
         option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
 
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id']}))
+        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group ? group['id'] : nil, layoutId: layout['id']}.compact))
 
         # Metadata Tags
         if metadata_option_type
@@ -4751,11 +4751,15 @@ class Morpheus::Cli::Clusters
           print_red_alert "No available groups"
           exit 1
         else available_groups.count > 1 && !options[:no_prompt]
-          group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => available_groups, 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})['group']
+          group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Select Group.'}],options[:options],@api_client,{})['group']
         end
       end
     end
-    @groups_interface.get(group_id)['group']
+    if group_id
+      return @groups_interface.get(group_id)['group']
+    else 
+      return nil
+    end
   end
 
   def prompt_service_plan(api_params, options)
@@ -4948,7 +4952,7 @@ class Morpheus::Cli::Clusters
       resource_pool = options[:resourcePool] ? find_cloud_resource_pool_by_name_or_id(cloud['id'], options[:resourcePool]) : nil
 
       if !resource_pool
-        resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id']}.merge(service_plan ? {planId: service_plan['id']} : {}))['data'].reject { |it| it['id'].nil? && it['name'].nil? }
+        resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group ? group['id'] : nil, zoneId: cloud['id'], planId: service_plan ? service_plan['id'] : nil}).compact['data'].reject { |it| it['id'].nil? && it['name'].nil? }
 
         if resource_pool_options.empty?
           print yellow,bold, "Cloud #{cloud['name']} has no available resource pools",reset,"\n\n"
@@ -5268,14 +5272,14 @@ class Morpheus::Cli::Clusters
       {'fieldName' => 'affinityType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Keep Separate', 'value' => 'KEEP_SEPARATE'}, {'name' => 'Keep Together', 'value' => 'KEEP_TOGETHER'}], 'description' => 'Choose affinity type.', 'required' => true, 'defaultValue' => 'KEEP_SEPARATE'},
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'defaultValue' => true},
       # {'fieldName' => 'pool.id', 'fieldLabel' => 'Cluster', 'type' => 'select', 'optionSourceType' => 'vmware', 'optionSource' => 'vmwareZonePoolClusters', 'description' => 'Select cluster for the affinity group.', 'required' => true},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 
   def update_affinity_group_option_types
     [
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox'},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'searchParameter' => 'phrase', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 

data/lib/morpheus/cli/option_types.rb

@@ -978,8 +978,8 @@ module Morpheus
           # query_value = (value || use_value || default_value || '')
           query_value = (input || '')
           api_params ||= {}
-          api_params['query'] = query_value
-          api_params['phrase'] = query_value
+          search_parameter = option_type['searchParameter'] || 'query'
+          api_params[search_parameter] = query_value
           # skip refresh if you just hit enter
           if !query_value.empty? || (select_options.nil? || select_options.empty?)
             select_options = load_options(option_type, api_client, api_params, query_value)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.12.1"
+    VERSION = "8.0.13"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.12.1
+  version: 8.0.13
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-29 00:00:00.000000000 Z
+date: 2026-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tins