morpheus-cli 4.2.11 → 4.2.16

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -186,49 +186,42 @@ class Morpheus::Cli::LibraryOptionListsCommand
     my_option_types = nil
     list_type = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[type] [options]")
-      opts.on( '-t', '--type TYPE', "Option List Type. (rest, manual)" ) do |val|
-        list_type = val
-        # options[:options] ||= {}
-        # options[:options]['type'] = val
-      end
+      opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, new_option_type_list_option_types())
       build_standard_add_options(opts, options)
       opts.footer = "Create a new option list."
     end
     optparse.parse!(args)
-    
-    
+    verify_args!(args:args, optparse:optparse, max:1)
+    if args.count == 1
+      options[:options]['name'] = args[0]
+    end
+
     connect(options)
     begin
-      passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if !passed_options.empty?
-          payload['optionTypeList'] ||= {}
-          payload['optionTypeList'].deep_merge!(passed_options)
-        end
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
       else
-        if !list_type
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true}], options[:options], @api_client, {})
-          list_type = v_prompt['type']
-        end
-        params = passed_options
-        v_prompt = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(list_type), options[:options], @api_client, options[:params])
-        params.deep_merge!(v_prompt)
-        params['type'] = list_type
-        if params['type'] == 'rest'
+        payload = {}
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
+        list_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(), options[:options], @api_client, options[:params])
+        if list_payload['type'] == 'rest'
           # prompt for Source Headers
-          source_headers = prompt_source_headers(options)
-          if !source_headers.empty?
-            params['config'] ||= {}
-            params['config']['sourceHeaders'] = source_headers
+          if !(payload['optionTypeList']['config'] && payload['optionTypeList']['config']['sourceHeaders'])
+            source_headers = prompt_source_headers(options)
+            if !source_headers.empty?
+              list_payload['config'] ||= {}
+              list_payload['config']['sourceHeaders'] = source_headers
+            end
           end
         end
-        list_payload = params
-        payload = {'optionTypeList' => list_payload}
+        # tweak payload for API
+        ['ignoreSSLErrors', 'realTime'].each { |k|
+          list_payload[k] = ['on','true'].include?(list_payload[k].to_s) if list_payload.key?(k)
+        }
+        payload.deep_merge!({'optionTypeList' => list_payload})
       end
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
@@ -262,41 +255,31 @@ class Morpheus::Cli::LibraryOptionListsCommand
     begin
       option_type_list = find_option_type_list_by_name_or_id(args[0])
       exit 1 if option_type_list.nil?
-      passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if !passed_options.empty?
-          payload['optionTypeList'] ||= {}
-          payload['optionTypeList'].deep_merge!(passed_options)
-        end
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
       else
-        list_type = option_type_list['type']
-        prompt_options = update_option_type_list_option_types(list_type)
-        params = passed_options
-        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(prompt_options, options[:options], @api_client, options[:params])
-        params.deep_merge!(v_prompt)
-        
-        if list_type == 'rest'
+        payload = {}
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
+        list_payload = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types(), options[:options], @api_client)
+        if list_payload['type'] == 'rest'
           # parse Source Headers
-          source_headers = prompt_source_headers(options.merge({no_prompt: true}))
-          if !source_headers.empty?
-            #params['config'] ||= option_type_list['config'] || {}
-            params['config'] ||= {}
-            params['config']['sourceHeaders'] = source_headers
+          if !(payload['optionTypeList']['config'] && payload['optionTypeList']['config']['sourceHeaders'])
+            source_headers = prompt_source_headers(options.merge({no_prompt: true}))
+            if !source_headers.empty?
+              #params['config'] ||= option_type_list['config'] || {}
+              params['config'] ||= {}
+              params['config']['sourceHeaders'] = source_headers
+            end
           end
         end
-        if params.empty?
-          print_red_alert "Specify at least one option to update"
-          puts optparse
-          exit 1
-        end
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        list_payload = params
-        payload = {'optionTypeList' => list_payload}
+        # tweak payload for API
+        ['ignoreSSLErrors', 'realTime'].each { |k|
+          list_payload[k] = ['on','true'].include?(list_payload[k].to_s) if list_payload.key?(k)
+        }
+        payload.deep_merge!({'optionTypeList' => list_payload})
+        raise_command_error "Specify at least one option to update.\n#{optparse}" if payload['optionTypeList'].empty?
       end
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
@@ -355,42 +338,13 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
   private
 
-  def find_option_type_list_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_option_type_list_by_id(val)
-    else
-      return find_option_type_list_by_name(val)
-    end
-  end
-
-  def find_option_type_list_by_id(id)
-    begin
-      json_response = @option_type_lists_interface.get(id.to_i)
-      return json_response['optionTypeList']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Option List not found by id #{id}"
-        exit 1
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_option_type_list_by_name(name)
-    json_results = @option_type_lists_interface.list({name: name.to_s})
-    if json_results['optionTypeLists'].empty?
-      print_red_alert "Option List not found by name #{name}"
-      exit 1
-    end
-    option_type_list = json_results['optionTypeLists'][0]
-    return option_type_list
-  end
+  # finders are in LibraryHelper
 
   def get_available_option_list_types
     [
       {'name' => 'REST', 'value' => 'rest'}, 
       {'name' => 'Morpheus Api', 'value' => 'api'}, 
+      {'name' => 'LDAP', 'value' => 'ldap'}, 
       {'name' => 'Manual', 'value' => 'manual'}
     ]
   end
@@ -399,49 +353,31 @@ class Morpheus::Cli::LibraryOptionListsCommand
      get_available_option_list_types.find {|it| code == it['value'] || code == it['name'] }
   end
 
-  def new_option_type_list_option_types(list_type='rest')
-    if list_type.to_s.downcase == 'rest'
-      [
+  def new_option_type_list_option_types()
+    [
+        # rest
         {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
         {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-        #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true, 'displayOrder' => 3},
-        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 3},
-        {'fieldName' => 'sourceUrl', 'fieldLabel' => 'Source Url', 'type' => 'text', 'required' => true, 'description' => "A REST URL can be used to fetch list data and is cached in the appliance database.", 'displayOrder' => 4},
-        {'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 5},
-        {'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 6},
-        {'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 7},
+        {'code' => 'optionTypeList.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true, 'description' => 'Option List Type. eg. rest, api, ldap, manual', 'displayOrder' => 3},
+        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 4},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceUrl', 'fieldLabel' => 'Source Url', 'type' => 'text', 'required' => true, 'description' => "A REST URL can be used to fetch list data and is cached in the appliance database.", 'displayOrder' => 5},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 6},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 8},
         # sourceHeaders component (is done afterwards manually)
-        {'fieldName' => 'initialDataset', 'fieldLabel' => 'Initial Dataset', 'type' => 'code-editor', 'description' => "Create an initial json dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'. However, if there is a translation script, that will also be passed through.", 'displayOrder' => 8},
-        {'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 9},
-        {'fieldName' => 'requestScript', 'fieldLabel' => 'Request Script', 'type' => 'code-editor', 'description' => "Create a js script to prepare the request. Return a data object as the body for a post, and return an array containing properties name and value for a get. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 10},
-
+        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api list to use, eg. clouds, servers, etc.', 'displayOrder' => 9},
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourceUsername', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 10},
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourcePassword', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 11},
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'ldapQuery', 'fieldLabel' => 'LDAP Query', 'type' => 'text', 'description' => "LDAP Queries are standard LDAP formatted queries where different objects can be searched. Dependent parameters can be loaded into the query using the <%=phrase%> syntax.", 'displayOrder' => 12},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api|manual', 'fieldName' => 'initialDataset', 'fieldLabel' => 'Initial Dataset', 'type' => 'code-editor', 'description' => "Create an initial json dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'. However, if there is a translation script, that will also be passed through.", 'displayOrder' => 13},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api|ldap', 'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 14},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api', 'fieldName' => 'requestScript', 'fieldLabel' => 'Request Script', 'type' => 'code-editor', 'description' => "Create a js script to prepare the request. Return a data object as the body for a post, and return an array containing properties name and value for a get. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 15},
       ]
-    elsif list_type.to_s.downcase == 'api'
-      [
-        {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-        {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-        #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Rest', 'value' => 'rest'}, {'name' => 'Manual', 'value' => 'manual'}], 'defaultValue' => 'rest', 'required' => true, 'displayOrder' => 3},
-        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 3},
-        {'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api list to use, eg. clouds, servers, etc.', 'displayOrder' => 6},
-        {'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 9},
-        {'fieldName' => 'requestScript', 'fieldLabel' => 'Request Script', 'type' => 'code-editor', 'description' => "Create a js script to prepare the request. Return a data object as the body for a post, and return an array containing properties name and value for a get. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 10},
-      ]
-    elsif list_type.to_s.downcase == 'manual'
-      [
-        {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-        {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-        #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Rest', 'value' => 'rest'}, {'name' => 'Manual', 'value' => 'manual'}], 'defaultValue' => 'rest', 'required' => true, 'displayOrder' => 3},
-        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 3},
-        {'fieldName' => 'initialDataset', 'fieldLabel' => 'Dataset', 'type' => 'code-editor', 'required' => true, 'description' => "Create an initial JSON or CSV dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'.", 'displayOrder' => 4},
-      ]
-    else
-      print_red_alert "Unknown Option List type '#{list_type}'"
-      exit 1
-    end
+
   end
 
-  def update_option_type_list_option_types(list_type='rest')
-    list = new_option_type_list_option_types(list_type)
+  def update_option_type_list_option_types()
+    list = new_option_type_list_option_types()
     list.each {|it| 
       it.delete('required')
       it.delete('defaultValue')

data/lib/morpheus/cli/library_option_types_command.rb

@@ -65,7 +65,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
             fieldLabel: option_type['fieldLabel'],
             fieldName: option_type['fieldName'],
             default: option_type['defaultValue'],
-            required: option_type['required'] ? 'yes' : 'no'
+            required: (option_type['required'].nil? ? '' : format_boolean(option_type['required'])),
+            export: (option_type['exportMeta'].nil? ? '' : format_boolean(option_type['exportMeta']))
           }
         end
         print cyan
@@ -76,7 +77,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
           {:fieldLabel => {:display_name => "Field Label"} },
           {:fieldName => {:display_name => "Field Name"} },
           :default,
-          :required
+          :required,
+          :export,
         ], options)
         print reset
         print_results_pagination(json_response)
@@ -139,6 +141,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         "Placeholder" => 'placeHolder',
         "Default Value" => 'defaultValue',
         "Required" => lambda {|it| format_boolean(it['required']) },
+        "Export As Tag" => lambda {|it| it['exportMeta'].nil? ? '' : format_boolean(it['exportMeta']) },
       }, option_type)
       print reset,"\n"
       return 0
@@ -162,18 +165,16 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['optionType'] ||= {}
-          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
       else
-        params = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client, options[:params])
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        option_type_payload = params
-        payload = {optionType: option_type_payload}
+        payload = {}
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
+        option_type_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client)
+        # tweak payload for API
+        option_type_payload['optionList'] = {'id' => option_type_payload['optionList'].to_i} if option_type_payload['optionList'].is_a?(String) || option_type_payload['optionList'].is_a?(Numeric)
+        option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
+        option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
+        payload.deep_merge!({'optionType' => option_type_payload})
       end
       @option_types_interface.setopts(options)
       if options[:dry_run]
@@ -207,27 +208,19 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     begin
       option_type = find_option_type_by_name_or_id(args[0])
       exit 1 if option_type.nil?
-
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['optionType'] ||= {}
-          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
       else
-        #params = options[:options] || {}
-        params = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client, options[:params])
-        if params.empty?
-          print_red_alert "Specify at least one option to update"
-          puts optparse
-          exit 1
-        end
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        option_type_payload = params
-        payload = {optionType: option_type_payload}
+        payload = {}
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
+        option_type_payload = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client)
+        # tweak payload for API
+        option_type_payload['optionList'] = {'id' => option_type_payload['optionList'].to_i} if option_type_payload['optionList'].is_a?(String) || option_type_payload['optionList'].is_a?(Numeric)
+        option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
+        option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
+        payload.deep_merge!({'optionType' => option_type_payload})
+        raise_command_error "Specify at least one option to update.\n#{optparse}" if payload['optionType'].empty?
       end
       @option_types_interface.setopts(options)
       if options[:dry_run]
@@ -296,12 +289,14 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldName' => 'fieldName', 'fieldLabel' => 'Field Name', 'type' => 'text', 'required' => true, 'description' => 'This is the input fieldName property that the value gets assigned to.', 'displayOrder' => 3},
-      {'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Text', 'value' => 'text'}, {'name' => 'Password', 'value' => 'password'}, {'name' => 'Number', 'value' => 'number'}, {'name' => 'Checkbox', 'value' => 'checkbox'}, {'name' => 'Select', 'value' => 'select'}, {'name' => 'Hidden', 'value' => 'hidden'}], 'defaultValue' => 'text', 'required' => true, 'displayOrder' => 4},
-      {'fieldName' => 'fieldLabel', 'fieldLabel' => 'Field Label', 'type' => 'text', 'required' => true, 'description' => 'This is the input label that shows typically to the left of a custom option.', 'displayOrder' => 5},
-      {'fieldName' => 'placeHolder', 'fieldLabel' => 'Placeholder', 'type' => 'text', 'displayOrder' => 6},
-      {'fieldName' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 7},
-      {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 8},
+      {'fieldName' => 'fieldName', 'fieldLabel' => 'Field Name', 'type' => 'text', 'required' => true, 'description' => 'This is the input property that the value gets assigned to.', 'displayOrder' => 3},
+      {'code' => 'optionType.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Text', 'value' => 'text'}, {'name' => 'Password', 'value' => 'password'}, {'name' => 'Number', 'value' => 'number'}, {'name' => 'Checkbox', 'value' => 'checkbox'}, {'name' => 'Select', 'value' => 'select'}, {'name' => 'Hidden', 'value' => 'hidden'}], 'defaultValue' => 'text', 'required' => true, 'displayOrder' => 4},
+      {'fieldName' => 'optionList', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'optionTypeLists', 'required' => true, 'dependsOnCode' => 'optionType.type:select', 'description' => "The Option List to be the source of options when type is 'select'.", 'displayOrder' => 5},
+      {'fieldName' => 'fieldLabel', 'fieldLabel' => 'Field Label', 'type' => 'text', 'required' => true, 'description' => 'This is the input label that shows typically to the left of a custom option.', 'displayOrder' => 6},
+      {'fieldName' => 'placeHolder', 'fieldLabel' => 'Placeholder', 'type' => 'text', 'displayOrder' => 7},
+      {'fieldName' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 8},
+      {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 9},
+      {'fieldName' => 'exportMeta', 'fieldLabel' => 'Export As Tag', 'type' => 'checkbox', 'defaultValue' => false, 'description' => 'Export as Tag.', 'displayOrder' => 10},
     ]
   end
 

data/lib/morpheus/cli/logs_command.rb

@@ -63,9 +63,9 @@ class Morpheus::Cli::LogsCommand
       #   options[:interval] = parse_time(val).utc.iso8601
       # end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
-      opts.on('--table', '--table', "Format ouput as a table.") do
+      opts.on('-t', '--table', "Format ouput as a table.") do
         options[:table] = true
       end
       opts.on('-a', '--all', "Display all details: entire message." ) do
@@ -81,6 +81,7 @@ class Morpheus::Cli::LogsCommand
     end
     connect(options)
     begin
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction

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

@@ -502,4 +502,36 @@ module Morpheus::Cli::LibraryHelper
     return {success:true, data: spec_template_ids}
   end
 
+  def find_option_type_list_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_option_type_list_by_id(val)
+    else
+      return find_option_type_list_by_name(val)
+    end
+  end
+
+  def find_option_type_list_by_id(id)
+    begin
+      json_response = @option_type_lists_interface.get(id.to_i)
+      return json_response['optionTypeList']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Option List not found by id #{id}"
+        exit 1
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_option_type_list_by_name(name)
+    json_results = @option_type_lists_interface.list({name: name.to_s})
+    if json_results['optionTypeLists'].empty?
+      print_red_alert "Option List not found by name #{name}"
+      exit 1
+    end
+    option_type_list = json_results['optionTypeLists'][0]
+    return option_type_list
+  end
+
 end

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

@@ -45,6 +45,8 @@ module Morpheus::Cli::LogsHelper
     end
     out = ""
     table_color = options.key?(:color) ? options[:color] : cyan
+    term_width = current_terminal_width()
+    message_col_width = current_terminal_width() - (show_object ? 56 : 36)
     log_records.each do |log_entry|
       log_level = format_log_level(log_entry['level'], table_color, 6)
       out << table_color if table_color
@@ -52,15 +54,20 @@ module Morpheus::Cli::LogsHelper
       out << "#{log_level} "
       out << "[#{log_entry['ts']}] "
       if show_object
-        out << "(#{log_entry['typeCode']} #{log_entry['objectId']}) "
+        log_src = "#{log_entry['typeCode']} #{log_entry['objectId']}"
+        if options[:details] || options[:all]
+          # log_src = "#{log_entry['typeCode']} #{log_entry['objectId']}"
+        else
+          log_src = truncate_string(log_src, 20)
+        end
+        out << "(#{log_src}) "
       end
       log_msg = ""
       if options[:details] || options[:all]
-          log_msg = log_entry['message'].to_s.strip
-        else
-          # truncate_string(log_entry['message'].to_s.split.select {|it| it.to_s.strip != "" }.first, 100) 
-          log_msg = truncate_string(log_entry['message'].to_s.gsub("\r\n", " ").gsub("\n", " "), 100) 
-        end
+        log_msg = log_entry['message'].to_s.strip
+      else
+        log_msg = truncate_string(log_entry['message'].to_s.strip.gsub(/\r?\n/, " "), message_col_width)
+      end
       out << "- #{log_msg}"
       out << table_color if table_color
       out << "\n"
@@ -71,15 +78,17 @@ module Morpheus::Cli::LogsHelper
   def format_log_table(logs, options={}, show_object=true)
     out = ""
     table_color = options.key?(:color) ? options[:color] : cyan
+    term_width = current_terminal_width()
+    message_col_width = current_terminal_width() - (show_object ? 56 : 36)
     log_columns = [
       {"LEVEL" => lambda {|log_entry| format_log_level(log_entry['level'], table_color) } },
       {"DATE" => lambda {|log_entry| log_entry['ts'] } },
       {"SOURCE" => lambda {|log_entry| "#{log_entry['typeCode']} #{log_entry['objectId']}" } },
       {"MESSAGE" => lambda {|log_entry| 
         if options[:details] || options[:all]
-          log_entry['message'].to_s
+          log_entry['message'].to_s.strip
         else
-          truncate_string(log_entry['message'].to_s.split.first, 100) 
+          truncate_string(log_entry['message'].to_s.strip.gsub(/\r?\n/, " "), message_col_width)
         end
       } }
     ]
@@ -89,7 +98,7 @@ module Morpheus::Cli::LogsHelper
     # if options[:include_fields]
     #   columns = options[:include_fields]
     # end
-    out << as_pretty_table(logs, log_columns, options.merge(responsive_table:false))
+    out << as_pretty_table(logs, log_columns, options.merge(wrap:true))
     # out << "\n"
     return out
   end