morpheus-cli 8.0.10 → 8.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4fc087520efe1dab49dbe42df70b39da196e9539cd78eb162adec2fc8907a54
-  data.tar.gz: b008d63500f56d6a72b12c918db54b3d2869df3fa3407e491411a8eab63ea6be
+  metadata.gz: bb7a990dcc082a03f2aca40fb88b97ebba11413844dc0108241f3e26f68ae61b
+  data.tar.gz: 66f510f249523971e5dc712d42b66e12cdf746162783c68b82df4549f942b2c2
 SHA512:
-  metadata.gz: f00f2ea9c25064ad69f1038a83a5c0a23708c21d2bc670406ff1527dcdd0808361043c7e7c498fd9a03733106fcd8c1884515ebd4951c12b1bc839c37163b879
-  data.tar.gz: 8c818cdda02325d65715ee474e72480467a27ce14548483415a555002042cfbb7638193feb9fc3c61138effa50d473703eeb4a6f66d47eb4ccf087e9c9b040c5
+  metadata.gz: 7586dc7f31d7c27c76cb4d2412ac023292dece2471c5c02e2e7dc8a4ef6cd79eeea55ad1654d4fff7af5e45714b4a5e1e51eb6d9eafa968006c70d5c15316345
+  data.tar.gz: 7378973777072746bcb3498a7940990ac2fd98328587a716b02935711684e23aee6242ba9d6300cb83be8a5e3edd1868887c9a560d8589fd2f15df59d2a75d87

data/Dockerfile

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

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

@@ -2556,7 +2556,7 @@ EOT
       # prompt 
       # Host (preferredParentServer.id)
       if payload['server']['host']
-        options[:options] = payload['server'].remove('host')
+        options[:options] = payload['server'].delete('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']

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

@@ -102,7 +102,7 @@ class Morpheus::Cli::Shell
       command_list = @auto_complete_commands
       result = command_list.grep(/^#{Regexp.escape(s)}/)
       if result.nil? || result.empty?
-        Readline::FILENAME_COMPLETION_PROC.call(s)
+        Readline::FILENAME_COMPLETION_PROC.call(s) rescue []
       else
         result
       end

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

@@ -27,6 +27,7 @@ class Morpheus::Cli::StorageProvidersCommand
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @storage_providers_interface = @api_client.storage_providers
+    @storage_servers_interface = @api_client.storage_servers
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
   end
@@ -215,10 +216,44 @@ class Morpheus::Cli::StorageProvidersCommand
         elsif options['providerType']
           storage_provider_type_code = options['providerType'].to_s
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'providerType', 'fieldLabel' => 'Provider Type', 'type' => 'select', 'selectOptions' => get_storage_provider_types(), 'required' => true, 'description' => 'Choose a storage bucket type.'}], options, @api_client, {})
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'providerType',
+                                                         'fieldLabel' => 'Provider Type',
+                                                         'type' => 'select',
+                                                         'selectOptions' => get_storage_provider_types(),
+                                                         'required' => true,
+                                                         'description' => 'Choose a storage bucket type.'}],
+                                                       options, @api_client, {})
           storage_provider_type_code = v_prompt['providerType'] unless v_prompt['providerType'].nil?
         end
-        payload['storageBucket']['providerType'] = storage_provider_type_code
+        if storage_provider_type_code == 'amazonS3'
+          payload['storageBucket']['providerType'] = 's3'  # cloud provided amazonS3
+        else
+          payload['storageBucket']['providerType'] = storage_provider_type_code
+        end
+
+        # Storage Service (only for amazonS3)
+        storage_server_type_id = nil
+        storage_server_id = nil
+        if storage_provider_type_code == 'amazonS3'
+          storage_server_type = @api_client.storage_server_types.list({max:1000})['storageServerTypes'].find {|it| it['code'].downcase == storage_provider_type_code.downcase }
+          if options['storageServer']
+            storage_server_id = options['storageServer']
+          else
+            if storage_server_type.nil?
+              raise_command_error "error: no storage server type found for amazonS3"
+            end
+            Morpheus::Logging::DarkPrinter.puts "Finding storage services..." if Morpheus::Logging.debug?
+            storage_server_options = @storage_servers_interface.list({max:1000, 'typeId': storage_server_type['id']})['storageServers'].collect {|it| {'name' => it['name'], 'value' => it['id'] } }
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'storageServer',
+                                                           'fieldLabel' => 'Storage Server',
+                                                           'type' => 'select',
+                                                           'selectOptions' => storage_server_options,
+                                                           'required' => true,
+                                                           'description' => 'Choose a connected storage service.'}], options, @api_client, {})
+            storage_server_id = v_prompt['storageServer'] unless v_prompt['storageServer'].nil?
+          end
+          payload['storageBucket']['storageServer'] = storage_server_id.to_s # api before 8.0.11 expects a string instead of a number, oooof
+        end
 
         # Provider Type Specific Options
         provider_type_option_types = nil
@@ -232,6 +267,15 @@ class Morpheus::Cli::StorageProvidersCommand
             {'fieldContext' => 'config', 'fieldName' => 'region', 'fieldLabel' => 'Region', 'type' => 'text', 'required' => false, 'description' => 'Optional Amazon region if creating a new bucket.'},
             {'fieldContext' => 'config', 'fieldName' => 'endpoint', 'fieldLabel' => 'Endpoint URL', 'type' => 'text', 'required' => false, 'description' => 'Optional endpoint URL if pointing to an object store other than amazon that mimics the Amazon S3 APIs.'}
           ]
+        elsif storage_provider_type_code == 'amazonS3'
+          # print_h2 "Amazon S3 Provided by Cloud Options"
+          provider_type_option_types = [
+            {'fieldName' => 'bucketName', 'fieldLabel' => 'Bucket Name', 'type' => 'text', 'required' => true, 'description' => ''},
+            {'fieldName' => 'createBucket', 'fieldLabel' => 'Create Bucket', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Create the bucket if it does not exist.'},
+            {'fieldContext' => 'config', 'fieldName' => 'region', 'fieldLabel' => 'Region', 'type' => 'text', 'required' => false, 'description' => 'Optional Amazon region if creating a new bucket.'},
+            {'fieldContext' => 'config', 'fieldName' => 'endpoint', 'fieldLabel' => 'Endpoint URL', 'type' => 'text', 'required' => false, 'description' => 'Optional endpoint URL if pointing to an object store other than amazon that mimics the Amazon S3 APIs.'}
+          ]
+
         elsif storage_provider_type_code == 'azure'
           # print_h2 "Azure Options"
           provider_type_option_types = [
@@ -1215,14 +1259,15 @@ class Morpheus::Cli::StorageProvidersCommand
 
   def get_storage_provider_types()
     [
-      {'name' => 'Amazon S3', 'value' => 's3'},
+      {'name' => 'Amazon S3', 'value' => 'amazonS3'},
       {'name' => 'Alibaba', 'value' => 'alibaba'},
       {'name' => 'Azure', 'value' => 'azure'},
       {'name' => 'CIFS', 'value' => 'cifs'},
       {'name' => 'Local Storage', 'value' => 'local'},
       {'name' => 'NFSv3', 'value' => 'nfs'},
       {'name' => 'Openstack Swift', 'value' => 'openstack'},
-      {'name' => 'Rackspace CDN', 'value' => 'rackspace'}
+      {'name' => 'Rackspace CDN', 'value' => 'rackspace'},
+      {'name' => 'S3', 'value' => 's3'},
     ]
   end
 

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

@@ -1117,6 +1117,10 @@ module Morpheus::Cli::ProvisioningHelper
           datastore_options << {"id" => it["value"] || it["id"], "name" => it["name"], "value" => it["value"] || it["id"]}
       end
     end
+    storage_profiles = []
+    if provision_type['storageProfiles']
+      storage_profiles = provision_type['storageProfiles'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }.collect {|it| {'name' => it['name'], 'value' => it['code'], 'isDefault' => it['isDefault']} }
+    end
 
     #puts "Configure Root Volume"
 
@@ -1193,6 +1197,10 @@ module Morpheus::Cli::ProvisioningHelper
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => 'Root Datastore', 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.', 'defaultValue' => default_datastore ? default_datastore['name'] : volume['datastoreId']}], options[:options])
       volume['datastoreId'] = v_prompt[field_context]['datastoreId']
     end
+    if !storage_profiles.empty?
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageProfile', 'type' => 'select', 'fieldLabel' => 'Root Storage Profile', 'selectOptions' => storage_profiles, 'required' => false, 'description' => 'Choose a storage profile.'}], options[:options])
+      volume['storageProfile'] = v_prompt[field_context]['storageProfile'] if v_prompt[field_context] && !v_prompt[field_context]['storageProfile'].to_s.empty?
+    end
 
     volumes << volume
 
@@ -1263,7 +1271,11 @@ module Morpheus::Cli::ProvisioningHelper
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.', 'defaultValue' => volume['datastoreId']}], options[:options])
           volume['datastoreId'] = v_prompt[field_context]['datastoreId']
         end
-
+        if !storage_profiles.empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageProfile', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Profile", 'selectOptions' => storage_profiles, 'required' => false, 'description' => 'Choose a storage profile.'}], options[:options])
+          volume['storageProfile'] = v_prompt[field_context]['storageProfile'] if v_prompt[field_context] && !v_prompt[field_context]['storageProfile'].to_s.empty?
+        end
+      
         volumes << volume
 
         volume_index += 1
@@ -1347,7 +1359,10 @@ module Morpheus::Cli::ProvisioningHelper
         end
       end
     end
-
+    storage_profiles = []
+    if provision_type['storageProfiles']
+      storage_profiles = provision_type['storageProfiles'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }.collect {|it| {'name' => it['name'], 'value' => it['code'], 'isDefault' => it['isDefault']} }
+    end
     #puts "Configure Root Volume"
 
     field_context = "rootVolume"
@@ -1385,6 +1400,9 @@ module Morpheus::Cli::ProvisioningHelper
     if !current_root_volume['controllerMountPoint'].to_s.empty?
       volume['controllerMountPoint'] = current_root_volume['controllerMountPoint']
     end
+    if !current_root_volume['storageProfile'].to_s.empty?
+      volume['storageProfile'] = current_root_volume['storageProfile']
+    end
     if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customLabel']
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Root Volume Label', 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
       volume['name'] = v_prompt[field_context]['name']
@@ -1413,7 +1431,10 @@ module Morpheus::Cli::ProvisioningHelper
     #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => 'Root Datastore', 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
     #   volume['datastoreId'] = v_prompt[field_context]['datastoreId']
     # end
-
+    if !storage_profiles.empty?
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageProfile', 'type' => 'select', 'fieldLabel' => 'Root Storage Profile', 'selectOptions' => storage_profiles, 'required' => false, 'description' => 'Choose a storage profile.', 'defaultValue' => volume['storageProfile']}], options[:options])
+      volume['storageProfile'] = v_prompt[field_context]['storageProfile'] if v_prompt[field_context] && !v_prompt[field_context]['storageProfile'].to_s.empty?
+    end
     volumes << volume
 
     # modify or delete existing data volumes
@@ -1443,6 +1464,9 @@ module Morpheus::Cli::ProvisioningHelper
           if !current_volume['controllerMountPoint'].to_s.empty?
             volume['controllerMountPoint'] = current_volume['controllerMountPoint']
           end
+          if !current_volume['storageProfile'].to_s.empty?
+            volume['storageProfile'] = current_volume['storageProfile']
+          end
           volumes << volume
         else
           # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
@@ -1471,7 +1495,9 @@ module Morpheus::Cli::ProvisioningHelper
           if !current_volume['controllerMountPoint'].to_s.empty?
             volume['controllerMountPoint'] = current_volume['controllerMountPoint']
           end
-          
+          if !current_volume['storageProfile'].to_s.empty?
+            volume['storageProfile'] = current_volume['storageProfile']
+          end
           if plan_info['customizeVolume'] && storage_type['customLabel']
             v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Disk #{volume_index} Volume Label", 'required' => true, 'description' => 'Enter a volume label.', 'defaultValue' => volume['name']}], options[:options])
             volume['name'] = v_prompt[field_context]['name']
@@ -1499,6 +1525,10 @@ module Morpheus::Cli::ProvisioningHelper
           #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
           #   volume['datastoreId'] = v_prompt[field_context]['datastoreId']
           # end
+          if !storage_profiles.empty?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageProfile', 'type' => 'select', 'fieldLabel' => 'Root Storage Profile', 'selectOptions' => storage_profiles, 'required' => false, 'description' => 'Choose a storage profile.', 'defaultValue' => current_volume['storageProfile']}], options[:options])
+            volume['storageProfile'] = v_prompt[field_context]['storageProfile'] if v_prompt[field_context] && !v_prompt[field_context]['storageProfile'].to_s.empty?
+          end
 
           volumes << volume
 
@@ -1572,6 +1602,10 @@ module Morpheus::Cli::ProvisioningHelper
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.', 'defaultValue' => current_root_volume['datastoreId']}], options[:options])
           volume['datastoreId'] = v_prompt[field_context]['datastoreId'] unless v_prompt[field_context]['datastoreId'].to_s.empty?
         end
+        if !storage_profiles.empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageProfile', 'type' => 'select', 'fieldLabel' => 'Root Storage Profile', 'selectOptions' => storage_profiles, 'required' => false, 'description' => 'Choose a storage profile.'}], options[:options])
+          volume['storageProfile'] = v_prompt[field_context]['storageProfile'] if v_prompt[field_context] && !v_prompt[field_context]['storageProfile'].to_s.empty?
+        end
 
         volumes << volume
 

data/lib/morpheus/cli/option_types.rb

@@ -716,7 +716,7 @@ module Morpheus
             end
           else
             found_default_option = select_options.find {|opt| opt[value_field].to_s == default_value.to_s || opt['name'] == default_value.to_s}
-            found_default_option = select_options.find {|opt| opt[value_field].to_s.start_with?(default_value.to_s) || opt['name'].to_s.start_with?(default_value.to_s)} if !found_default_option
+            #found_default_option = select_options.find {|opt| opt[value_field].to_s.start_with?(default_value.to_s) || opt['name'].to_s.start_with?(default_value.to_s)} if !found_default_option
             if found_default_option
               default_value = found_default_option['name'] # name is prettier than value
             end
@@ -1221,7 +1221,10 @@ module Morpheus
           #Readline.input = $stdin
           Readline.completion_append_character = ""
           Readline.basic_word_break_characters = ''
-          Readline.completion_proc = proc {|s| Readline::FILENAME_COMPLETION_PROC.call(s) }
+          Readline.completion_proc = proc {|s| 
+            # FILENAME_COMPLETION_PROC is nil in newer rubies
+            Readline::FILENAME_COMPLETION_PROC.call(s) rescue []
+          }
           input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: ", false).to_s
           input = input.chomp.strip
           #input = $stdin.gets.chomp!

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.10"
+    VERSION = "8.0.11"
   end
 end

data/morpheus-cli.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.5.1' # according to http.rb doc
+  spec.add_dependency "tins", '~> 1.43.0'
   spec.add_dependency "public_suffix", "4.0.7" # https://github.com/weppos/publicsuffix-ruby/blob/main/CHANGELOG.md
   spec.add_dependency "ffi", "1.15.5" # Fix for mismatched deps: https://github.com/ffi/ffi/issues/1103
   spec.add_development_dependency "bundler", "~> 2.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.10
+  version: 8.0.11
 platform: ruby
 authors:
 - David Estes
@@ -11,8 +11,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-06 00:00:00.000000000 Z
+date: 2025-11-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.0
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement