morpheus-cli 6.3.0 → 6.3.2

data/lib/morpheus/cli/option_types.rb

@@ -76,7 +76,8 @@ module Morpheus
             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)
+          config_multi_select = option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+          if config_multi_select
             if option_type["type"] == "typeahead"
               option_type["type"] = "multiTypeahead"
             elsif option_type["type"] == "select"
@@ -175,10 +176,9 @@ module Morpheus
                 }
               end
 
+              depends_on_field_key = depends_on_code
               if depends_on_option_type
                 depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
-              else
-                depends_on_field_key = depends_on_code
               end
 
               field_value = get_object_value(results, depends_on_field_key) ||
@@ -198,6 +198,53 @@ module Morpheus
             next if !found_dep_value
           end
 
+          # respect optionType.requireOnCode
+          require_option_check_value = option_type['requireOnCode']
+          if !require_option_check_value.to_s.empty?
+            # require_on_code = check_require_on_code(option_type, option_types, options)
+
+            match_type = 'any'
+
+            if require_option_check_value.include?('::')
+              match_type = 'all' if require_option_check_value.start_with?('matchAll')
+              require_option_check_value = require_option_check_value[require_option_check_value.index('::') + 2..-1]
+            end
+
+            found_dep_value = match_type == 'all' ? true : false
+            require_option_check_value.sub(',', ' ').split(' ').each do |value|
+              parts = value.split(':')
+              depends_on_code = parts[0]
+              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : nil
+              depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
+              if !depends_on_option_type
+                depends_on_option_type = option_types.find {|it|
+                  (it['fieldContext'] ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName']) == depends_on_code
+                }
+              end
+
+              depends_on_field_key = depends_on_code
+              if depends_on_option_type
+                depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
+              end
+
+              field_value = get_object_value(results, depends_on_field_key) ||
+                            get_object_value(options, depends_on_field_key) ||
+                            get_object_value(api_params, depends_on_field_key)
+
+              if field_value.nil? && !options['_object_key'].nil?
+                field_value = get_object_value({options['_object_key'] => results}, depends_on_field_key)
+              end
+
+              if !field_value.nil? && (depends_on_value.nil? || depends_on_value.empty? || field_value.to_s.match?(depends_on_value))
+                found_dep_value = true if match_type != 'all'
+              else
+                found_dep_value = false if match_type == 'all'
+              end
+            end
+             
+            option_type = option_type.merge({'required' => found_dep_value})
+          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']
@@ -217,6 +264,12 @@ module Morpheus
             context_map = context_map[ns.to_s]
           end
 
+          # CLI only options that need some do some inflection to decide how to prompt
+          # defaultValue is it right now..
+          if option_type[:preprocesser].is_a?(Proc)
+            option_type[:preprocesser].call(option_type, api_client, option_params)
+          end
+
           # 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, options[:edit_mode])
@@ -310,6 +363,23 @@ module Morpheus
                   value = typeahead_prompt(option_type, api_client, option_params, true)
                   value_found = !!value
                 end
+                if option_type['type'] == 'hidden'
+                  if option_type['optionSource'].nil?
+                    value = option_type['defaultValue']
+                  else
+                    select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, option_params)
+                    config_multi_select = option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+                    if config_multi_select
+                      value = select_options.collect { |it| it['value'] }
+                    elsif select_options.is_a?(Array)
+                      value = select_options[0] ? select_options[0]['value'] : nil
+                    elsif select_options.is_a?(Hash)
+                      value = select_options['value']
+                    else
+                      value = select_options
+                    end
+                  end
+                end
                 if !value_found && !ignore_empty
                   if option_type['required']
                     print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
@@ -326,7 +396,9 @@ module Morpheus
           end
 
           if !value_found
-            if option_type['type'] == 'number'
+            if option_type['type'] == 'text'
+              value = generic_prompt(option_type)
+            elsif option_type['type'] == 'number'
               value = number_prompt(option_type)
             elsif option_type['type'] == 'password'
               value = password_prompt(option_type)
@@ -376,12 +448,24 @@ module Morpheus
               if option_type['optionSource'].nil?
                 value = option_type['defaultValue']
               else
-                value = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
+                select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, option_params)
+                config_multi_select = option_type["config"] && ["true","on"].include?(option_type["config"]["multiSelect"].to_s)
+                if config_multi_select
+                  value = select_options.collect { |it| it['value'] }
+                elsif select_options.is_a?(Array)
+                  value = select_options[0] ? select_options[0]['value'] : nil
+                elsif select_options.is_a?(Hash)
+                  value = select_options['value']
+                else
+                  value = select_options
+                end
               end
             elsif option_type['type'] == 'file'
               value = file_prompt(option_type)
-            elsif option_type['type'] == 'file-content'
+            elsif option_type['type'] == 'file-content' || option_type['type'] == 'fileContent'
               value = file_content_prompt(option_type, options, api_client, {})
+            elsif option_type['type'] == 'logoSelector'
+              value = file_prompt(option_type)
             elsif option_type['type'] == 'multiText'
               value = multitext_prompt(option_type)
             elsif option_type['type'] == 'azureMarketplace'
@@ -396,7 +480,6 @@ module Morpheus
               value = generic_prompt(option_type)
             end
           end
-
           # --labels x,y,z uses processValue proc to convert strings to an array
           if option_type['processValue'].is_a?(Proc)
             value = option_type['processValue'].call(value)
@@ -409,6 +492,61 @@ module Morpheus
             if value && value.is_a?(String)
               value = value.split(",").collect {|it| it.strip }
             end
+          # todo: Handle these types added with the new form fields:
+          #
+          # byteSize
+          # code-editor
+          # fileContent
+          # logoSelector
+          # keyValue
+          # textArray
+          # typeahead
+          # group
+          # cloud
+          # environment
+          # diskManager
+          # layout
+          # networkManager
+          # plan
+          # resourcePool
+          # secGroup
+          # tag
+          # httpHeader
+          elsif option_type['type'] == 'byteSize'
+            if value.to_s.empty?
+              value = 0 # nil
+            elsif value.is_a?(String)
+              if value.to_s.upcase.include?("G")
+                value = value.to_i * 1024 * 1024 * 1024
+              elsif value.to_s.upcase.include?("M")
+                value = value * 1024 * 1024
+              else
+                # assume bytes by default..
+                value = value.to_i
+              end
+            end
+          elsif option_type['type'] == 'keyValue'
+            value = try_as_json(value)
+            if value.is_a?(String)
+              map = {}
+              value.split(",").each do |it| 
+                pair = it.split("="); 
+                map[pair[0].to_s.strip] = pair[1..-1].join("=").strip
+              end
+              value = map
+            end
+          elsif option_type['type'] == 'textArray'
+            value = try_as_json(value)
+            if value.is_a?(String)
+              value = value.split(",").collect {|it| it.to_s.strip }
+            end
+          else
+            # default translation
+            # for non text inputs, try to parse value as JSON
+            # if option_type['type'] == 'group' || option_type['type'] == 'cloud' etc..
+            if value.is_a?(String) && option_type['type'] != 'text'
+              value = try_as_json(value)
+            end
           end
           context_map[field_name] = value if !(value.nil? || (value.is_a?(Hash) && value.empty?))
           parent_context_map.reject! {|k,v| k == parent_ns && (v.nil? || (v.is_a?(Hash) && v.empty?))}
@@ -526,7 +664,12 @@ module Morpheus
             if matched_options.size > 1
               print Term::ANSIColor.red, "\nInvalid Option #{option_type['fieldLabel']}: [#{use_value}]\n\n", Term::ANSIColor.reset
               print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
-              display_select_options(option_type, matched_options)
+              if matched_options && matched_options.size > 10
+                display_select_options(option_type, matched_options.first(10))
+                puts " (#{matched_options.size-10} more)"
+              else
+                display_select_options(option_type, matched_options)
+              end
               print "The value '#{input}' matched #{matched_options.size()} options.\n"
               # print "Perhaps you meant one of these? #{ored_list(matched_options.collect {|i|i[value_field]}, 3)}\n"
               print "Try using value instead of name.\n"
@@ -595,7 +738,12 @@ module Morpheus
                 if matched_options.size > 1
                   print Term::ANSIColor.red, "\nInvalid Option #{option_type['fieldLabel']}: [#{default_value}]\n\n", Term::ANSIColor.reset
                   print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
-                  display_select_options(option_type, matched_options)
+                  if matched_options && matched_options.size > 10
+                    display_select_options(option_type, matched_options.first(10))
+                    puts " (#{matched_options.size-10} more)"
+                  else
+                    display_select_options(option_type, matched_options)
+                  end
                   print "The value '#{default_value}' matched #{matched_options.size()} options.\n"
                   # print "Perhaps you meant one of these? #{ored_list(matched_options.collect {|i|i[value_field]}, 3)}\n"
                   print "Try using value instead of name.\n"
@@ -679,7 +827,12 @@ module Morpheus
             if matched_options.size > 1
               print Term::ANSIColor.red, "\nInvalid Option #{option_type['fieldLabel']}: [#{input}]\n\n", Term::ANSIColor.reset
               print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
-              display_select_options(option_type, matched_options)
+              if matched_options && matched_options.size > 10
+                display_select_options(option_type, matched_options.first(10))
+                puts " (#{matched_options.size-10} more)"
+              else
+                display_select_options(option_type, matched_options)
+              end
               print "The value '#{input}' matched #{matched_options.size()} options.\n"
               # print "Perhaps you meant one of these? #{ored_list(matched_options.collect {|i|i[value_field]}, 3)}\n"
               print "Try using value instead of name.\n"
@@ -867,7 +1020,12 @@ module Morpheus
               exit 1
             else
               #help_prompt(option_type)
-              display_select_options(option_type, select_options)
+              if select_options && select_options.size > 10
+                display_select_options(option_type, select_options.first(10))
+                puts " (#{select_options.size-10} more)"
+              else
+                display_select_options(option_type, select_options)
+              end
               print "\n"
               if select_options.empty?
                 print "The value '#{input}' matched 0 options.\n"
@@ -1381,6 +1539,19 @@ module Morpheus
         end
         rtn
       end
+
+      def self.try_as_json(val)
+        if val.is_a?(String)
+          if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
+            begin
+              val = JSON.parse(val)
+            rescue
+              Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+            end
+          end
+        end
+        return val
+      end
     end
   end
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.3.0"
+    VERSION = "6.3.2"
   end
 end

data/lib/morpheus/routes.rb

@@ -50,9 +50,12 @@ module Morpheus::Routes
         "#!app-templates", # App Blueprints (blueprints)
         "#!catalog-items",
         "#!compute-type-layouts", # Cluster Layouts
+        "#!compute-type-packages", # Cluster Packages
       ],
       :'virtual-images' => {},
       options: [
+        "#!forms", # Forms
+        "#!option-types", # Inputs
         "#!option-type-lists", # Option Lists
       ],
       templates: [
@@ -181,6 +184,12 @@ module Morpheus::Routes
 
       # map well known aliases
       case(path.dasherize.pluralize)
+      # when "forms"
+      #   path = "/library/options/#!forms"
+      when "inputs"
+        path = "/library/options/#!option-types"
+      when "option-lists"
+        path = "/library/options/#!option-type-lists"
       when "backups"
         path = id ? "/backups/show" : "/backups/list"
       when "backup-jobs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,6 +251,7 @@ files:
 - lib/morpheus/api/jobs_interface.rb
 - lib/morpheus/api/key_pairs_interface.rb
 - lib/morpheus/api/library_cluster_layouts_interface.rb
+- lib/morpheus/api/library_cluster_packages_interface.rb
 - lib/morpheus/api/library_container_scripts_interface.rb
 - lib/morpheus/api/library_container_templates_interface.rb
 - lib/morpheus/api/library_container_types_interface.rb
@@ -301,6 +302,7 @@ files:
 - lib/morpheus/api/network_subnets_interface.rb
 - lib/morpheus/api/network_types_interface.rb
 - lib/morpheus/api/networks_interface.rb
+- lib/morpheus/api/option_type_forms_interface.rb
 - lib/morpheus/api/option_type_lists_interface.rb
 - lib/morpheus/api/option_types_interface.rb
 - lib/morpheus/api/options_interface.rb
@@ -430,9 +432,11 @@ files:
 - lib/morpheus/cli/commands/jobs_command.rb
 - lib/morpheus/cli/commands/key_pairs.rb
 - lib/morpheus/cli/commands/library_cluster_layouts_command.rb
+- lib/morpheus/cli/commands/library_cluster_packages_command.rb
 - lib/morpheus/cli/commands/library_container_scripts_command.rb
 - lib/morpheus/cli/commands/library_container_templates_command.rb
 - lib/morpheus/cli/commands/library_container_types_command.rb
+- lib/morpheus/cli/commands/library_forms_command.rb
 - lib/morpheus/cli/commands/library_instance_types_command.rb
 - lib/morpheus/cli/commands/library_layouts_command.rb
 - lib/morpheus/cli/commands/library_option_lists_command.rb
@@ -507,6 +511,7 @@ files:
 - lib/morpheus/cli/commands/security_package_types.rb
 - lib/morpheus/cli/commands/security_packages.rb
 - lib/morpheus/cli/commands/security_scans.rb
+- lib/morpheus/cli/commands/self_service_command.rb
 - lib/morpheus/cli/commands/service_catalog_command.rb
 - lib/morpheus/cli/commands/service_plans_command.rb
 - lib/morpheus/cli/commands/set_prompt_command.rb