morpheus-cli 4.1.14 → 4.2

data/lib/morpheus/cli/hosts.rb

@@ -1321,7 +1321,7 @@ class Morpheus::Cli::Hosts
       payload = {}
       # i guess you must pass an option if there are editable options
       # any option, heh
-      task_types = @tasks_interface.task_types()
+      task_types = @tasks_interface.list_types()
       editable_options = []
       workflow['taskSetTasks'].sort{|a,b| a['taskOrder'] <=> b['taskOrder']}.each do |task_set_task|
         task_type_id = task_set_task['task']['taskType']['id']

data/lib/morpheus/cli/instances.rb

@@ -54,6 +54,7 @@ class Morpheus::Cli::Instances
 
   def list(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
@@ -71,6 +72,10 @@ class Morpheus::Cli::Instances
       opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
         options[:details] = true
       end
+      opts.on('--status STATUS', "Filter by status i.e. provisioning,running,starting,stopping") do |val|
+        params['status'] ||= []
+        params['status'] << val
+      end
       opts.on('--pending-removal', "Include instances pending removal.") do
         options[:pendingRemoval] = true
       end
@@ -83,7 +88,6 @@ class Morpheus::Cli::Instances
       raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
     end
     begin
-      params = {}
       params.merge!(parse_list_options(options))
       group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
       if group
@@ -333,6 +337,12 @@ class Morpheus::Cli::Instances
       opts.on("--workflow ID", String, "Automation: Workflow ID") do |val|
         options[:workflow_id] = val
       end
+      opts.on("--ports ARRAY", String, "Exposed Ports, JSON formatted list of objects containing name and port") do |val|
+        # expects format like --ports '[{"name":"web","port":8080}]'
+        ports_array = JSON.parse(val)
+        options[:ports] = ports_array
+        options[:options]['ports'] = ports_array
+      end
       # opts.on('-L', "--lb", "Enable Load Balancer") do
       #   options[:enable_load_balancer] = true
       # end
@@ -342,10 +352,10 @@ class Morpheus::Cli::Instances
       opts.on("--user-group USERGROUP", String, "User Config: User Group") do |val|
         options[:user_group_id] = val
       end
-      opts.on("--shutdown-days NUMBER", Integer, "Automation: Shutdown Days") do |val|
-        options[:expire_days] = val.to_i
+      opts.on("--shutdown-days DAYS", Integer, "Automation: Shutdown Days") do |val|
+        options[:shutdown_days] = val.to_i
       end
-      opts.on("--expire-days NUMBER", Integer, "Automation: Expiration Days") do |val|
+      opts.on("--expire-days DAYS", Integer, "Automation: Expiration Days") do |val|
         options[:expire_days] = val.to_i
       end
       opts.on("--create-backup [on|off]", String, "Automation: Create Backups.") do |val|
@@ -493,6 +503,12 @@ class Morpheus::Cli::Instances
       opts.on('--created-by ID', String, "Created By User ID") do |val|
         options[:created_by_id] = val
       end
+      # opts.on("--shutdown-days [DAYS]", Integer, "Automation: Shutdown Days") do |val|
+      #   params['shutdownDays'] = val.to_s.empty? ? nil : val.to_i
+      # end
+      # opts.on("--expire-days DAYS", Integer, "Automation: Expiration Days") do |val|
+      #   params['expireDays'] = val.to_s.empty? ? nil : val.to_i
+      # end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -2844,7 +2860,7 @@ class Morpheus::Cli::Instances
     connect(options)
     instance = find_instance_by_name_or_id(args[0])
     workflow = find_workflow_by_name_or_id(args[1])
-    task_types = @tasks_interface.task_types()
+    task_types = @tasks_interface.list_types()
     editable_options = []
     workflow['taskSetTasks'].sort{|a,b| a['taskOrder'] <=> b['taskOrder']}.each do |task_set_task|
       task_type_id = task_set_task['task']['taskType']['id']

data/lib/morpheus/cli/jobs_command.rb

@@ -172,13 +172,22 @@ class Morpheus::Cli::JobsCommand
       print_h1 title, subtitles
 
       job = json_response['job']
-      scheduleName = ''
+      schedule_name = ''
       if !job['scheduleMode'].nil?
         if job['scheduleMode'] == 'manual'
-          scheduleName = 'Manual'
-        else !job['scheduleMode']
-          schedule = @execute_schedules_interface.get(job['scheduleMode'])['schedule']
-          scheduleName = schedule ? schedule['name'] : ''
+          schedule_name = 'Manual'
+        elsif job['scheduleMode'].to_s.downcase == 'datetime'
+          schedule_name = ("Date and Time - " + (format_local_dt(job['dateTime']).to_s rescue 'n/a'))
+        elsif job['scheduleMode'].to_s == ''
+          schedule_name = 'n/a' # should not happen
+        else
+          begin
+            schedule = @execute_schedules_interface.get(job['scheduleMode'])['schedule']
+            schedule_name = schedule ? schedule['name'] : ''
+          rescue => ex
+            Morpheus::Logging::DarkPrinter.puts "Failed to load schedule name" if Morpheus::Logging.debug?
+            schedule_name = 'n/a'
+          end
         end
       end
 
@@ -189,7 +198,7 @@ class Morpheus::Cli::JobsCommand
           "Job Type" => lambda {|it| it['type']['name']},
           "Enabled" => lambda {|it| format_boolean(it['enabled'])},
           (job['workflow'] ? 'Workflow' : 'Task') => lambda {|it| it['jobSummary']},
-          "Schedule" => lambda {|it| scheduleName}
+          "Schedule" => lambda {|it| schedule_name}
       }
 
       if job['targetType']
@@ -263,6 +272,10 @@ class Morpheus::Cli::JobsCommand
       opts.on('-R', '--run [on|off]', String, "Can be used to run the job now.") do |val|
         params['run'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
+      opts.on('--date-time DATETIME', String, "Can be used to run schedule at a specific date and time. Use UTC time in the format 2020-02-15T05:00:00Z. This sets scheduleMode to 'dateTime'.") do |val|
+        options[:schedule] = 'dateTime'
+        params['dateTime'] = val.to_s
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create job."
     end
@@ -274,9 +287,11 @@ class Morpheus::Cli::JobsCommand
     end
 
     begin
-      payload = parse_payload(options)
+      if options[:payload]
+        payload = parse_payload(options, 'job')
+      else
+        apply_options(params, options)
 
-      if !payload
         # name
         params['name'] = params['name'] || args[0] || name = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Job Name', 'required' => true, 'description' => 'Job Name.'}],options[:options],@api_client,{})['name']
 
@@ -290,11 +305,9 @@ class Morpheus::Cli::JobsCommand
 
           # prompt task / workflow
           if job_type['code'] == 'morpheus.task'
-            task_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'task', 'fieldLabel' => 'Task', 'type' => 'select', 'required' => true, 'optionSource' => 'tasks'}], {'optionTypeId' => job_options['optionTypes'][0]['id']}, @api_client, {})['task']
-            params['task'] = {'id' => task_id}
+            params['task'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'task.id', 'fieldLabel' => 'Task', 'type' => 'select', 'required' => true, 'optionSource' => 'tasks'}], options[:options], @api_client, {})['task']
           else
-            workflow_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'workflow', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => true, 'optionSource' => 'operationTaskSets'}], {'optionTypeId' => job_options['optionTypes'][0]['id']}, @api_client, {})['workflow']
-            params['workflow'] = {'id' => workflow_id}
+            params['workflow'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'workflow.id', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => true, 'optionSource' => 'operationTaskSets'}], options[:options], @api_client, {})['workflow']
           end
         end
 
@@ -328,7 +341,7 @@ class Morpheus::Cli::JobsCommand
 
         # context type
         if params['targetType'].nil?
-          params['targetType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'contextType', 'fieldLabel' => 'Context Type', 'type' => 'select', 'required' => true, 'selectOptions' => job_options['targetTypes'], 'defaultValue' => job_options['targetTypes'].first['name']}], {'optionTypeId' => option_type_id}, @api_client, {})['contextType']
+          params['targetType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'targetType', 'fieldLabel' => 'Context Type', 'type' => 'select', 'required' => true, 'selectOptions' => job_options['targetTypes'], 'defaultValue' => job_options['targetTypes'].first['name']}], options[:options], @api_client, {})['targetType']
         end
 
         # contexts
@@ -356,19 +369,28 @@ class Morpheus::Cli::JobsCommand
 
         # schedule
         if options[:schedule].nil?
-          params['scheduleMode'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'schedule', 'fieldLabel' => "Schedule", 'type' => 'select', 'required' => true, 'selectOptions' => job_options['schedules'], 'defaultValue' => job_options['schedules'].first['name']}], options[:options], @api_client, {})['schedule']
-        else
-          if options[:schedule] != 'manual'
-            schedule = job_options['schedules'].find {|it| it['name'] == options[:schedule] || it['value'] == options[:schedule].to_i}
+          options[:schedule] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'scheduleMode', 'fieldLabel' => "Schedule", 'type' => 'select', 'required' => true, 'selectOptions' => job_options['schedules'], 'defaultValue' => job_options['schedules'].first['name']}], options[:options], @api_client, {})['scheduleMode']
+          params['scheduleMode'] = options[:schedule]
+        end
 
-            if schedule.nil?
-              print_red_alert "Schedule #{options[:schedule]} not found"
-              exit 1
-            end
-            options[:schedule] = schedule['value']
+        if options[:schedule] == 'manual'
+          # cool
+        elsif options[:schedule].to_s.downcase == 'datetime'
+          # prompt for dateTime
+          if params['dateTime'].nil?
+            params['dateTime'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dateTime', 'fieldLabel' => "Date and Time", 'type' => 'text', 'required' => true}], options[:options], @api_client, {}, options[:no_prompt], true)['dateTime']
           end
-          params['scheduleMode'] = options[:schedule]
+        elsif options[:schedule].to_s != ''
+           # ok they passed a schedule name or id
+          schedule = job_options['schedules'].find {|it| it['name'] == options[:schedule] || it['value'] == options[:schedule].to_i}
+
+          if schedule.nil?
+            print_red_alert "Schedule #{options[:schedule]} not found"
+            exit 1
+          end
+          options[:schedule] = schedule['value']
         end
+        params['scheduleMode'] = options[:schedule]
 
         # custom config
         if params['customConfig'].nil? && job_options['allowCustomConfig']
@@ -446,7 +468,11 @@ class Morpheus::Cli::JobsCommand
       opts.on('-R', '--run [on|off]', String, "Can be used to run the job now.") do |val|
         params['run'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      build_common_options(opts, options, [:payload, :list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on('--date-time DATETIME', String, "Can be used to run schedule at a specific date and time. Use UTC time in the format 2020-02-15T05:00:00Z. This sets scheduleMode to 'dateTime'.") do |val|
+        options[:schedule] = 'dateTime'
+        params['dateTime'] = val.to_s
+      end
+      build_common_options(opts, options, [:options, :payload, :list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Update job.\n" +
           "[job] is required. Job ID or name"
     end
@@ -465,9 +491,11 @@ class Morpheus::Cli::JobsCommand
         exit 1
       end
 
-      payload = parse_payload(options)
+      if options[:payload]
+        payload = parse_payload(options, 'job')
+      else
+        apply_options(params, options)
 
-      if !payload
         job_type_id = job['type']['id']
 
         if !options[:task].nil?
@@ -507,7 +535,7 @@ class Morpheus::Cli::JobsCommand
         end
 
         if !options[:schedule].nil?
-          if options[:schedule] != 'manual'
+          if options[:schedule] != 'manual' && options[:schedule].to_s.downcase != 'datetime'
             job_options = @jobs_interface.options(job_type_id)
             schedule = job_options['schedules'].find {|it| it['name'] == options[:schedule] || it['value'] == options[:schedule].to_i}
 
@@ -519,6 +547,34 @@ class Morpheus::Cli::JobsCommand
           end
           params['scheduleMode'] = options[:schedule]
         end
+
+
+        # schedule
+        if !options[:schedule].nil?
+          
+
+          if options[:schedule] == 'manual'
+            # cool
+          elsif options[:schedule].to_s.downcase == 'datetime'
+            # prompt for dateTime
+            if params['dateTime'].nil?
+              raise_command_error "--date-time is required for schedule '#{options[:schedule]}'\n#{optparse}"
+            end
+          elsif options[:schedule].to_s != ''
+            job_options = @jobs_interface.options(job_type_id)
+            options[:schedule] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'schedule', 'fieldLabel' => "Schedule", 'type' => 'select', 'required' => true, 'selectOptions' => job_options['schedules'], 'defaultValue' => job_options['schedules'].first['name']}], options[:options], @api_client, {})['schedule']
+            params['scheduleMode'] = options[:schedule]
+             # ok they passed a schedule name or id
+            schedule = job_options['schedules'].find {|it| it['name'] == options[:schedule] || it['value'] == options[:schedule].to_i}
+
+            if schedule.nil?
+              print_red_alert "Schedule #{options[:schedule]} not found"
+              exit 1
+            end
+            options[:schedule] = schedule['value']
+          end
+        end
+
         payload = {'job' => params}
       end
 

data/lib/morpheus/cli/library_cluster_layouts_command.rb

@@ -295,17 +295,17 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
 
         # prompt for options
         if params['name'].nil?
-          params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true}], options[:options], @api_client,{})['value']
+          params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true}], options[:options], @api_client,{})['name']
         end
 
         # version
         if params['computeVersion'].nil?
-          params['computeVersion'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => 'Version', 'required' => true}], options[:options], @api_client,{})['value']
+          params['computeVersion'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'computeVersion', 'type' => 'text', 'fieldLabel' => 'Version', 'required' => true}], options[:options], @api_client,{})['computeVersion']
         end
 
         # description
         if params['description'].nil?
-          params['description'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => 'Description', 'required' => false}], options[:options], @api_client,{})['value']
+          params['description'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'required' => false}], options[:options], @api_client,{})['description']
         end
 
         # creatable
@@ -322,7 +322,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
           end
         else
           cluster_type_options = cluster_types.collect {|type| {'name' => type['name'], 'value' => type['code']}}
-          cluster_type_code = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Cluster Type', 'required' => true, 'selectOptions' => cluster_type_options}], options[:options], @api_client,{}, nil, true)['value']
+          cluster_type_code = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'groupType', 'type' => 'select', 'fieldLabel' => 'Cluster Type', 'required' => true, 'selectOptions' => cluster_type_options}], options[:options], @api_client,{}, nil, true)['groupType']
           cluster_type = cluster_types.find {|type| type['code'] == cluster_type_code}
         end
 
@@ -337,7 +337,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
           end
         else
           provision_type_options = provision_types.collect {|type| {'name' => type['name'], 'value' => type['code']}}
-          provision_type_code = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Technology', 'required' => true, 'selectOptions' => provision_type_options}], options[:options], @api_client,{}, nil, true)['value']
+          provision_type_code = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'provisionType', 'type' => 'select', 'fieldLabel' => 'Technology', 'required' => true, 'selectOptions' => provision_type_options}], options[:options], @api_client,{}, nil, true)['provisionType']
           provision_type = provision_types.find {|type| type['code'] == provision_type_code}
         end
 
@@ -345,7 +345,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
 
         # min memory
         if params['memoryRequirement'].nil?
-          memory = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => 'Minimum Memory (MB) [can use GB modifier]', 'required' => false, 'description' => 'Memory (MB)'}],options[:options],@api_client,{}, options[:no_prompt])['value']
+          memory = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'memoryRequirement', 'type' => 'text', 'fieldLabel' => 'Minimum Memory (MB) [can use GB modifier]', 'required' => false, 'description' => 'Memory (MB)'}], options[:options], @api_client,{}, options[:no_prompt])['memoryRequirement']
 
           if memory
             bytes = parse_bytes_param(memory, 'minimum memory', 'MB')
@@ -363,7 +363,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
           end
           params['taskSets'] = [{'id' => task_set['id']}]
         else
-          task_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], {}, @api_client, {})['value']
+          task_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSets', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, {})['taskSets']
 
           if task_set_id
             params['taskSets'] = [{'id' => task_set_id.to_i}]
@@ -399,7 +399,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
           avail_type_options = @options_types_interface.list({'max' => 1000})['optionTypes'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
           option_types = []
           while !avail_type_options.empty? && Morpheus::Cli::OptionTypes.confirm("Add #{option_types.empty? ? '' : 'another '}option type?", {:default => false}) do
-            option_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => 'Option Type', 'selectOptions' => avail_type_options, 'required' => false}],options[:options],@api_client,{}, options[:no_prompt], true)['value']
+            option_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'optionType', 'type' => 'select', 'fieldLabel' => 'Option Type', 'selectOptions' => avail_type_options, 'required' => false}],options[:options],@api_client,{}, options[:no_prompt], true)['optionType']
 
             if option_type_id
               option_types << {'id' => option_type_id.to_i}
@@ -437,9 +437,9 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
             else
               avail_container_types = @library_container_types_interface.list(nil, {'technology' => provision_type['code'], 'max' => 1000})['containerTypes'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
               while !avail_container_types.empty? && Morpheus::Cli::OptionTypes.confirm("Add #{nodes.empty? ? '' : 'another '}#{node_type} node?", {:default => false}) do
-                container_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => "#{node_type.capitalize} Node", 'selectOptions' => avail_container_types, 'required' => true}],options[:options],@api_client,{}, options[:no_prompt], true)['value']
-                node_count = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => "#{node_type.capitalize} Node Count", 'required' => true, 'defaultValue' => 1}], options[:options], @api_client, {}, options[:no_prompt])['value']
-                priority = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => "#{node_type.capitalize} Priority", 'required' => true, 'defaultValue' => priority}], options[:options], @api_client, {}, options[:no_prompt])['value']
+                container_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "#{node_type}ContainerType", 'type' => 'select', 'fieldLabel' => "#{node_type.capitalize} Node", 'selectOptions' => avail_container_types, 'required' => true}],options[:options],@api_client,{}, options[:no_prompt], true)["#{node_type}ContainerType"]
+                node_count = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "#{node_type}NodeCount", 'type' => 'number', 'fieldLabel' => "#{node_type.capitalize} Node Count", 'required' => true, 'defaultValue' => 1}], options[:options], @api_client, {}, options[:no_prompt])["#{node_type}NodeCount"]
+                priority = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "#{node_type}Priority", 'type' => 'number', 'fieldLabel' => "#{node_type.capitalize} Priority", 'required' => true, 'defaultValue' => priority}], options[:options], @api_client, {}, options[:no_prompt])["#{node_type}Priority"]
                 nodes << {'nodeCount' => node_count, 'priorityOrder' => priority, 'containerType' => {'id' => container_type_id.to_i}}
                 avail_container_types.reject! {|it| it['value'] == container_type_id}
               end
@@ -863,7 +863,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
   end
 
   def prompt_evar(options)
-    name = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => 'Variable Name', 'required' => true}], options[:options], @api_client,{})['value']
+    name = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Variable Name', 'required' => true}], options[:options], @api_client,{})['name']
     value = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => 'Variable Value', 'required' => false}], options[:options], @api_client,{})['value']
     masked = Morpheus::Cli::OptionTypes.confirm("Variable Masked?", {:default => false}) == true
     export = Morpheus::Cli::OptionTypes.confirm("Variable Label?", {:default => false}) == true

data/lib/morpheus/cli/library_container_scripts_command.rb

@@ -28,7 +28,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
     connect(options)
     if args.count > 0
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
       return 1
     end
     begin
@@ -122,10 +122,11 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
         "Name" => lambda {|it| it['name'] },
         "Type" => lambda {|it| format_container_script_type(it['scriptType']) },
         "Phase" => lambda {|it| format_container_script_phase(it['scriptPhase']) },
+        "Run As User" => lambda {|it| it['runAsUser'] },
+        "Sudo" => lambda {|it| format_boolean(it['sudoUser']) },
         "Owner" => lambda {|it| it['account'] ? it['account']['name'] : '' },
-        # "Enabled" => lambda {|it| format_boolean it['enabled'] },
-        # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-        # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
       }
       print_description_list(description_cols, container_script)
 
@@ -144,22 +145,19 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
   end
 
   def add(args)
+    params = {} # {'scriptType' => 'bash', 'scriptPhase' => 'provision'}
     options = {}
-    params = {'scriptType' => 'bash', 'scriptPhase' => 'provision'}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
-      opts.on('--type [bash|powershell]', String, "Script Type. Default is 'bash'") do |val|
+      opts.on('-t', '--type TYPE', "Script Type. i.e. bash, powershell. Default is bash.") do |val|
         params['scriptType'] = val
       end
-      opts.on('--phase [provision|start|stop]', String, "Script Phase. Default is 'provision'") do |val|
+      opts.on('--phase PHASE', String, "Script Phase. i.e. start, stop, preProvision, provision, postProvision, preDeploy, deploy, reconfigure, teardown. Default is provision.") do |val|
         params['scriptPhase'] = val
-      end
-      opts.on('--category VALUE', String, "Category") do |val|
-        params['category'] = val
-      end
+      end      
       opts.on('--script TEXT', String, "Contents of the script.") do |val|
         params['script'] = val
       end
@@ -176,8 +174,14 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
           params['name'] = File.basename(full_filename)
         end
       end
-      # opts.on('--enabled [on|off]', String, "Can be used to disable it") do |val|
-      #   options['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
+      opts.on("--sudo [on|off]", String, "Run with sudo") do |val|
+        params['sudoUser'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on("--run-as-user VALUE", String, "Run as user") do |val|
+        params['runAsUser'] = val
+      end
+      # opts.on("--run-as-password VALUE", String, "Run as password") do |val|
+      #   params['runAsPassword'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       # end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create a new container script." + "\n" +
@@ -188,22 +192,27 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
     if args[0]
       params['name'] = args[0]
     end
-    if !params['name']
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
-    end
     connect(options)
     begin
-      # construct payload
       payload = nil
+      arbitrary_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      create_payload = {}
+      create_payload.deep_merge!(params)
+      create_payload.deep_merge!(arbitrary_options)
       if options[:payload]
         payload = options[:payload]
+        payload.deep_merge!({'containerScript' => create_payload}) unless create_payload.empty?
       else
-        # merge -O options into normally parsed options
-        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        # todo: prompt?
-        payload = {'containerScript' => params}
+        prompt_result = Morpheus::Cli::OptionTypes.prompt([
+          {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+          {'fieldName' => 'scriptType', 'fieldLabel' => 'Type', 'type' => 'select', 'optionSource' => 'scriptTypes', 'defaultValue' => 'bash', 'required' => true},
+          {'fieldName' => 'scriptPhase', 'fieldLabel' => 'Phase', 'type' => 'select', 'optionSource' => 'containerPhases', 'defaultValue' => 'provision', 'required' => true},
+          {'fieldName' => 'script', 'fieldLabel' => 'Script', 'type' => 'code-editor', 'required' => true},
+          {'fieldName' => 'runAsUser', 'fieldLabel' => 'Run As User', 'type' => 'text'},
+          {'fieldName' => 'sudoUser', 'fieldLabel' => 'Sudo', 'type' => 'checkbox', 'defaultValue' => false},
+        ], params.deep_merge(options[:options] || {}), @api_client)
+        create_payload.deep_merge!(prompt_result)
+        payload = {'containerScript' => create_payload}
       end
       @container_scripts_interface.setopts(options)
       if options[:dry_run]
@@ -234,21 +243,12 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
-      # opts.on('--code VALUE', String, "Code") do |val|
-      #   params['code'] = val
-      # end
-      # opts.on('--description VALUE', String, "Description") do |val|
-      #   params['description'] = val
-      # end
-      opts.on('--type [bash|powershell]', String, "Script Type") do |val|
+      opts.on('-t', '--type TYPE', "Script Type. i.e. bash, powershell. Default is bash.") do |val|
         params['scriptType'] = val
       end
-      opts.on('--phase [start|stop]', String, "Script Phase") do |val|
+      opts.on('--phase PHASE', String, "Script Phase. i.e. start, stop, preProvision, provision, postProvision, preDeploy, deploy, reconfigure, teardown. Default is provision.") do |val|
         params['scriptPhase'] = val
-      end
-      opts.on('--category VALUE', String, "Category") do |val|
-        params['category'] = val
-      end
+      end      
       opts.on('--script TEXT', String, "Contents of the script.") do |val|
         params['script'] = val
       end
@@ -261,8 +261,14 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
           exit 1
         end
       end
-      # opts.on('--enabled [on|off]', String, "Can be used to disable it") do |val|
-      #   options['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
+      opts.on("--sudo [on|off]", String, "Run with sudo") do |val|
+        params['sudoUser'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on("--run-as-user VALUE", String, "Run as user") do |val|
+        params['runAsUser'] = val
+      end
+      # opts.on("--run-as-password VALUE", String, "Run as password") do |val|
+      #   params['runAsPassword'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       # end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Update a container script." + "\n" +
@@ -271,7 +277,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
     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}) #{args.inspect}\n#{optparse}"
+      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
       return 1
     end
     connect(options)
@@ -284,10 +290,16 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       payload = nil
       if options[:payload]
         payload = options[:payload]
+        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload.deep_merge!({'containerScript' => params}) unless params.empty?
       else
-        # merge -O options into normally parsed options
+        # update without prompting
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        payload = {'containerScript' => params}
+        script_payload = params
+        if script_payload.empty?
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
+        end
+        payload = {'containerScript' => script_payload}
       end
       @container_scripts_interface.setopts(options)
       if options[:dry_run]