morpheus-cli 4.1.14 → 4.2

data/lib/morpheus/cli/price_sets_command.rb

@@ -235,7 +235,7 @@ class Morpheus::Cli::PriceSetsCommand
         params['code'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'code', 'type' => 'text', 'fieldLabel' => 'Price Set Code', 'required' => true, 'defaultValue' => params['name'].gsub(/[^0-9a-z ]/i, '').gsub(' ', '.').downcase, 'description' => 'Price Set Code.'}],options[:options],@api_client,{}, options[:no_prompt])['code']
 
         # region code
-        params['regionCode'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'code', 'type' => 'text', 'fieldLabel' => 'Price Set Region Code', 'required' => false, 'description' => 'Price Set Region Code.'}],options[:options],@api_client,{}, options[:no_prompt])['code']
+        params['regionCode'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'regionCode', 'type' => 'text', 'fieldLabel' => 'Price Set Region Code', 'required' => false, 'description' => 'Price Set Region Code.'}],options[:options],@api_client,{}, options[:no_prompt])['regionCode']
 
         # cloud
         if options[:cloud]
@@ -247,7 +247,7 @@ class Morpheus::Cli::PriceSetsCommand
           end
           params['zone'] = {'id' => cloud['id']}
         else
-          cloud_id = Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Cloud', 'required' => false, 'description' => 'Select cloud for price set', 'selectOptions' => @clouds_interface.list['zones'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt], true)['value']
+          cloud_id = Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'zone', 'type' => 'select', 'fieldLabel' => 'Cloud', 'required' => false, 'description' => 'Select cloud for price set', 'selectOptions' => @clouds_interface.list['zones'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt], true)['zone']
 
           if cloud_id
             params['zone'] = {'id' => cloud_id}
@@ -264,7 +264,7 @@ class Morpheus::Cli::PriceSetsCommand
           end
           params['zonePool'] = {'id' => resource_pool['id']}
         else
-          resource_pool_id = Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'required' => false, 'description' => 'Select resource pool for price set', 'selectOptions' => @cloud_resource_pools_interface.list(params['zone'] ? params['zone']['id'] : nil)['resourcePools'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt], true)['value']
+          resource_pool_id = Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'zonePool', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'required' => false, 'description' => 'Select resource pool for price set', 'selectOptions' => @cloud_resource_pools_interface.list(params['zone'] ? params['zone']['id'] : nil)['resourcePools'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt], true)['zonePool']
 
           if resource_pool_id
             params['zonePool'] = {'id' => resource_pool_id}
@@ -308,7 +308,7 @@ class Morpheus::Cli::PriceSetsCommand
           # additional prices
           avail_price_types = (price_set_type[:requires] + price_set_type[:allows]).collect {|it| {'name' => price_type_label(it), 'value' => it}}
           price_type = nil
-          while Morpheus::Cli::OptionTypes.confirm("Add additional prices?") do
+          while Morpheus::Cli::OptionTypes.confirm("Add additional prices?", {default:false}) do
             price_type = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceType', 'type' => 'select', 'fieldLabel' => "Price Type", 'selectOptions' => avail_price_types, 'required' => true, 'defaultValue' => price_type, 'description' => "Select Price Type"}],options[:options],@api_client,{}, options[:no_prompt], true)['priceType']
             avail_prices = @prices_interface.list({'priceType' => price_type, 'priceUnit' => params['priceUnit'], 'max' => 10000})['prices'].reject {|it| params['prices'].find {|price| price['id'] == it['id']}}.collect {|it| {'name' => it['name'], 'value' => it['id']}}
 

data/lib/morpheus/cli/prices_command.rb

@@ -272,10 +272,10 @@ class Morpheus::Cli::PricesCommand
 
       if !payload
         # name
-        params['name'] ||= args[0] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Price Set Name', 'required' => true, 'description' => 'Price Set Name.'}],options[:options],@api_client,{}, options[:no_prompt])['name']
+        params['name'] ||= args[0] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Price Name', 'required' => true, 'description' => 'Price Set Name.'}],options[:options],@api_client,{}, options[:no_prompt])['name']
 
         # code
-        params['code'] ||= args[1] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'code', 'type' => 'text', 'fieldLabel' => 'Price Set Code', 'required' => true, 'defaultValue' => params['name'].gsub(/[^0-9a-z ]/i, '').gsub(' ', '.').downcase, 'description' => 'Price Set Code.'}],options[:options],@api_client,{}, options[:no_prompt])['code']
+        params['code'] ||= args[1] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'code', 'type' => 'text', 'fieldLabel' => 'Price Code', 'required' => true, 'defaultValue' => params['name'].gsub(/[^0-9a-z ]/i, '').gsub(' ', '.').downcase, 'description' => 'Price Set Code.'}],options[:options],@api_client,{}, options[:no_prompt])['code']
 
         # tenant
         if options[:tenant].nil?
@@ -293,28 +293,28 @@ class Morpheus::Cli::PricesCommand
         end
 
         # type (platform, software, datastore, storage)
-        params['priceType'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Price Type', 'required' => true, 'description' => 'Select price type', 'selectOptions' => price_types.collect {|k,v| {'name' => v, 'value' => k}}}], options[:options], @api_client, {}, options[:no_prompt])['value']
+        params['priceType'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceType', 'type' => 'select', 'fieldLabel' => 'Price Type', 'required' => true, 'description' => 'Select price type', 'selectOptions' => price_types.collect {|k,v| {'name' => v, 'value' => k}}}], options[:options], @api_client, {}, options[:no_prompt])['priceType']
 
         # price type
         prompt_for_price_type(params, options)
 
         # unit
-        params['priceUnit'] ||= Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Price Unit', 'required' => true, 'description' => 'Select price unit', 'defaultValue' => 'month', 'selectOptions' => price_units.collect {|it| {'name' => it.split(' ').collect {|it| it.capitalize}.join(' '), 'value' => it}}], options[:options], @api_client, {}, options[:no_prompt])['value']
+        params['priceUnit'] ||= Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'priceUnit', 'type' => 'select', 'fieldLabel' => 'Price Unit', 'required' => true, 'description' => 'Select price unit', 'defaultValue' => 'month', 'selectOptions' => price_units.collect {|it| {'name' => it.split(' ').collect {|it| it.capitalize}.join(' '), 'value' => it}}], options[:options], @api_client, {}, options[:no_prompt])['priceUnit']
 
         # incur
-        params['incurCharges'] ||= Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Incur Charges', 'required' => true, 'description' => 'Select when to incur charges', 'defaultValue' => 'running', 'selectOptions' => [{'name' => 'When Running', 'value' => 'running'}, {'name' => 'When Stopped', 'value' => 'stopped'}, {'name' => 'Always', 'value' => 'always'}]], options[:options], @api_client, {}, options[:no_prompt])['value']
+        params['incurCharges'] ||= Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'incurCharges', 'type' => 'select', 'fieldLabel' => 'Incur Charges', 'required' => true, 'description' => 'Select when to incur charges', 'defaultValue' => 'running', 'selectOptions' => [{'name' => 'When Running', 'value' => 'running'}, {'name' => 'When Stopped', 'value' => 'stopped'}, {'name' => 'Always', 'value' => 'always'}]], options[:options], @api_client, {}, options[:no_prompt])['incurCharges']
 
         # currency
-        params['currency'] ||= Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Currency', 'required' => true, 'description' => 'Select when to incur charges', 'defaultValue' => 'USD', 'selectOptions' => avail_currencies.collect {|it| {'value' => it}}], options[:options], @api_client, {}, options[:no_prompt])['value']
+        params['currency'] ||= Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'currency', 'type' => 'select', 'fieldLabel' => 'Currency', 'required' => true, 'description' => 'Select when to incur charges', 'defaultValue' => 'USD', 'selectOptions' => avail_currencies.collect {|it| {'value' => it}}], options[:options], @api_client, {}, options[:no_prompt])['currency']
 
         # cost
         if params['cost'].nil?
-          params['cost'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => 'Cost', 'required' => true, 'description' => 'Price cost', 'defaultValue' => 0.0}],options[:options],@api_client,{}, options[:no_prompt])['value']
+          params['cost'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cost', 'type' => 'number', 'fieldLabel' => 'Cost', 'required' => true, 'description' => 'Price cost', 'defaultValue' => 0.0}],options[:options],@api_client,{}, options[:no_prompt])['cost']
         end
 
         # adjustment / markup type
         if params['markupType'].nil?
-          markup_type = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Price Adjustment', 'required' => false, 'description' => 'Price Adjustment', 'selectOptions' => [{'name' => 'None', 'value' => 'none'}, {'name' => 'Fixed Markup', 'value' => 'fixed'}, {'name' => 'Percent Markup', 'value' => 'percent'}, {'name' => 'Custom Price', 'value' => 'custom'}], 'defaultValue' => 'none'}],options[:options],@api_client,{}, options[:no_prompt])['value']
+          markup_type = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'markupType', 'type' => 'select', 'fieldLabel' => 'Price Adjustment', 'required' => false, 'description' => 'Price Adjustment', 'selectOptions' => [{'name' => 'None', 'value' => 'none'}, {'name' => 'Fixed Markup', 'value' => 'fixed'}, {'name' => 'Percent Markup', 'value' => 'percent'}, {'name' => 'Custom Price', 'value' => 'custom'}], 'defaultValue' => 'none'}],options[:options],@api_client,{}, options[:no_prompt])['markupType']
 
           if markup_type && markup_type != 'none'
             params['markupType'] = markup_type
@@ -607,9 +607,9 @@ class Morpheus::Cli::PricesCommand
   def prompt_for_price_type(params, options, price={})
     case params['priceType']
     when 'platform'
-      params['platform'] ||= price['platform'] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Platform', 'required' => true, 'description' => 'Select platform for platform price type', 'selectOptions' => [{'name' => 'Linux', 'value' => 'linux'}, {'name' => 'Windows', 'value' => 'windows'}]}], options[:options], @api_client, {}, options[:no_prompt])['value']
+      params['platform'] ||= price['platform'] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'platform', 'type' => 'select', 'fieldLabel' => 'Platform', 'required' => true, 'description' => 'Select platform for platform price type', 'selectOptions' => [{'name' => 'Linux', 'value' => 'linux'}, {'name' => 'Windows', 'value' => 'windows'}]}], options[:options], @api_client, {}, options[:no_prompt])['platform']
     when 'software'
-      params['software'] ||= price['software'] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => 'Software', 'required' => true, 'description' => 'Set software for software price type'}], options[:options], @api_client,{}, options[:no_prompt])['value']
+      params['software'] ||= price['software'] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'software', 'type' => 'text', 'fieldLabel' => 'Software', 'required' => true, 'description' => 'Set software for software price type'}], options[:options], @api_client,{}, options[:no_prompt])['software']
     when 'datastore'
       if options[:datastore]
         datastore = find_datastore(options[:datastore])
@@ -620,7 +620,7 @@ class Morpheus::Cli::PricesCommand
           exit 1
         end
       else
-        datastore_id = Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Datastore', 'required' => true, 'description' => 'Select datastore for datastore price type', 'selectOptions' => @prices_interface.list_datastores['datastores'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt])['value']
+        datastore_id = Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'datastore', 'type' => 'select', 'fieldLabel' => 'Datastore', 'required' => true, 'description' => 'Select datastore for datastore price type', 'selectOptions' => @prices_interface.list_datastores['datastores'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt])['datastore']
         params['datastore'] = {'id' => datastore_id}
       end
 
@@ -641,7 +641,7 @@ class Morpheus::Cli::PricesCommand
           exit 1
         end
       else
-        volume_type_id = (price['volumeType'] ? price['volumeType']['id'] : Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Volume Type', 'required' => true, 'description' => 'Select volume type for storage price type', 'selectOptions' => @prices_interface.list_volume_types['volumeTypes'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt], true)['value'])
+        volume_type_id = (price['volumeType'] ? price['volumeType']['id'] : Morpheus::Cli::OptionTypes.prompt(['fieldName' => 'volumeType', 'type' => 'select', 'fieldLabel' => 'Volume Type', 'required' => true, 'description' => 'Select volume type for storage price type', 'selectOptions' => @prices_interface.list_volume_types['volumeTypes'].collect {|it| {'name' => it['name'], 'value' => it['id']}}], options[:options], @api_client, {}, options[:no_prompt], true)['volumeType'])
         params['volumeType'] = {'id' => volume_type_id}
       end
     end
@@ -652,17 +652,17 @@ class Morpheus::Cli::PricesCommand
     when 'percent'
       params['markupPercent'] = price['markupPercent'] if params['markupPercent'].nil?
       if params['markupPercent'].nil?
-        params['markupPercent'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => 'Markup Percent', 'required' => true, 'description' => 'Markup Percent'}],options[:options],@api_client,{}, options[:no_prompt])['value']
+        params['markupPercent'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'markupPercent', 'type' => 'number', 'fieldLabel' => 'Markup Percent', 'required' => true, 'description' => 'Markup Percent'}],options[:options],@api_client,{}, options[:no_prompt])['markupPercent']
       end
     when 'fixed'
       params['markup'] = price['markup'] if params['markup'].nil?
       if params['markup'].nil?
-        params['markup'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => 'Markup Amount', 'required' => true, 'description' => 'Markup Amount'}],options[:options],@api_client,{}, options[:no_prompt])['value']
+        params['markup'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'markup', 'type' => 'number', 'fieldLabel' => 'Markup Amount', 'required' => true, 'description' => 'Markup Amount'}],options[:options],@api_client,{}, options[:no_prompt])['markup']
       end
     when 'custom'
       params['customPrice'] = price['customPrice'] if params['customPrice'].nil?
       if params['customPrice'].nil?
-        params['customPrice'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => 'Price', 'required' => true, 'description' => 'Price'}],options[:options],@api_client,{}, options[:no_prompt])['value']
+        params['customPrice'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'customPrice', 'type' => 'number', 'fieldLabel' => 'Price', 'required' => true, 'description' => 'Price'}],options[:options],@api_client,{}, options[:no_prompt])['customPrice']
       end
     end
   end

data/lib/morpheus/cli/remote.rb

@@ -1107,9 +1107,9 @@ EOT
           {'fieldName' => 'password', 'fieldLabel' => 'Create Password', 'type' => 'password', 'required' => true, 'description' => 'Create a new password for the user.'},
           {'fieldName' => 'confirmPassword', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'description' => 'Confirm the new password for the user.'},
         ]
-        v_prompt = Morpheus::Cli::OptionTypes.prompt(password_option_types, options[:options])
-        if v_prompt['password'] == v_prompt['confirmPassword']
-          payload.deep_merge!(v_prompt)
+        password_prompt = Morpheus::Cli::OptionTypes.prompt(password_option_types, options[:options])
+        if password_prompt['password'] == password_prompt['confirmPassword']
+          payload['password'] = password_prompt['password']
           need_password = false
         else
           print_error red, "Password confirmation does not match. Re-enter your new password.", reset, "\n"

data/lib/morpheus/cli/service_plans_command.rb

@@ -97,7 +97,6 @@ class Morpheus::Cli::ServicePlanCommand
 
         print as_pretty_table(rows, columns, options)
         print_results_pagination(json_response)
-        print reset,"\n"
       end
       print reset,"\n"
       return 0
@@ -251,6 +250,9 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on("--description [TEXT]", String, "Description") do |val|
         params['description'] = val.to_s
       end
+      opts.on('--active [on|off]', String, "Can be used to enable / disable the plan. Default is on") do |val|
+        params['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
       opts.on('--editable [on|off]', String, "Can be used to enable / disable the editability of the service plan. Default is on") do |val|
         params['editable'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
@@ -333,9 +335,11 @@ class Morpheus::Cli::ServicePlanCommand
     end
 
     begin
-      payload = parse_payload(options)
+      if options[:payload]
+        payload = parse_payload(options, 'servicePlan')
+      else
+        apply_options(params, options)
 
-      if !payload
         # name
         params['name'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Service Plan Name', 'required' => true, 'description' => 'Service Plan Name.'}],options[:options],@api_client,{}, options[:no_prompt])['name']
 
@@ -476,6 +480,9 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on("--description [TEXT]", String, "Description") do |val|
         params['description'] = val.to_s
       end
+      opts.on('--active [on|off]', String, "Can be used to enable / disable the plan. Default is on") do |val|
+        params['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
       opts.on('--editable [on|off]', String, "Can be used to enable / disable the editability of the service plan. Default is on") do |val|
         params['editable'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
@@ -557,7 +564,6 @@ class Morpheus::Cli::ServicePlanCommand
       return 1
     end
 
-    print options
     begin
       plan = find_service_plan(args[0])
 
@@ -566,9 +572,11 @@ class Morpheus::Cli::ServicePlanCommand
         exit 1
       end
 
-      payload = parse_payload(options)
+      if options[:payload]
+        payload = parse_payload(options, 'servicePlan')
+      else
+        apply_options(params, options)
 
-      if !payload
         # provision type
         options[:provisionType] = options[:provisionType] || (args.count > 1 ? args[1] : nil)
 
@@ -601,8 +609,9 @@ class Morpheus::Cli::ServicePlanCommand
       end
 
       if payload.empty? || !payload['servicePlan'] || payload['servicePlan'].empty?
-        print_green_success "Nothing to update"
-        exit 1
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
+        # print_green_success "Nothing to update"
+        # return 0
       end
 
       @service_plans_interface.setopts(options)

data/lib/morpheus/cli/tasks.rb

@@ -7,10 +7,9 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::Tasks
   include Morpheus::Cli::CliCommand
 
-  register_subcommands :list, :get, :add, :update, :remove, :execute, :types => :task_types
-  alias_subcommand :details, :get
-  alias_subcommand :'task-types', :task_types
-  set_default_subcommand :list
+  register_subcommands :list, :get, :add, :update, :remove, :execute
+  register_subcommands :'list-types' => :list_task_types
+  register_subcommands :'get-type' => :get_task_type
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -29,46 +28,42 @@ class Morpheus::Cli::Tasks
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on('--types x,y,z', Array, "Filter by task type code(s)") do |val|
+      opts.on('-t', '--type x,y,z', Array, "Filter by task type code(s)") do |val|
         params['taskTypeCodes'] = val
       end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
+    if args.count > 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
     connect(options)
     begin
       params.merge!(parse_list_options(options))
       @tasks_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @tasks_interface.dry.get(params)
+        print_dry_run @tasks_interface.dry.list(params)
         return
       end
-      json_response = @tasks_interface.get(params)
-      # print result and return output
-      if options[:json]
-        puts as_json(json_response, options, "tasks")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['tasks'], options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "tasks")
-        return 0
+      json_response = @tasks_interface.list(params)
+
+      render_result = render_with_format(json_response, options, 'tasks')
+      return 0 if render_result
+      
+      title = "Morpheus Tasks"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      tasks = json_response['tasks']
+      if tasks.empty?
+        print cyan,"No tasks found.",reset,"\n"
       else
-        title = "Morpheus Tasks"
-        subtitles = []
-        subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
-        tasks = json_response['tasks']
-        if tasks.empty?
-          print cyan,"No tasks found.",reset,"\n"
-        else
-          print cyan
-          print_tasks_table(tasks, options)
-          print_results_pagination(json_response)
-        end
-        print reset,"\n"
+        print cyan
+        print_tasks_table(tasks, options)
+        print_results_pagination(json_response)
       end
+      print reset,"\n"
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -79,12 +74,14 @@ class Morpheus::Cli::Tasks
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[workflow]")
+      opts.on('--no-content', "Do not display script content." ) do
+        options[:no_content] = true
+      end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
-      puts optparse
-      return 1
+      raise_command_error "wrong number of arguments, expected 1-N and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
     id_list = parse_id_list(args)
@@ -172,123 +169,72 @@ class Morpheus::Cli::Tasks
         
         # JD: uhh, the api should NOT be returning passwords!!
         if task_type
+          # task_type['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |optionType|
+          #   if optionType['fieldLabel'].to_s.downcase == 'script'
+          #     if task['taskOptions'][optionType['fieldName']]
+          #       print_h2 "Script"
+          #       print reset,"#{task['taskOptions'][optionType['fieldName']]}","\n",reset
+          #     end
+          #   else
+          #     print cyan,("#{optionType['fieldLabel']} : " + (optionType['type'] == 'password' ? "#{task['taskOptions'][optionType['fieldName']] ? '************' : ''}" : "#{task['taskOptions'][optionType['fieldName']] || optionType['defaultValue']}")),"\n"
+          #   end
+          # end
+          script_content = nil
+          task_option_types = []
+          task_option_config = {}
+          task_option_columns = []
           task_type['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |optionType|
             if optionType['fieldLabel'].to_s.downcase == 'script'
-              print_h2 "Script"
-              print reset,bright_black,"#{task['taskOptions'][optionType['fieldName']]}","\n",reset
+              script_content = task['taskOptions'][optionType['fieldName']]
+            elsif optionType['fieldName'] == 'httpHeaders' || optionType['fieldName'] == 'webHeaders'
+              http_headers = task['taskOptions']['httpHeaders'] || task['taskOptions']['webHeaders']
+              begin
+                if http_headers.is_a?(String)
+                  http_headers = JSON.parse(http_headers)
+                end
+                # API has mismatch on fieldName httpHeaders vs webHeaders, we want to format this in a particular way though anyhow..
+                task_option_columns << {(optionType['fieldLabel']) => lambda {|it| http_headers.collect {|h| "#{h['key']}: #{h['value']}"}.join(", ") } }
+              rescue => ex
+                Morpheus::Logging::DarkPrinter.puts("Failed to parse httpHeaders task option as JSON") if Morpheus::Logging.debug?
+              end
             else
-              print cyan,("#{optionType['fieldLabel']} : " + (optionType['type'] == 'password' ? "#{task['taskOptions'][optionType['fieldName']] ? '************' : ''}" : "#{task['taskOptions'][optionType['fieldName']] || optionType['defaultValue']}")),"\n"
+              task_option_types << optionType
+              task_option_columns << {(optionType['fieldLabel']) => lambda {|it| task['taskOptions'][optionType['fieldName']] || optionType['defaultValue'] } }
             end
           end
         else
           print yellow,"Task type not found.",reset,"\n"
         end
-        print reset,"\n"
-        return 0
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
-  def update(args)
-    options = {}
-    account_name = nil
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[task] [options]")
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
-    end
-    optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
-    task_name = args[0]
-    connect(options)
-    begin
-
-
-      task = find_task_by_name_or_id(task_name)
-      exit 1 if task.nil?
-      task_type = find_task_type_by_name(task['taskType']['name'])
-
-      #params = Morpheus::Cli::OptionTypes.prompt(add_user_option_types, options[:options], @api_client, options[:params]) # options[:params] is mysterious
-      params = options[:options] || {}
-
-      if params.empty?
-        puts optparse.banner
-        option_lines = update_task_option_types(task_type).collect {|it| "\t-O #{it['fieldContext'] ? (it['fieldContext'] + '.') : ''}#{it['fieldName']}=\"value\"" }.join("\n")
-        puts "\nAvailable Options:\n#{option_lines}\n\n"
-        exit 1
-      end
-
-      #puts "parsed params is : #{params.inspect}"
-      task_keys = ['name']
-      changes_payload = (params.select {|k,v| task_keys.include?(k) })
-      task_payload = task
-      if changes_payload
-        task_payload.merge!(changes_payload)
-      end
-      if params['taskOptions']
-        task_payload['taskOptions'].merge!(params['taskOptions'])
-      end
-
-      payload = {task: task_payload}
-      @tasks_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @tasks_interface.dry.update(task['id'], payload)
-        return 0
-      end
-      response = @tasks_interface.update(task['id'], payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        if !response['success']
-          return 1
+        if !task_option_columns.empty?
+          print_h2 "Task Options"
+          print_description_list(task_option_columns, task["taskOptions"])
         end
-      else
-        print_green_success "Task #{response['task']['name']} updated"
-        get([task['id']])
-      end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
-    end
-  end
-
-
-  def task_types(args)
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:json, :dry_run, :remote])
-    end
-    optparse.parse!(args)
-    connect(options)
-    begin
-      @tasks_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @tasks_interface.dry.task_types()
-        return
-      end
-      json_response = @tasks_interface.task_types()
-      if options[:json]
-        print JSON.pretty_generate(json_response),"\n"
-      else
-        task_types = json_response['taskTypes']
-        print_h1 "Morpheus Task Types"
-        if task_types.nil? || task_types.empty?
-          print yellow,"No task types currently exist on this appliance. This could be a seed issue.",reset,"\n"
-        else
-          print cyan
-          rows = task_types.collect do |task_type|
-            {name: task_type['name'], id: task_type['id'], code: task_type['code'], description: task_type['description']}
+        if script_content
+          print_h2 "Script"
+          print reset,script_content,"\n",reset
+        end
+        # some task types have a file (file-content) instead of taskOptions.script
+        file_content = task['file']
+        if file_content && options[:no_content] != true
+          print_h2 "Script Content"
+          if file_content['sourceType'] == 'local'
+            puts file_content['content']
+          elsif file_content['sourceType'] == 'url'
+            puts "URL: #{file_content['contentPath']}"
+          elsif file_content['sourceType'] == 'repository'
+            puts "Repository: #{file_content['repository']['name'] rescue 'n/a'}"
+            puts "Path: #{file_content['contentPath']}"
+            if file_content['contentRef']
+              puts "Ref: #{file_content['contentRef']}"
+            end
+          else
+            puts "Source: #{file_content['sourceType']}"
+            puts "Path: #{file_content['contentPath']}"
           end
-          puts as_pretty_table(rows, [:id, :name, :code], options)
         end
 
         print reset,"\n"
+        return 0
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -298,7 +244,8 @@ class Morpheus::Cli::Tasks
 
   def add(args)
     params = {}
-    options = {:options => {}}
+    file_params = {}
+    options = {}
     task_name = nil
     task_code = nil
     task_type_name = nil
@@ -313,6 +260,32 @@ class Morpheus::Cli::Tasks
       opts.on('--code CODE', String, "Task Code" ) do |val|
         task_code = val
       end
+      opts.on('--source VALUE', String, "Source Type. local, repository, url. Only applies to script task types.") do |val|
+        file_params['sourceType'] = val
+      end
+      opts.on('--content TEXT', String, "Contents of the task script. This implies source is local.") do |val|
+        file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
+        file_params['content'] = val
+      end
+      opts.on('--file FILE', "File containing the task script. This can be used instead of --content" ) do |filename|
+        file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
+        full_filename = File.expand_path(filename)
+        if File.exists?(full_filename)
+          file_params['content'] = File.read(full_filename)
+        else
+          print_red_alert "File not found: #{full_filename}"
+          exit 1
+        end
+      end
+      opts.on('--url VALUE', String, "URL, for use when source is url") do |val|
+        file_params['contentPath'] = val
+      end
+      opts.on('--content-path VALUE', String, "Content Path, for use when source is repository or url") do |val|
+        file_params['contentPath'] = val
+      end
+      opts.on('--content-ref VALUE', String, "Content Ref (Version Ref), for use when source is repository") do |val|
+        file_params['contentRef'] = val
+      end
       opts.on('--result-type VALUE', String, "Result Type" ) do |val|
         options[:options]['resultType'] = val
       end
@@ -358,21 +331,6 @@ class Morpheus::Cli::Tasks
       opts.on('--allow-custom-config [on|off]', String, "Allow Custom Config") do |val|
         options[:options]['allowCustomConfig'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
-      opts.on('--file FILE', "File containing the script. This can be used instead of --O taskOptions.script" ) do |filename|
-        full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
-          options[:options]['taskOptions'] ||= {}
-          options[:options]['taskOptions']['script'] = File.read(full_filename)
-          # params['script'] = File.read(full_filename)
-        else
-          print_red_alert "File not found: #{full_filename}"
-          exit 1
-        end
-        # use the filename as the name by default.
-        if !options[:options]['name']
-          options[:options]['name'] = File.basename(full_filename)
-        end
-      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
@@ -397,6 +355,7 @@ class Morpheus::Cli::Tasks
       if options[:payload]
         payload = options[:payload]
         payload.deep_merge!({'task' => passed_options})  unless passed_options.empty?
+        payload.deep_merge!({'task' => {'file' => file_params}}) unless file_params.empty?
       else
         # construct payload
         payload = {
@@ -428,7 +387,7 @@ class Morpheus::Cli::Tasks
         end
 
         # Task Type
-        @all_task_types ||= @tasks_interface.task_types({max:1000})['taskTypes']
+        @all_task_types ||= @tasks_interface.list_types({max:1000})['taskTypes']
         task_types_dropdown = @all_task_types.collect {|it| {"name" => it["name"], "value" => it["code"]}}
         
         if task_type_name
@@ -458,14 +417,32 @@ class Morpheus::Cli::Tasks
 
         # Task Type Option Types
 
-        # JD: uhh some of these are missing a fieldContext?
-        # containerScript just points to a library script  via Id now??
+        # correct fieldContext
+        has_file_content = false
         task_option_types = task_type['optionTypes'] || []
         task_option_types.each do |it|
-          if it['fieldContext'].nil? || it['fieldContext'] == ''
-            it['fieldContext'] = 'taskOptions'
+          if it['type'] == 'file-content'
+            has_file_content = true
+            it['fieldContext'] = nil
+            it['fieldName'] = 'file'
+          else
+            if it['fieldContext'].nil? || it['fieldContext'] == ''
+              it['fieldContext'] = 'taskOptions'
+            end
           end
         end
+        # inject file_params into options for file-content prompt
+        # or into taskOptions.script for types not yet using file-content
+        unless file_params.empty?
+          if has_file_content
+            options[:options]['file'] ||= {}
+            options[:options]['file'].merge!(file_params)
+          else
+            options[:options]['taskOptions'] ||= {}
+            options[:options]['taskOptions']['script'] = file_params['content'] if file_params['content']
+          end
+        end
+        # prompt
         input_options = Morpheus::Cli::OptionTypes.prompt(task_option_types, options[:options],@api_client, options[:params])
         payload.deep_merge!({'task' => input_options})  unless input_options.empty?
         
@@ -496,17 +473,19 @@ class Morpheus::Cli::Tasks
         end
 
         if payload['task']['executeTarget'] == 'local'
-          # Git Repo
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'localScriptGitId', 'fieldLabel' => 'Git Repo', 'type' => 'text', 'description' => 'Git Repo ID'}], options[:options], @api_client)
-          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['localScriptGitId'].to_s.empty?
-            payload['task']['taskOptions'] ||= {}
-            payload['task']['taskOptions']['localScriptGitId'] = v_prompt['taskOptions']['localScriptGitId']
-          end
-          # Git Ref
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'localScriptGitRef', 'fieldLabel' => 'Git Ref', 'type' => 'text', 'description' => 'Git Ref eg. master'}], options[:options], @api_client)
-          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['localScriptGitRef'].to_s.empty?
-            payload['task']['taskOptions'] ||= {}
-            payload['task']['taskOptions']['localScriptGitRef'] = v_prompt['taskOptions']['localScriptGitRef']
+          if task_type['allowLocalRepo']
+            # Git Repo
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'localScriptGitId', 'fieldLabel' => 'Git Repo', 'type' => 'text', 'description' => 'Git Repo ID'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['localScriptGitId'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['localScriptGitId'] = v_prompt['taskOptions']['localScriptGitId']
+            end
+            # Git Ref
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'localScriptGitRef', 'fieldLabel' => 'Git Ref', 'type' => 'text', 'description' => 'Git Ref eg. master'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['localScriptGitRef'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['localScriptGitRef'] = v_prompt['taskOptions']['localScriptGitRef']
+            end
           end
 
         elsif payload['task']['executeTarget'] == 'remote'
@@ -593,6 +572,166 @@ class Morpheus::Cli::Tasks
     end
   end
 
+  def update(args)
+    params = {}
+    file_params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[task] [options]")
+      opts.on('--name NAME', String, "Task Name" ) do |val|
+        options[:options]['name'] = val
+      end
+      opts.on('--code CODE', String, "Task Code" ) do |val|
+        options[:options]['code'] = val
+      end
+      opts.on('--source VALUE', String, "Source Type. local, repository, url. Only applies to script task types.") do |val|
+        file_params['sourceType'] = val
+      end
+      opts.on('--content TEXT', String, "Contents of the task script. This implies source is local.") do |val|
+        file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
+        file_params['content'] = val
+      end
+      opts.on('--file FILE', "File containing the task script. This can be used instead of --content" ) do |filename|
+        file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
+        full_filename = File.expand_path(filename)
+        if File.exists?(full_filename)
+          file_params['content'] = File.read(full_filename)
+        else
+          print_red_alert "File not found: #{full_filename}"
+          exit 1
+        end
+      end
+      opts.on('--url VALUE', String, "URL, for use when source is url") do |val|
+        file_params['contentPath'] = val
+      end
+      opts.on('--content-path VALUE', String, "Content Path, for use when source is repository or url") do |val|
+        file_params['contentPath'] = val
+      end
+      opts.on('--content-ref VALUE', String, "Content Ref (Version Ref), for use when source is repository") do |val|
+        file_params['contentRef'] = val
+      end
+      opts.on('--result-type VALUE', String, "Result Type" ) do |val|
+        options[:options]['resultType'] = val
+      end
+      opts.on('--result-type VALUE', String, "Result Type" ) do |val|
+        options[:options]['executeTarget'] = val
+      end
+      opts.on('--execute-target VALUE', String, "Execute Target" ) do |val|
+        options[:options]['executeTarget'] = val
+      end
+      opts.on('--target-host VALUE', String, "Target Host" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['host'] = val
+      end
+      opts.on('--target-port VALUE', String, "Target Port" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['port'] = val
+      end
+      opts.on('--target-username VALUE', String, "Target Username" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['username'] = val
+      end
+      opts.on('--target-password VALUE', String, "Target Password" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['password'] = val
+      end
+      opts.on('--git-repo VALUE', String, "Git Repo ID" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['localScriptGitId'] = val
+      end
+      opts.on('--git-ref VALUE', String, "Git Ref" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['localScriptGitRef'] = val
+      end
+      opts.on('--retryable [on|off]', String, "Retryable" ) do |val|
+        options[:options]['retryable'] = val.to_s == 'on' || val.to_s == 'true' || val == '' || val.nil?
+      end
+      opts.on('--retry-count COUNT', String, "Retry Count" ) do |val|
+        options[:options]['retryCount'] = val.to_i
+      end
+      opts.on('--retry-delay SECONDS', String, "Retry Delay Seconds" ) do |val|
+        options[:options]['retryDelaySeconds'] = val.to_i
+      end
+      opts.on('--allow-custom-config [on|off]', String, "Allow Custom Config") do |val|
+        options[:options]['allowCustomConfig'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    task_name = args[0]
+    connect(options)
+    begin
+      task = find_task_by_name_or_id(task_name)
+      return 1 if task.nil?
+      task_type = find_task_type_by_name(task['taskType']['name'])
+      return 1 if task_type.nil?
+      
+      # file content param varies, heh
+      has_file_content = false
+      task_option_types = task_type['optionTypes'] || []
+      task_option_types.each do |it|
+        if it['type'] == 'file-content'
+          has_file_content = true
+        end
+      end
+      # inject file_params into options for file-content prompt
+      # or into taskOptions.script for types not yet using file-content
+      unless file_params.empty?
+        if has_file_content
+          options[:options]['file'] ||= {}
+          options[:options]['file'].merge!(file_params)
+        else
+          options[:options]['taskOptions'] ||= {}
+          options[:options]['taskOptions']['script'] = file_params['content'] if file_params['content']
+        end
+      end
+
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'task' => passed_options})  unless passed_options.empty?
+        # payload.deep_merge!({'task' => {'file' => file_params}}) unless file_params.empty?
+      else
+        # construct payload
+        payload = {}
+        payload.deep_merge!({'task' => passed_options})  unless passed_options.empty?
+        # payload.deep_merge!({'task' => {'file' => file_params}}) unless file_params.empty?
+
+        if payload['task'].empty?
+          print_red_alert "Specify at least one option to update"
+          puts optparse
+          return 1
+        end
+
+      end
+
+      @tasks_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @tasks_interface.dry.update(task['id'], payload)
+        return 0
+      end
+      response = @tasks_interface.update(task['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        if !response['success']
+          return 1
+        end
+      else
+        print_green_success "Task #{response['task']['name']} updated"
+        get([task['id']])
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
   def remove(args)
     params = {}
     task_name = args[0]
@@ -761,6 +900,135 @@ class Morpheus::Cli::Tasks
     end
   end
 
+  def list_task_types(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List task types."
+    end
+    optparse.parse!(args)
+    if args.count > 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      params.merge!(parse_list_options(options))
+      @tasks_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @tasks_interface.dry.list_types(params)
+        return
+      end
+      json_response = @tasks_interface.list_types(params)
+
+
+      render_result = render_with_format(json_response, options, 'taskTypes')
+      return 0 if render_result
+      
+      title = "Morpheus Task Types"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      task_types = json_response['taskTypes']
+      if task_types.empty?
+        print cyan,"No task types found.",reset,"\n"
+      else
+        print cyan
+        rows = task_types.collect do |task_type|
+          {name: task_type['name'], id: task_type['id'], code: task_type['code'], description: task_type['description']}
+        end
+        print as_pretty_table(rows, [:id, :name, :code], options)
+        #print_results_pagination(json_response)
+        print_results_pagination({size:task_types.size,total:task_types.size})
+      end
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def get_task_type(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[type]")
+      build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a task type.\n" +
+                    "[type] is required. This is the id or code or name of a task type."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      @tasks_interface.setopts(options)
+      if options[:dry_run]
+        if args[0].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @tasks_interface.dry.get_type(args[0].to_i)
+        else
+          print_dry_run @tasks_interface.dry.list_types({name:args[0]})
+        end
+        return
+      end
+      # find_task_type_by_name actually finds by name or code id
+      task_type = find_task_type_by_name(args[0])
+      return 1 if task_type.nil?
+      json_response = {'taskType' => task_type}  # skip redundant request
+      # json_response = @tasks_interface.get(task_type['id'])
+      
+      render_result = render_with_format(json_response, options, 'taskType')
+      return 0 if render_result
+
+      task_type = json_response['taskType']
+
+      title = "Morpheus Task Type"
+      
+      print_h1 "Morpheus Task Type", [], options
+      
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Code" => 'name',
+        #"Description" => 'description',
+        "Scriptable" => lambda {|it| format_boolean(it['scriptable']) },
+        # lots more here
+        # "enabled" => lambda {|it| format_boolean(it['enabled']) },
+        # "hasResults" => lambda {|it| format_boolean(it['hasResults']) },
+        # "allowRemoteKeyAuth" => lambda {|it| format_boolean(it['allowRemoteKeyAuth']) },
+        # "allowExecuteLocal" => lambda {|it| format_boolean(it['allowExecuteLocal']) },
+        # "allowExecuteRemote" => lambda {|it| format_boolean(it['allowExecuteRemote']) },
+        # "allowExecuteResource" => lambda {|it| format_boolean(it['allowExecuteResource']) },
+        # "allowLocalRepo" => lambda {|it| format_boolean(it['allowLocalRepo']) },
+        # "allowRemoteKeyAuth" => lambda {|it| format_boolean(it['allowRemoteKeyAuth']) },
+      }
+      print_description_list(description_cols, task_type)
+
+      option_types = task_type['optionTypes'] || []
+      option_types = option_types.sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      if !option_types.empty?
+        print_h2 "Config Option Types", [], options
+        option_type_cols = {
+          "Name" => lambda {|it| it['fieldContext'].to_s != '' ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName'] },
+          "Label" => lambda {|it| it['fieldLabel'] },
+          "Type" => lambda {|it| it['type'] },
+        }
+        print cyan
+        print as_pretty_table(option_types, option_type_cols)
+      end
+      
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
   private
 
   def find_task_by_name_or_id(val)
@@ -802,7 +1070,7 @@ class Morpheus::Cli::Tasks
 
   def find_task_type_by_name(val)
     raise "find_task_type_by_name passed a bad name: #{val.inspect}" if val.to_s == ''
-    @all_task_types ||= @tasks_interface.task_types({max:1000})['taskTypes']
+    @all_task_types ||= @tasks_interface.list_types({max:1000})['taskTypes']
 
     if @all_task_types.nil? && !@all_task_types.empty?
       print_red_alert "No task types found"