morpheus-cli 6.2.2 → 6.2.3

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

@@ -15,9 +15,22 @@ class Morpheus::Cli::Options
   end
   
   def handle(args)
-    list(args)
+    # todo: probably just make these proper subcommands
+    # handle_subcommand(args)
+    # handle some special cases that do not conform to name, value
+    # This also provides some help on their by documenting the required parameters.
+    source_name = args[0]
+    if source_name == "networkServices"
+      network_services(args[1..-1])
+    elsif source_name == "zoneNetworkOptions"
+      zone_network_options(args[1..-1])
+    else
+      list(args)
+    end
   end
 
+  # This is the default handler for the options command.
+  # It shows the NAME and VALUE for the list of "data" returned.
   def list(args)
     options = {}
     params = {}
@@ -67,6 +80,9 @@ EOT
     begin
       json_response = @options_interface.options_for_source(source_name, params)
     rescue RestClient::Exception => e
+      if Morpheus::Logging.debug? # or options[:debug]
+        raise e
+      end
       if e.response && e.response.code == 404
         raise_command_error("Options source not found by name '#{source_name}'", args, optparse)
       elsif e.response && e.response.code == 500
@@ -88,8 +104,125 @@ EOT
         print cyan,"No options found.",reset,"\n"
       else
         print as_pretty_table(records, [:name, :value], options)
-        print_results_pagination(json_response)
+        print_results_pagination({size: records.size, total: records.size})
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  # handle some well option sources by name
+
+  def network_services(args)
+    options = {}
+    params = {}
+    source_name = "networkServices"
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: morpheus #{command_name} #{source_name} #{args[0]}"
+      # build_standard_list_options(opts, options)
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+View list of options for source '#{source_name}'.
+This is the list of network service types (network server types) that can be added.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count: 0)
+    connect(options)
+    params.merge!(parse_list_options(options))
+    @options_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @options_interface.dry.options_for_source(source_name, params)
+      return
+    end
+    json_response = @options_interface.options_for_source(source_name, params)
+    render_response(json_response, options, "data") do
+      records = json_response["data"].collect {|r| r['services']}.compact.flatten
+      print_h1 "Morpheus Options", ["Source: #{source_name}"] + parse_list_subtitles(options), options, ""
+      if records.nil? || records.empty?
+        print cyan,"No options found.",reset,"\n"
+      else
+        json_response["data"].each do |data_row|
+          if data_row['services'] && !data_row['services'].empty?
+            services = []
+            data_row['services'].each do |service_row|
+              services << {name: service_row['name'], code: service_row['code'] , id: service_row['id'], value: service_row['id']}
+            end
+            # print_h2 "#{data_row['name']} Options", [], options
+            print_h2 "#{data_row['name']}", [], options
+            print as_pretty_table(services, [:id, :name, :code], options)
+          end
+        end
+      end
+      print_results_pagination({size: records.size, total: records.size})
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+  
+#  # this is a really slow one right now, need to look into that.
+#   def networks(args)
+#   end
+
+  def zone_network_options(args)
+    options = {}
+    params = {}
+    source_name = "zoneNetworkOptions"
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: morpheus #{command_name} #{source_name} #{args[0]}"
+      # build_standard_list_options(opts, options)
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+View list of options for source '#{source_name}'.
+This is the list of networks available when provisioning to a particular cloud and layout.
+
+Required Parameters:
+    Cloud ID (zoneId)
+    Layout ID (layoutId)
+
+Examples: 
+    options #{source_name} -Q zoneId=40&layoutId=1954
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count: 0)
+    connect(options)
+    params.merge!(parse_list_options(options))
+    @options_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @options_interface.dry.options_for_source(source_name, params)
+      return
+    end
+    # This requires Cloud and Layout -Q zoneId=40&layoutId=1954
+    # todo: prompt
+    json_response = @options_interface.options_for_source(source_name, params)
+    render_response(json_response, options, "data") do
+      # This is different, data is a Hash, not an Array...
+      networks = json_response["data"]["networks"]
+      network_groups = json_response["data"]["networkGroups"]
+      network_subnets = json_response["data"]["networkSubnets"]
+      records = [networks, network_groups, network_subnets].compact.flatten
+      print_h1 "Morpheus Options", ["Source: #{source_name}"] + parse_list_subtitles(options), options, ""
+      if records.nil? || records.empty?
+        print cyan,"No options found.",reset,"\n"
+      else
+        if networks && !networks.empty?
+          print_h2 "Networks", [], options
+          rows = networks.collect {|row| {name: row['name'], value: row['id']} }
+          print as_pretty_table(rows, [:name, :value], options)
+        end
+        if network_groups && !network_groups.empty?
+          print_h2 "Network Groups", [], options
+          rows = network_groups.collect {|row| {name: row['name'], value: row['id']} }
+          print as_pretty_table(rows, [:name, :value], options)
+        end
+        if network_subnets && !network_subnets.empty?
+          print_h2 "Subnets", [], options
+          rows = network_subnets.collect {|row| {name: row['name'], value: row['id']} }
+          print as_pretty_table(rows, [:name, :value], options)
+        end
       end
+      print_results_pagination({size: records.size, total: records.size})
       print reset,"\n"
     end
     return 0, nil

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

@@ -137,6 +137,7 @@ module Morpheus::Cli::InfrastructureHelper
       return cloud_type_for_name(val)
     end
   end
+
   def cloud_type_for_id(id)
     return get_available_cloud_types().find { |z| z['id'].to_i == id.to_i}
   end
@@ -633,7 +634,6 @@ module Morpheus::Cli::InfrastructureHelper
       "Name" => lambda {|it| it['name'] },
       "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
       "URL" => lambda {|it| it['serviceUrl'] },
-      #"Pools" => lambda {|it| it['pools'] ? anded_list(it['pools'].collect {|p| p['name'] }, 3) : '' },
       "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Status" => lambda {|it| format_network_pool_server_status(it) },
       "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
@@ -661,7 +661,6 @@ module Morpheus::Cli::InfrastructureHelper
       "Extra Attributes" => lambda {|it| it['config'] ? it['config']['extraAttributes'] : nil },
       "Enabled" => lambda {|it| format_boolean(it['enabled']) },
       "Status" => lambda {|it| format_network_pool_server_status(it) },
-      #"Pools" => lambda {|it| it['pools'] ? anded_list(it['pools'].collect {|p| p['name'] }, 3) : '' },
       "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Last Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
     }
@@ -706,4 +705,106 @@ module Morpheus::Cli::InfrastructureHelper
     }
   end
 
+  def find_network_server_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_server_type_by_id(val)
+    else
+      # always find by code too
+      #return find_network_server_type_by_name(val)
+      return find_network_server_type_by_name_or_code(val)
+    end
+  end
+
+  def find_network_server_type_by_id(id)
+    begin
+      json_response = @network_server_types_interface.get(id.to_i)
+      return json_response['networkServerType']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Server Type not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_network_server_type_by_name(name)
+    json_response = @network_server_types_interface.list({name: name.to_s})
+    network_server_types = json_response['networkServerTypes']
+    if network_server_types.empty?
+      print_red_alert "Network Server Type not found by name #{name}"
+      return nil
+    elsif network_server_types.size > 1
+      print_red_alert "#{network_server_types.size} network server types found by name #{name}"
+      # print_networks_table(networks, {color: red})
+      rows = network_server_types.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :code, :name], {color:red})
+      return nil
+    else
+      return network_server_types[0]
+    end
+  end
+
+  def find_network_server_type_by_name_or_code(name)
+    json_response = @network_server_types_interface.list({phrase: name.to_s, max: 100})
+    downcase_name = name.to_s.downcase
+    network_server_types = json_response['networkServerTypes'].select { |it| 
+        it['code'].to_s.downcase == downcase_name || it['name'].to_s.downcase == downcase_name 
+    }
+    if network_server_types.empty?
+      print_red_alert "Network Server Type not found by name or code '#{name}'"
+      return nil
+    elsif network_server_types.size > 1
+      print_red_alert "#{network_server_types.size} network server types found with name or code '#{name}'"
+      # print_networks_table(networks, {color: red})
+      rows = network_server_types.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :code, :name], {color:red})
+      return nil
+    else
+      return network_server_types[0]
+    end
+  end
+
+  def network_server_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) }
+    }
+  end
+
+  def network_server_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Selectable" => lambda {|it| format_boolean(it['selectable']) },
+      "Creatable" => lambda {|it| format_boolean(it['creatable']) },
+      "Plugin" => lambda {|it| format_boolean(it['isPlugin']) },
+      "Embedded" => lambda {|it| format_boolean(it['isEmbedded']) },
+      #"Integration Code" => lambda {|it| it['integrationCode'] },
+      "Networks" => lambda {|it| format_boolean(it['hasNetworks']) },
+      "Gateways" => lambda {|it| format_boolean(it['hasGateways']) },
+      "DHCP Servers" => lambda {|it| format_boolean(it['hasDhcpServers']) },
+      "DHCP Relays" => lambda {|it| format_boolean(it['hasDhcpRelays']) },
+      # "Route Tables" => lambda {|it| format_boolean(it['hasRouteTables']) },
+      "Routers" => lambda {|it| format_boolean(it['hasRouters']) },
+      "Switches" => lambda {|it| format_boolean(it['hasSwitches']) },
+      "Firewall" => lambda {|it| format_boolean(it['hasFirewall']) },
+      "Security Groups" => lambda {|it| format_boolean(it['hasSecurityGroups']) },
+      "Load Balancers" => lambda {|it| format_boolean(it['hasLoadBalancers']) },
+      # "Security Code" => lambda {|it| it['securityCode'] },
+      # "User Visible" => lambda {|it| format_boolean(it['userVisible']) },
+    }
+  end
+
 end

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

@@ -0,0 +1,62 @@
+require 'morpheus/cli/mixins/print_helper'
+require 'morpheus/cli/option_types'
+require 'morpheus/rest_client'
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for networking commands
+module Morpheus::Cli::NetworksHelper
+
+  def self.included(klass)
+    klass.send :include, Morpheus::Cli::PrintHelper
+  end
+
+  def network_servers_interface
+    # @api_client.network_servers
+    raise "#{self.class} has not defined @network_servers_interface" if @network_servers_interface.nil?
+    @network_servers_interface
+  end
+
+  def find_network_server(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_server_by_id(val)
+    else
+      if server = find_network_server_by_name(val)
+        return find_network_server_by_id(server['id'])
+      end
+    end
+  end
+
+  def find_network_server_by_id(id)
+    begin
+      # Use query parameter `details=true` to get the full type object with all its configuration settings and optionTypes
+      json_response = @network_servers_interface.get(id.to_i, {details:true})
+      return json_response['networkServer']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Server not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_network_server_by_name(name)
+    # Use query parameter `details=true` to get the full type object with all its configuration settings and optionTypes
+    json_response = @network_servers_interface.list({phrase: name.to_s, details:true})
+    servers = json_response['networkServers']
+    if servers.empty?
+      print_red_alert "Network Server not found by name #{name}"
+      return nil
+    elsif servers.size > 1
+      print_red_alert "#{servers.size} network servers found by name #{name}"
+      rows = servers.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return servers[0]
+    end
+  end
+
+end

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.2.3"
   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.2.3
 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-13 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