morpheus-cli 5.5.0 → 5.5.1.2

data/lib/morpheus/cli/option_types.rb

@@ -61,13 +61,24 @@ module Morpheus
           if option_type['fieldName'] == 'sshHosts'
             option_type['type'] = 'multiText'
           end
+          # swap types to multiSelect when flag is set..
+          if option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+            if option_type["type"] == "typeahead"
+              option_type["type"] = "multiTypeahead"
+            elsif option_type["type"] == "select"
+              option_type["type"] = "multiSelect"
+            elsif option_type["type"] == "textarea"
+              option_type["type"] = "multiText"
+            end
+          end
         end
-        credential_option_types = {}
+
         # puts "Options Prompt #{options}"
         # Sort options by default, group, advanced
         cur_field_group = 'default'
-        self.sorted_option_types(option_types).each do |option_type|
-          next if option_type[:for_help_only] == true # hacky
+        prompt_local_credentials = true
+        self.sort_option_types(option_types.reject {|it| it[:for_help_only]}).each do |option_type|
+          next if option_type['localCredential'] && !prompt_local_credentials
           context_map = results
           value = nil
           value_found = false
@@ -147,28 +158,9 @@ module Morpheus
             next if !found_dep_value
           end
 
-          # inject a Credentials prompt for optionTypes that have been replaced by credentials
-          credential_code = option_type['credentialFieldContext']
-          if !credential_code.to_s.empty?
-            if !credential_option_types[credential_code]
-              credential_option_type = {'code' => credential_code, 'fieldName' => credential_code, 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'defaultValue' => "local", 'required' => true}
-              credential_option_types[credential_code] = credential_option_type
-              supported_credential_types = [option_type['credentialType'], option_type['credentialTypes']].compact.flatten.join(",").split(",").collect {|it| it.strip }
-              credential_params = {"new" => false, "credentialTypes" => supported_credential_types}
-              credential_value = select_prompt(credential_option_type, api_client, credential_params, no_prompt, options[credential_code])
-              if !credential_value.to_s.empty?
-                if credential_value == "local"
-                  context_map[credential_code] = {"type" => credential_value}
-                elsif credential_value.to_s =~ /\A\d{1,}\Z/
-                  context_map[credential_code] = {"id" => credential_value.to_i}
-                end
-              end
-            end
-            # skip this option unless using local credentials
-            if context_map[credential_code].is_a?(Hash) && context_map[credential_code]["type"] != "local"
-              next
-            end
-          end
+          # build parameters for option source api request
+          option_params = (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results))
+          option_params.merge!(option_type['optionParams']) if option_type['optionParams']
 
           cur_namespace = options
           parent_context_map = context_map
@@ -184,9 +176,26 @@ module Morpheus
             context_map = context_map[ns.to_s]
           end
 
-          # build parameters for option source api request
-          option_params = (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results))
-          option_params.merge!(option_type['optionParams']) if option_type['optionParams']
+          # credential type
+          handle_credential_type = -> {
+            credential_type = select_prompt(option_type.merge({'defaultValue' => value}), api_client, option_params.merge({'credentialTypes' => option_type['config']['credentialTypes']}), !value.nil?, nil, paging_enabled, ignore_empty)
+            # continue prompting for local creds
+            if credential_type == 'local'
+              parent_context_map.reject! {|k,v| k == 'credential'}
+              next
+            end
+            # hide local cred options
+            prompt_local_credentials = false
+            if credential_type.is_a?(Numeric)
+              # set as credential.id
+              credential = {'id' => credential_type}
+            else
+              # prompt credential type options
+              credential = prompt(api_client.credential_types.list({name:credential_type})['credentialTypes'][0]['optionTypes'], options, api_client, option_params, options[:no_prompt], paging_enabled, ignore_empty)['credential']
+              credential['type'] = credential_type
+            end
+            parent_context_map['credential'] = credential
+          }
 
           # use the value passed in the options map
           if cur_namespace.respond_to?('key?') && cur_namespace.key?(field_name)
@@ -219,6 +228,8 @@ module Morpheus
                 select_value_list << typeahead_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, option_params, true)
               end
               value = select_value_list
+            elsif option_type['type'] == 'credential'
+              handle_credential_type.call
             end
             if options[:always_prompt] != true
               value_found = true
@@ -277,6 +288,9 @@ module Morpheus
               value = multiline_prompt(option_type)
             elsif option_type['type'] == 'code-editor'
               value = multiline_prompt(option_type)
+            elsif option_type['type'] == 'credential'
+              print "\nCREDENTIALS\n#{"=" * ("CREDENTIALS".length)}\n\n"
+              handle_credential_type.call
             elsif ['select', 'multiSelect'].include?(option_type['type'])
               # so, the /api/options/source is may need ALL the previously
               # selected values that are being accumulated in options
@@ -287,7 +301,8 @@ module Morpheus
               value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty)
               if value && option_type['type'] == 'multiSelect'
                 value = [value]
-                while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
+                recommended_count = (option_type['config'] || {})['recommendedCount'] || 0
+                while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => recommended_count > value.count}) do
                   if addn_value = select_prompt(option_type, api_client, option_params, options[:no_prompt], nil, paging_enabled, ignore_empty)
                     value << addn_value
                   else
@@ -391,7 +406,6 @@ module Morpheus
         return value
       end
 
-
       def self.set_last_select(obj)
         Thread.current[:_last_select] = obj
       end
@@ -766,15 +780,18 @@ module Morpheus
             help_prompt(option_type)
             next
           end
-          if input.downcase == 'yes'
+          if input.downcase == 'yes' || input.downcase == 'y' || input.downcase == 'on'
             value_found = true
             value = 'on'
-          elsif input.downcase == 'no'
+          elsif input.downcase == 'no' || input.downcase == 'n' || input.downcase == 'off'
             value_found = true
             value = 'off'
           elsif input == '' && has_default
             value_found = true
             value = default_yes ? 'on' : 'off'
+          elsif input != ""
+            puts "Invalid Option... Please try again."
+            next
           end
           if value.nil? && option_type['required']
             puts "Invalid Option... Please try again."
@@ -820,6 +837,20 @@ module Morpheus
           elsif !value.nil? || option_type['required'] != true
             value_found = true
           end
+          # attempt to parse Java regex and validate it
+          if option_type["verifyPattern"].to_s != "" && !(value.to_s == "" && option_type['required'])
+            begin
+              # pattern is matched on the entire string
+              verify_pattern = Regexp.compile("^" + option_type["verifyPattern"] + "$")
+              if !verify_pattern.match(value)
+                value_found = false
+                puts "Invalid Option. Value must match the pattern '#{option_type['verifyPattern']}'. Please try again."
+                next
+              end
+            rescue => regex_ex
+              puts "Failed to parse verifyPattern '#{option_type['verifyPattern']}' as a regular expression"
+            end
+          end
         end
         return value
       end
@@ -1083,10 +1114,10 @@ module Morpheus
         return out
       end
 
-      def self.sorted_option_types(option_types)
-        option_types.reject {|it| (it['fieldGroup'] || 'default') != 'default'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i} +
-        option_types.reject {|it| ['default', 'advanced'].include?(it['fieldGroup'] || 'default')}.sort{|a,b| a['displayOrder'] <=> b['displayOrder']}.group_by{|it| it['fieldGroup']}.values.collect { |it| it.sort{|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}}.flatten +
-        option_types.reject {|it| it['fieldGroup'] != 'advanced'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
+      def self.sort_option_types(option_types)
+        option_types.select {|it| (it['fieldGroup'] || 'default').casecmp?('default')}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i} +
+        option_types.reject {|it| ['default', 'advanced'].include?((it['fieldGroup'] || 'default').downcase)}.sort{|a,b| a['displayOrder'] <=> b['displayOrder']}.group_by{|it| it['fieldGroup']}.values.collect { |it| it.sort{|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}}.flatten +
+        option_types.select {|it| 'advanced'.casecmp?(it['fieldGroup'])}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
       end
 
       def self.display_select_options(opt, select_options = [], paging = nil)
@@ -1094,7 +1125,7 @@ module Morpheus
       end
 
       def self.format_option_types_help(option_types, opts={})
-        option_types = self.sorted_option_types(option_types).reject {|it| it['hidden']}
+        option_types = self.sort_option_types(option_types).reject {|it| it['hidden']}
 
         if option_types.empty?
           "#{opts[:color]}#{opts[:title] || "Available Options:"}\nNone\n\n"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.0"
+    VERSION = "5.5.1.2"
   end
 end

data/lib/morpheus/logging.rb

@@ -155,10 +155,9 @@ module Morpheus::Logging
 
     def print(*messages)
       if @io
-        messages = messages.flatten.collect {|it| scrub_message(it) }
-        print_with_color do 
-          messages.each do |msg|
-            @io.print msg
+        print_with_color do
+          messages.flatten.each do |msg|
+            @io.print scrub_message(msg)
           end
         end
       end
@@ -166,10 +165,9 @@ module Morpheus::Logging
 
     def puts(*messages)
       if @io
-        messages = messages.flatten.collect {|it| scrub_message(it) }
-        print_with_color do 
-          messages.each do |msg|
-            @io.puts msg
+        print_with_color do
+          messages.flatten.each do |msg|
+            @io.puts scrub_message(msg)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,6 +185,8 @@ files:
 - lib/morpheus/api/audit_interface.rb
 - lib/morpheus/api/auth_interface.rb
 - lib/morpheus/api/backup_jobs_interface.rb
+- 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/backups_interface.rb
 - lib/morpheus/api/billing_interface.rb
@@ -292,6 +294,7 @@ files:
 - lib/morpheus/api/reports_interface.rb
 - lib/morpheus/api/rest_interface.rb
 - lib/morpheus/api/roles_interface.rb
+- lib/morpheus/api/scale_thresholds_interface.rb
 - lib/morpheus/api/search_interface.rb
 - lib/morpheus/api/secondary_read_interface.rb
 - lib/morpheus/api/secondary_rest_interface.rb
@@ -341,6 +344,7 @@ files:
 - lib/morpheus/cli/commands/archives_command.rb
 - lib/morpheus/cli/commands/audit.rb
 - lib/morpheus/cli/commands/backup_jobs_command.rb
+- lib/morpheus/cli/commands/backup_services_command.rb
 - lib/morpheus/cli/commands/backup_settings_command.rb
 - lib/morpheus/cli/commands/backups_command.rb
 - lib/morpheus/cli/commands/benchmark_command.rb
@@ -451,6 +455,7 @@ files:
 - lib/morpheus/cli/commands/reports_command.rb
 - lib/morpheus/cli/commands/rm_command.rb
 - lib/morpheus/cli/commands/roles.rb
+- lib/morpheus/cli/commands/scale_thresholds.rb
 - lib/morpheus/cli/commands/search_command.rb
 - lib/morpheus/cli/commands/security_group_rules.rb
 - lib/morpheus/cli/commands/security_groups.rb
@@ -500,6 +505,7 @@ files:
 - lib/morpheus/cli/mixins/deployments_helper.rb
 - lib/morpheus/cli/mixins/execution_request_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
+- lib/morpheus/cli/mixins/jobs_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
 - lib/morpheus/cli/mixins/load_balancers_helper.rb
 - lib/morpheus/cli/mixins/logs_helper.rb
@@ -550,8 +556,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance