morpheus-cli 6.2.3 → 6.3.1

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

@@ -23,8 +23,8 @@ class Morpheus::Cli::NetworkServersCommand
   end
 
   def add(args)
-    options = {}
-    params = {}
+    options = {params: {}}
+    params = options[:params]
     ip_range_list = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
@@ -55,18 +55,20 @@ EOT
     end
 
     # merge -O options into normally parsed options
-    params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+    #params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
     # construct payload
     payload = nil
     if options[:payload]
       payload = options[:payload]
+      payload.deep_merge!({rest_object_key => parse_passed_options(options)})
+      payload.deep_merge!({rest_object_key => params})
     else
-      # prompt for network server options
-      
+      payload = {}
+      payload.deep_merge!({rest_object_key => parse_passed_options(options)})
       # Name
       if !params['name']
-        params['name'] = prompt_value({'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this network server.'}, params, options[:no_prompt])
+        params['name'] = prompt_value({'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this network server.'}, options)
         # params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this network server.'}], params, @api_client, {}, options[:no_prompt])['name']
       end
 
@@ -93,7 +95,7 @@ EOT
         end
         network_type_code = selected_type['code']
       else
-        network_type_code = prompt_value({'fieldName' => 'type', 'fieldLabel' => 'Network Server Type', 'type' => 'select', 'selectOptions' => network_server_type_options, 'required' => true, 'description' => 'Choose a network server type.'}, params, options[:no_prompt])
+        network_type_code = prompt_value({'fieldName' => 'type', 'fieldLabel' => 'Network Server Type', 'type' => 'select', 'selectOptions' => network_server_type_options, 'required' => true, 'description' => 'Choose a network server type.'}, options.merge(params))
         #network_type_code = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Network Server Type', 'type' => 'select', 'selectOptions' => network_server_type_options, 'required' => true, 'description' => 'Choose a network server type.'}], options, @api_client, {}, options[:no_prompt])['type']
         selected_type = network_server_type_options.find {|it| it['code'] == network_type_code }
         if selected_type.nil?
@@ -106,9 +108,9 @@ EOT
       # prompt options by type
       network_server_type = @network_server_types_interface.get(network_type_id.to_i)['networkServerType']
       # params['type'] = network_server_type['code']
-      option_result = Morpheus::Cli::OptionTypes.prompt(network_server_type['optionTypes'], params.merge({:context_map => {'networkServer' => ''}}), @api_client, {}, options[:no_prompt], true)
+      option_result = prompt(network_server_type['optionTypes'], options.merge({:context_map => {'networkServer' => ''}}))
       params.deep_merge!(option_result)
-      payload = {'networkServer' => params}
+      payload.deep_merge!({rest_object_key => params})
     end
     @network_servers_interface.setopts(options)
     if options[:dry_run]
@@ -218,6 +220,14 @@ EOT
 
   private
 
+  def network_server_list_key
+    'networkServers'
+  end
+
+  def network_server_object_key
+    'networkServer'
+  end
+
   # def render_response_for_get(json_response, options)
   #   # load the type and show fields dynamically based on optionTypes
   #   render_response(json_response, options, rest_object_key) do

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

@@ -763,61 +763,49 @@ class Morpheus::Cli::PoliciesCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.banner = subcommand_usage("[search]")
+      build_standard_list_options(opts, options, [], [:search])
+      opts.footer = <<-EOT
+Get details about a policy type.
+[policy-type] is required. This is Name or ID of a policy type.
+EOT
       opts.footer = "List policy types."
     end
     optparse.parse!(args)
-
-    if args.count != 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got #{args.count}\n#{optparse}"
-      return 1
-    end
-
+    verify_args!(args:args, optparse:optparse, count:0)
+    # if args.count > 0
+    #   options[:phrase] = args.join(" ")
+    # end
+    params.merge!(parse_list_options(options))
     connect(options)
-    begin
-      @policies_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @policies_interface.dry.list_policy_types(params)
-        return 0
-      end
-      json_response = @policies_interface.list_policy_types()
+    @policies_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @policies_interface.dry.list_policy_types(params)
+      return 0
+    end
+    json_response = @policies_interface.list_policy_types(params)
+    render_response(json_response, options, 'policyTypes') do
       policy_types = json_response['policyTypes']
-      if options[:json]
-        puts as_json(json_response, options, "policyTypes")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "policyTypes")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(policy_types, options)
-        return 0
-      else
-        print_h1 "Morpheus Policy Types"
-        rows = policy_types.collect {|policy_type| 
-          row = {
-            id: policy_type['id'],
-            name: policy_type['name'],
-            code: policy_type['code'],
-            description: policy_type['description']
-          }
-          row
+      print_h1 "Morpheus Policy Types"
+      rows = policy_types.collect {|policy_type| 
+        row = {
+          id: policy_type['id'],
+          name: policy_type['name'],
+          code: policy_type['code'],
+          description: policy_type['description']
         }
-        columns = [:id, :name]
-        if options[:include_fields]
-          columns = options[:include_fields]
-        end
-        print cyan
-        print as_pretty_table(rows, columns, options)
-        print_results_pagination(json_response, {:label => "policy type", :n_label => "policy types"})
-        print reset, "\n"
+        row
+      }
+      columns = [:id, :name]
+      if options[:include_fields]
+        columns = options[:include_fields]
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
+      print cyan
+      print as_pretty_table(rows, columns, options)
+      print_results_pagination(json_response)
+      print reset, "\n"
     end
+    return 0
   end
 
   def get_type(args)
@@ -825,91 +813,54 @@ class Morpheus::Cli::PoliciesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[policy-type]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
-      opts.footer = "Get details about a policy type." + "\n" +
-                    "[policy-type] is required. This is ID of a policy type."
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a policy type.
+[policy-type] is required. This is Name or ID of a policy type.
+EOT
     end
     optparse.parse!(args)
-
-    if args.count != 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 1 and got #{args.count}\n#{optparse}"
-      return 1
-    end
-
+    verify_args!(args:args, optparse:optparse, count: 1)
     connect(options)
-    begin
-      policy_type_id = args[0].to_s
-      @policies_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @policies_interface.dry.get_policy_type(policy_type_id, params)
-        return 0
-      end
-      json_response = @policies_interface.get_policy_type(policy_type_id, params)
-      policy_type = json_response['policyType']
-      if options[:json]
-        puts as_json(json_response)
-      else
-        print_h1 "Policy Type Details"
-        print cyan
-        description_cols = {
-          "ID" => 'id',
-          "Name" => 'name',
-          # "Description" => 'description',
-          "Code" => 'code',
-          "Category" => 'category',
-          # "Load Method" => 'loadMethod',
-          # "Enforce Method" => 'enforceMethod',
-          # "Prepare Method" => 'prepareMethod',
-          # "Validate Method" => 'validateMethod',
-          "Provision Enforced" => lambda {|it| it['enforceOnProvision'] ? 'Yes' : 'No'  },
-          "Managed Enforced" => lambda {|it| it['enforceOnManaged'] ? 'Yes' : 'No'  },
-        }
-        print_description_list(description_cols, policy_type)
-        print reset,"\n"
-
-        # show option types
-        print_h2 "Policy Type Options"
-        policy_type_option_types = policy_type['optionTypes']
-        if !policy_type_option_types || policy_type_option_types.size() == 0
-          puts "No options found for policy type"
-        else
-          rows = policy_type_option_types.collect {|option_type|
-            field_str = option_type['fieldName'].to_s
-            if !option_type['fieldContext'].to_s.empty?
-              field_str = option_type['fieldContext'] + "." + field_str
-            end
-            description_str = option_type['description'].to_s
-            if option_type['helpBlock']
-              if description_str.empty?
-                description_str = option_type['helpBlock']
-              else
-                description_str += " " + option_type['helpBlock']
-              end
-            end
-            row = {
-              #code: option_type['code'],
-              field: field_str,
-              type: option_type['type'],
-              description: description_str,
-              default: option_type['defaultValue'],
-              required: option_type['required'] ? 'Yes' : 'No'
-            }
-            row
-          }
-          columns = [:field, :type, :description, :default, :required]
-          print cyan
-          print as_pretty_table(rows, columns)
-          print reset,"\n"
-        end
-        return 0
-      end
+    params.merge!(parse_query_options(options))
+    policy_type_id = args[0]
+    if policy_type_id.to_s !~ /\A\d{1,}\Z/
+      policy_type = find_policy_type_by_name_or_id(args[0])
+      return [1, "Policy Type not found for #{args[0]}"] if policy_type.nil?
+      policy_type_id = policy_type['id']
+    end
+    @policies_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @policies_interface.dry.get_policy_type(policy_type_id, params)
       return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
-    @policies_interface.list_policy_types
+    json_response = @policies_interface.get_policy_type(policy_type_id, params)
+    render_response(json_response, options, 'policyType') do
+      policy_type = json_response['policyType']
+      print_h1 "Policy Type Details"
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        # "Description" => 'description',
+        "Code" => 'code',
+        "Category" => 'category',
+        # "Load Method" => 'loadMethod',
+        # "Enforce Method" => 'enforceMethod',
+        # "Prepare Method" => 'prepareMethod',
+        # "Validate Method" => 'validateMethod',
+        "Provision Enforced" => lambda {|it| it['enforceOnProvision'] ? 'Yes' : 'No'  },
+        "Managed Enforced" => lambda {|it| it['enforceOnManaged'] ? 'Yes' : 'No'  },
+      }
+      print_description_list(description_cols, policy_type)
+      print reset,"\n"
+
+      # show option types
+      print_h2 "Policy Type Options"
+      print format_option_types_table(policy_type['optionTypes'], options, 'policy')
+      print reset,"\n"
+    end
+    return 0
   end
 
   private
@@ -978,9 +929,42 @@ class Morpheus::Cli::PoliciesCommand
     end
   end
 
+  def find_policy_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_policy_type_by_id(val)
+    else
+      return find_policy_type_by_name(val)
+    end
+  end
+
+  def find_policy_type_by_name(name)
+    json_response = nil
+    
+    # json_response = @policies_interface.list_policy_types({name: name.to_s})
+    json_response = @policies_interface.list_policy_types({max: 10000})
+    policy_types = json_response['policyTypes']
+    match_value = name.to_s.downcase
+    policy_types = policy_types.select {|it| it['name'].to_s.downcase == match_value || it['code'].to_s.downcase == match_value }
+    if policy_types.empty?
+      print_red_alert "Policy not found by name #{name}"
+      return nil
+    elsif policy_types.size > 1
+      print_red_alert "#{policy_types.size} policy types found by name or code #{name}"
+      # print_policies_table(policy_types, {color: red})
+      rows = policy_types.collect do |it|
+        {id: it['id'], name: it['name'], code: it['code']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      policy_type = policy_types[0]
+      return policy_type
+    end
+  end
+
   def find_policy_type_by_id(id)
     begin
-      json_response = @policies_interface.get_type(id.to_s)
+      json_response = @policies_interface.get_policy_type(id.to_s)
       return json_response['policyType']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404

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

@@ -631,6 +631,8 @@ EOT
         params['authority'] = v_prompt['authority']
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2}], options[:options])
         params['description'] = v_prompt['description']
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'landingUrl', 'fieldLabel' => 'landingUrl', 'type' => 'text', 'displayOrder' => 3, 'description' => 'An optional override for the default landing page after login for a user.'}], options[:options])
+        params['landingUrl'] = v_prompt['landingUrl']
 
         if params['owner']
           if @is_master_account && has_complete_access
@@ -2479,6 +2481,7 @@ Update default workflow access for a role.
     [
       {'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
+      {'fieldName' => 'landingUrl', 'fieldLabel' => 'Landing URL', 'type' => 'text', 'description' => 'An optional override for the default landing page after login for a user.'},
       {'fieldName' => 'roleType', 'fieldLabel' => 'Role Type', 'type' => 'select', 'selectOptions' => [{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}], 'defaultValue' => 'user'},
       {'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text'},
       {'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use'},

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

@@ -0,0 +1,17 @@
+require 'morpheus/cli/cli_command'
+require 'morpheus/cli/commands/catalog_item_types_command'
+
+class Morpheus::Cli::SelfServiceCommand
+  include Morpheus::Cli::CliCommand
+
+  set_command_name :'self-service'
+  set_command_description "Deprecated and replaced by catalog-item-types"
+
+  set_command_hidden
+  
+  def handle(args)
+  	print_error yellow,"[DEPRECATED] The command `self-service` is deprecated and replaced by `catalog-item-types`.",reset,"\n"
+  	Morpheus::Cli::CatalogItemTypesCommand.new.handle(args)
+  end
+
+end

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

@@ -308,7 +308,7 @@ EOT
     catalog_item_type = json_response[catalog_item_type_object_key]
     # need to load by id to get optionTypes
     # maybe do ?name=foo&includeOptionTypes=true 
-    if catalog_item_type['optionTypes'].nil?
+    if catalog_item_type['optionTypes'].nil? && catalog_item_type['form'].nil?
       catalog_item_type = find_catalog_item_type_by_id(catalog_item_type['id'])
       return [1, "catalog item type not found"] if catalog_item_type.nil?
     end
@@ -318,14 +318,25 @@ EOT
       show_columns = catalog_item_type_column_definitions
       print_description_list(show_columns, catalog_item_type)
 
+      form = catalog_item_type['form']
+      if form
+        # print_h2 "Configuration Options (Form: #{form['name']})"
+        print_h2 "Configuration Options"
+        form_inputs = (form['options'] || [])
+        if form['fieldGroups']
+          form['fieldGroups'].each { |field_group| form_inputs += (field_group['options'] || []) }
+        end
+        #print format_simple_option_types_table(form_inputs, options)
+        print format_option_types_table(form_inputs, options, 'config.customOptions')
+        # print reset,"\n"
+      else
+        # print cyan,"No form inputs found for this catalog item.","\n",reset
+      end
+
       if catalog_item_type['optionTypes'] && catalog_item_type['optionTypes'].size > 0
         print_h2 "Configuration Options"
-        print as_pretty_table(catalog_item_type['optionTypes'], {
-          "LABEL" => lambda {|it| it['fieldLabel'] },
-          "NAME" => lambda {|it| it['fieldName'] },
-          "TYPE" => lambda {|it| it['type'] },
-          "REQUIRED" => lambda {|it| format_boolean it['required'] },
-        })
+        #print format_simple_option_types_table(catalog_item_type['optionTypes'], options)
+        print format_option_types_table(catalog_item_type['optionTypes'], options, 'config.customOptions')
       else
         # print cyan,"No option types found for this catalog item.","\n",reset
       end
@@ -645,21 +656,38 @@ EOT
 
       # this is silly, need to load by id to get optionTypes
       # maybe do ?name=foo&includeOptionTypes=true 
-      if catalog_item_type['optionTypes'].nil?
+      if catalog_item_type['optionTypes'].nil? && catalog_item_type['form'].nil?
         catalog_item_type = find_catalog_item_type_by_id(catalog_item_type['id'])
         return [1, "catalog item type not found"] if catalog_item_type.nil?
       end
-      catalog_option_types = catalog_item_type['optionTypes']
-      # instead of config.customOptions just use config...
-      catalog_option_types = catalog_option_types.collect {|it|
-        it['fieldContext'] = 'config'
-        it
-      }
-      if catalog_option_types && !catalog_option_types.empty?
-        api_params = construct_catalog_api_params(catalog_item_type)
-        config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, api_params, options[:no_prompt], false, false, true)['config']
+      
+      if catalog_item_type['formType'] == 'form'
+        # prompt for form options
+        if catalog_item_type['form'].nil?
+          raise_command_error "No form found for catalog item type '#{catalog_item_type['name']}'"
+        end
+        # use the new PromptHelper method prompt_form()
+        config_prompt = prompt_form(catalog_item_type['form'], options.merge({:context_map => {'config.customOptions' => 'config'}, :api_params => construct_catalog_api_params(catalog_item_type)}))['config']
         payload[add_item_object_key].deep_merge!({'config' => config_prompt})
+      else
+        # prompt for optionTypes
+        catalog_option_types = catalog_item_type['optionTypes']
+        if catalog_option_types.nil?
+          #raise_command_error "No options found for catalog item type '#{catalog_item_type['name']}'"
+          catalog_option_types = []
+        end
+        # instead of config.customOptions just use config...
+        catalog_option_types = catalog_option_types.collect {|it|
+          it['fieldContext'] = 'config'
+          it
+        }
+        if catalog_option_types && !catalog_option_types.empty?
+          api_params = construct_catalog_api_params(catalog_item_type)
+          config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, api_params, options[:no_prompt], false, false, true)['config']
+          payload[add_item_object_key].deep_merge!({'config' => config_prompt})
+        end
       end
+
       if workflow_context
         payload[add_item_object_key]['context'] = workflow_context
       else
@@ -673,7 +701,7 @@ EOT
         elsif !catalog_item_type['context'].nil?
           workflow_context = catalog_item_type['context']
         end
-        payload[add_item_object_key]['context'] = workflow_context
+        payload[add_item_object_key]['context'] = workflow_context  if workflow_context
       end
 
       if workflow_target
@@ -981,23 +1009,35 @@ EOT
 
         # this is silly, need to load by id to get optionTypes
         # maybe do ?name=foo&includeOptionTypes=true 
-        if catalog_item_type['optionTypes'].nil?
+        if catalog_item_type['optionTypes'].nil? && catalog_item_type['form'].nil?
           catalog_item_type = find_catalog_item_type_by_id(catalog_item_type['id'])
           return [1, "catalog item type not found"] if catalog_item_type.nil?
         end
-        catalog_option_types = catalog_item_type['optionTypes']
-        # instead of config.customOptions just use config...
-        catalog_option_types = catalog_option_types.collect {|it|
-          it['fieldContext'] = nil
-          it['fieldContext'] = 'config'
-          it
-        }
-        if catalog_option_types && !catalog_option_types.empty?
-          api_params = construct_catalog_api_params(catalog_item_type)
-          config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, api_params, options[:no_prompt], false, false, true)['config']
+        
+        if catalog_item_type['formType'] == 'form'
+          # prompt for form options
+          if catalog_item_type['form'].nil?
+            raise_command_error "No form found for catalog item type '#{catalog_item_type['name']}'"
+          end
+          # use the new PromptHelper method prompt_form()
+          config_prompt = prompt_form(catalog_item_type['form'], options.merge({:context_map => {'config.customOptions' => 'config'}, :api_params => construct_catalog_api_params(catalog_item_type)}))['config']
           item_payload.deep_merge!({'config' => config_prompt})
+        else
+          # prompt for optionTypes
+          catalog_option_types = catalog_item_type['optionTypes']
+          # instead of config.customOptions just use config...
+          catalog_option_types = catalog_option_types.collect {|it|
+            it['fieldContext'] = nil
+            it['fieldContext'] = 'config'
+            it
+          }
+          if catalog_option_types && !catalog_option_types.empty?
+            api_params = construct_catalog_api_params(catalog_item_type)
+            config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, api_params, options[:no_prompt], false, false, true)['config']
+            item_payload.deep_merge!({'config' => config_prompt})
+          end
         end
-        
+
         if workflow_context
           item_payload['context'] = workflow_context
         else

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

@@ -847,7 +847,7 @@ EOT
       print_description_list(virtual_image_location_column_definitions, location, options)
       if volumes && !volumes.empty?
         print_h2 "Volumes", options
-        volume_rows = location_volumes.collect do |volume|
+        volume_rows = volumes.collect do |volume|
           {name: volume['name'], size: Filesize.from("#{volume['rawSize']} B").pretty}
         end
         print cyan

data/lib/morpheus/cli/error_handler.rb

@@ -216,9 +216,11 @@ class Morpheus::Cli::ErrorHandler
             @stderr.puts response['msg']
           end
           if response['errors']
-            response['errors'].each do |key, value|
-              @stderr.print "* #{key}: #{value}\n"
-            end
+            # response['errors'].each do |key, value|
+            #   @stderr.print "* #{key}: #{value}\n"
+            # end
+            # puts as_yaml(response['errors'])
+            @stderr.print format_rest_errors(response['errors'])
           end
           @stderr.print reset
         else
@@ -231,6 +233,19 @@ class Morpheus::Cli::ErrorHandler
     end
   end
 
+  def format_rest_errors(errors, context=nil)
+    out = ""
+    Hash(errors).each do |key, value|
+      if value.is_a?(Hash)
+        out << format_rest_errors(value, context ? "#{context}.#{key}" : key)
+      else
+        prefix = context ? (context + '.') : ''
+        out << "* #{prefix}#{key}: #{value}\n"
+      end
+    end
+    out
+  end
+
   def print_rest_request(req)
     @stderr.print "REQUEST"
     @stderr.print "\n"

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

@@ -131,6 +131,7 @@ module Morpheus::Cli::AccountsHelper
       "ID" => 'id',
       "Name" => 'authority',
       "Description" => 'description',
+      "Landing URL" => 'landingUrl',
       #"Scope" => lambda {|it| it['scope'] },
       "Type" => lambda {|it| format_role_type(it) },
       "Multitenant" => lambda {|it| 
@@ -149,6 +150,7 @@ module Morpheus::Cli::AccountsHelper
       "ID" => 'id',
       "Name" => 'authority',
       "Description" => 'description',
+      "Landing URL" => 'landingUrl',
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
     }

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

@@ -1511,6 +1511,8 @@ module Morpheus::Cli::PrintHelper
   end
 
   def format_option_types_table(option_types, options={}, domain_name=nil)
+    show_option_source = option_types.find {|it| !it['optionList'].to_s.empty? || !it['optionSource'].to_s.empty? }
+    show_default = option_types.find {|it| !it['defaultValue'].nil? }
     columns = [
       {"FIELD LABEL" => lambda {|it| it['fieldLabel'] } },
       {"FIELD NAME" => lambda {|it| 
@@ -1521,17 +1523,29 @@ module Morpheus::Cli::PrintHelper
         end
       } },
       {"TYPE" => lambda {|it| it['type'] } },
-      {"OPTION SOURCE" => lambda {|it| 
-        if it['optionSourceType']
+      {"REQUIRED" => lambda {|it| format_boolean it['required'] } },
+      show_option_source ? {"OPTION SOURCE" => lambda {|it| 
+        if it['optionList']
+          it['optionList']['name']
+        elsif it['optionSourceType']
           "#{it['optionSourceType']}/#{it['optionSource']}"
         else
           "#{it['optionSource']}"
         end
-      } },
-      {"DEFAULT" => lambda {|it| it['defaultValue'] } },
-      {"REQUIRED" => lambda {|it| format_boolean it['required'] } },
-    ]
+      } } : nil,
+      show_default ? {"DEFAULT" => lambda {|it| it['defaultValue'] } } : nil,
+    ].compact
     as_pretty_table(option_types, columns, options)
   end
+
+  def format_simple_option_types_table(option_types, options={})
+    as_pretty_table(option_types, {
+      "LABEL" => lambda {|it| it['fieldLabel'] },
+      "NAME" => lambda {|it| it['fieldName'] },
+      "TYPE" => lambda {|it| it['type'] },
+      "REQUIRED" => lambda {|it| format_boolean it['required'] },
+      "DEFAULT" => lambda {|it| it['defaultValue'] },
+    }, options)
+  end
   
 end