morpheus-cli 6.2.2 → 6.3.0

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

@@ -58,7 +58,7 @@ module Morpheus::Cli::PrintHelper
   # title - subtitle1, subtitle2
   # ==================
   #
-  def print_h1(title, subtitles=nil, options=nil)
+  def print_h1(title, subtitles=nil, options=nil, suffix_content="\n")
     # ok, support all these formats for now:
     # print_h1(title, options={})
     # print_h1(title, subtitles, options={})
@@ -89,14 +89,18 @@ module Morpheus::Cli::PrintHelper
     end
     out << "\n"
     if options[:border_style] == :thin
-      out << "\n"
+
     else
-      out << "#{color}#{bold}==================#{reset}\n\n"
+      out << "#{color}#{bold}==================#{reset}\n"
+    end
+    # Default suffix_content is typically one extra newline
+    if !suffix_content.to_s.empty?
+      out << suffix_content.to_s
     end
     print out
   end
 
-  def print_h2(title, subtitles=nil, options=nil)
+  def print_h2(title, subtitles=nil, options=nil, suffix_content="\n")
     # ok, support all these formats for now:
     # print_h2(title={})
     # print_h2(title, options={})
@@ -117,9 +121,13 @@ module Morpheus::Cli::PrintHelper
     end
     out << "\n"
     if options[:border_style] == :thin
-      out << "\n"
+
     else
-      out << "#{color}---------------------#{reset}\n\n"
+      out << "#{color}---------------------#{reset}\n"
+    end
+    # Default suffix_content is typically one extra newline
+    if !suffix_content.to_s.empty?
+      out << suffix_content.to_s
     end
     print out
   end
@@ -1505,8 +1513,21 @@ module Morpheus::Cli::PrintHelper
   def format_option_types_table(option_types, options={}, domain_name=nil)
     columns = [
       {"FIELD LABEL" => lambda {|it| it['fieldLabel'] } },
-      {"FIELD NAME" => lambda {|it| [it['fieldContext'] == domain_name ? nil : it['fieldContext'], it['fieldName']].select {|it| !it.to_s.empty? }.join('.') } },
+      {"FIELD NAME" => lambda {|it| 
+        if it['fieldContext'] && it['fieldContext'] != domain_name && it['fieldContext'] != 'domain'
+          "#{it['fieldContext']}.#{it['fieldName']}"
+        else
+          "#{it['fieldName']}"
+        end
+      } },
       {"TYPE" => lambda {|it| it['type'] } },
+      {"OPTION SOURCE" => lambda {|it| 
+        if it['optionSourceType']
+          "#{it['optionSourceType']}/#{it['optionSource']}"
+        else
+          "#{it['optionSource']}"
+        end
+      } },
       {"DEFAULT" => lambda {|it| it['defaultValue'] } },
       {"REQUIRED" => lambda {|it| format_boolean it['required'] } },
     ]

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

@@ -0,0 +1,15 @@
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for prompting for input
+module Morpheus::Cli::PromptHelper
+
+	# prompt for a single option type and and return the input value
+	# @param option_type [Hash] The OptionType input record to prompt for , contians fieldName, fieldLabel, etc.
+  # @param options [Hash] The context being constructed, checks this for the value before prompting the user for input.
+  # @param no_prompt [Boolean] The context being constructed, checks this for the value before prompting the user for input.
+  # @param api_params [Hash] Optional map of parameters to include in API request for select option types
+  # @return input value for the option type, usually a string or number if the value is an ID or of type: number
+	def prompt_value(option_type, options, no_prompt=false, api_params={})
+		# this does not work with fieldContext, so get rid of it
+		return Morpheus::Cli::OptionTypes.prompt([option_type.merge({'fieldContext' => nil})], options, @api_client, api_params, no_prompt)[option_type['fieldName']]
+	end
+end

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

@@ -915,8 +915,8 @@ module Morpheus::Cli::ProvisioningHelper
 
     # Security Groups
     # look for securityGroups option type... this is old and goofy
-    sg_option_type = option_type_list.find {|opt| ((opt['code'] == 'provisionType.amazon.securityId') || (opt['name'] == 'securityId')) }
-    option_type_list = option_type_list.reject {|opt| ((opt['code'] == 'provisionType.amazon.securityId') || (opt['name'] == 'securityId')) }
+    sg_option_type = option_type_list.find {|opt| ((opt['code'] == 'provisionType.amazon.securityId') || (opt['fieldName'] == 'securityId' || opt['name'] == 'securityId')) }
+    option_type_list = option_type_list.reject {|opt| ((opt['code'] == 'provisionType.amazon.securityId') || (opt['fieldName'] == 'securityId' || opt['name'] == 'securityId')) }
     if locked_fields.include?('securityGroups')
       # payload['securityGroups'] = options[:options]['securityGroups'] if options[:options]['securityGroups']
     else
@@ -924,19 +924,35 @@ module Morpheus::Cli::ProvisioningHelper
       # ok.. seed data has changed and serverTypes do not have this optionType anymore...
       if sg_option_type.nil?
         if provision_type && (provision_type["code"] == 'amazon')
-          sg_option_type = {'fieldContext' => 'config', 'fieldName' => 'securityId', 'type' => 'select', 'fieldLabel' => 'Security Group', 'optionSource' => 'amazonSecurityGroup', 'required' => true, 'description' => 'Select security group.', 'defaultValue' => options[:default_security_group]}
+            sg_option_type = {'fieldContext' => 'config', 'fieldName' => 'securityId', 'type' => 'select', 'fieldLabel' => 'Security Group', 'optionSource' => 'amazonSecurityGroup', 'optionSourceType' => 'amazon', 'required' => true, 'description' => 'Select security group.', 'defaultValue' => options[:default_security_group]}
         end
       end
       sg_api_params = {zoneId: cloud_id, poolId: pool_id}
-      has_security_groups = !!sg_option_type
-      available_security_groups = []
-      if sg_option_type && sg_option_type['type'] == 'select' && sg_option_type['optionSource']
-        sg_option_results = options_interface.options_for_source(sg_option_type['optionSource'], sg_api_params, sg_option_type['optionSourceType'])
-        available_security_groups = sg_option_results['data'].collect do |it|
-          {"id" => it["value"] || it["id"], "name" => it["name"], "value" => it["value"] || it["id"]}
+      # The amazon plugin uses a new optionSource options/amazon/awsPluginEc2SecurityGroup 
+      # which expects parameter config.resourcePoolId=pool-ID
+      if sg_option_type
+        if sg_option_type['optionSource'] == 'awsPluginEc2SecurityGroup'
+          if pool_id
+            sg_api_params[:config] ||= {}
+            sg_api_params[:config][:resourcePoolId] = pool_id
+          end
+          # convert multiSelect to select to make prompt_security_groups() work
+          # though we should should be able to skip the prompt_security_groups and use multiSelect instead
+          sg_option_type['type'] = 'select' if sg_option_type['type'] == 'multiSelect'
+          sg_option_type['type'] = 'typeahead' if sg_option_type['type'] == 'multiTypeahead'
+          sg_option_type['fieldLabel'] = 'Security Group' if sg_option_type['fieldLabel'] == 'Security Groups'
+          sg_option_type['required'] = true
         end
       end
+      has_security_groups = !!sg_option_type
       if options[:security_groups]
+        available_security_groups = []
+        if sg_option_type && sg_option_type['optionSource']
+          sg_option_results = options_interface.options_for_source(sg_option_type['optionSource'], sg_api_params, sg_option_type['optionSourceType'])
+          available_security_groups = sg_option_results['data'].collect do |it|
+            {"id" => it["value"] || it["id"], "name" => it["name"], "value" => it["value"] || it["id"]}
+          end
+        end
         # work with id or names, API expects ids though.
         payload['securityGroups'] = options[:security_groups].collect {|sg_id| 
           found_sg = available_security_groups.find {|it| sg_id && (sg_id.to_s == it['id'].to_s || sg_id.to_s == it['name'].to_s) }

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

@@ -982,7 +982,7 @@ EOT
       #   print_description_list(config.keys, config)
       # end
       # Option Types
-      if record['optionTypes'] && record['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.size > 0
+      if record['optionTypes'] && record['optionTypes'].size > 0
         print_h2 "Option Types", options
         print format_option_types_table(record['optionTypes'], options, rest_object_key)
       end

data/lib/morpheus/cli/option_types.rb

@@ -673,9 +673,9 @@ module Morpheus
           if input.empty? && default_value
             input = default_value.to_s
           end
-          matched_option = select_options.find{|it| (!it['value'].nil? && it['value'].to_s == input) || (!it[value_field].nil? && it[value_field].to_s == input) || (it[value_field].nil? && input.empty?)}
+          matched_option = (select_options || []).find{|it| (!it['value'].nil? && it['value'].to_s == input) || (!it[value_field].nil? && it[value_field].to_s == input) || (it[value_field].nil? && input.empty?)}
           if matched_option.nil?
-            matched_options = select_options.select {|it| it['name'] == input } # should probably be case insensitive 
+            matched_options = (select_options || []).select {|it| it['name'] == input } # should probably be case insensitive 
             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
@@ -699,7 +699,7 @@ module Morpheus
           
           if input == '?'
             help_prompt(option_type)
-            display_select_options(option_type, select_options, paging)
+            display_select_options(option_type, (select_options || []), paging)
             if paging
               paging[:cur_page] = (paging[:cur_page] + 1) * paging[:page_size] < paging[:total] ? paging[:cur_page] + 1 : 0
             end

data/lib/morpheus/cli/version.rb

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

data/lib/morpheus/logging.rb

@@ -94,9 +94,12 @@ module Morpheus::Logging
       end
       msg.gsub!(/password\"\: "[^"]+/, 'password": "************') # json properties ending with password
       msg.gsub!(/Password\"\: "[^"]+/, 'Password": "************') # json properties ending with Password
-      msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/i, 'password"=>"************')
-      msg.gsub!(/password\=\"[^"]+/i, 'password="************')
-      msg.gsub!(/password\=[^"'&]+/i, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
+      msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/, 'password"=>"************')
+      msg.gsub!(/Password\"\s?\=\>\s?\"[^"]+/, 'Password"=>"************')
+      msg.gsub!(/password\=\"[^"]+/, 'password="************')
+      msg.gsub!(/Password\=\"[^"]+/, 'Password="************')
+      msg.gsub!(/password\=[^"'&]+/, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
+      msg.gsub!(/Password\=[^"'&]+/, 'Password=************') 
       msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation="************')
       msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation=************')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.3.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -291,8 +291,10 @@ files:
 - lib/morpheus/api/network_pools_interface.rb
 - lib/morpheus/api/network_proxies_interface.rb
 - lib/morpheus/api/network_routers_interface.rb
+- lib/morpheus/api/network_security_server_types_interface.rb
 - lib/morpheus/api/network_security_servers_interface.rb
 - lib/morpheus/api/network_server_groups_interface.rb
+- lib/morpheus/api/network_server_types_interface.rb
 - lib/morpheus/api/network_servers_interface.rb
 - lib/morpheus/api/network_services_interface.rb
 - lib/morpheus/api/network_static_routes_interface.rb
@@ -391,6 +393,7 @@ files:
 - lib/morpheus/cli/commands/cloud_folders_command.rb
 - lib/morpheus/cli/commands/cloud_resource_pools_command.rb
 - lib/morpheus/cli/commands/clouds.rb
+- lib/morpheus/cli/commands/clouds_types.rb
 - lib/morpheus/cli/commands/clusters.rb
 - lib/morpheus/cli/commands/coloring_command.rb
 - lib/morpheus/cli/commands/containers_command.rb
@@ -469,7 +472,10 @@ files:
 - lib/morpheus/cli/commands/network_pools_command.rb
 - lib/morpheus/cli/commands/network_proxies_command.rb
 - lib/morpheus/cli/commands/network_routers_command.rb
+- lib/morpheus/cli/commands/network_security_server_types.rb
 - lib/morpheus/cli/commands/network_server_groups_command.rb
+- lib/morpheus/cli/commands/network_server_types_command.rb
+- lib/morpheus/cli/commands/network_servers_command.rb
 - lib/morpheus/cli/commands/network_services_command.rb
 - lib/morpheus/cli/commands/network_static_routes_command.rb
 - lib/morpheus/cli/commands/network_transport_zones_command.rb
@@ -552,10 +558,12 @@ files:
 - lib/morpheus/cli/mixins/load_balancers_helper.rb
 - lib/morpheus/cli/mixins/logs_helper.rb
 - lib/morpheus/cli/mixins/monitoring_helper.rb
+- lib/morpheus/cli/mixins/networks_helper.rb
 - lib/morpheus/cli/mixins/operations_helper.rb
 - lib/morpheus/cli/mixins/option_source_helper.rb
 - lib/morpheus/cli/mixins/print_helper.rb
 - lib/morpheus/cli/mixins/processes_helper.rb
+- lib/morpheus/cli/mixins/prompt_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
 - lib/morpheus/cli/mixins/remote_helper.rb
 - lib/morpheus/cli/mixins/rest_command.rb