morpheus-cli 4.1.8 → 4.1.9

data/lib/morpheus/cli/whoami.rb

@@ -26,7 +26,7 @@ class Morpheus::Cli::Whoami
     # begin
       @api_client = establish_remote_appliance_connection(opts.merge({:no_prompt => true, :skip_verify_access_token => true}))
       @groups_interface = @api_client.groups
-      @active_group_id = Morpheus::Cli::Groups.active_group
+      @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     # rescue Morpheus::Cli::CommandError => err
     #   puts_error err
     # end
@@ -46,6 +46,9 @@ class Morpheus::Cli::Whoami
       opts.on( '-n', '--name', "Print only your username." ) do
         username_only = true
       end
+      opts.on('-a','--all', "Display All Details (Feature Access)") do
+        options[:include_feature_access] = true
+      end
       opts.on('-f','--feature-access', "Display Feature Access") do
         options[:include_feature_access] = true
       end
@@ -59,12 +62,12 @@ class Morpheus::Cli::Whoami
       # opts.on(nil,'--instance-type-access', "Display Instance Type Access") do
       #   options[:include_instance_type_access] = true
       # end
-      # opts.on('-a','--all-access', "Display All Access Lists") do
-      #   options[:include_feature_access] = true
-      #   options[:include_group_access] = true
-      #   options[:include_cloud_access] = true
-      #   options[:include_instance_type_access] = true
-      # end
+      opts.on('-a','--all-access', "Display All Access Lists") do
+        options[:include_feature_access] = true
+        options[:include_group_access] = true
+        options[:include_cloud_access] = true
+        options[:include_instance_type_access] = true
+      end
       opts.on('-t','--token-only', "Print your access token only") do
         access_token_only = true
       end
@@ -188,10 +191,25 @@ class Morpheus::Cli::Whoami
           if @user_permissions
             print_h2 "Feature Permissions", options
             print cyan
-            rows = @user_permissions.collect do |code, access|
-              {code: code, access: get_access_string(access) }
+            begin
+              rows = []
+              if @user_permissions.is_a?(Hash)
+                # api used to return map like [code:access]
+                rows = @user_permissions.collect do |code, access|
+                  {permission: code, access: get_access_string(access) }
+                end
+              else
+                # api now returns an array of objects like [[name:"Foo",code:"foo",access:"full"], ...]
+                rows = @user_permissions.collect do |it|
+                  {permission: (it['name'] || it['code']), access: get_access_string(it['access']) }
+                end
+              end
+              # api sort sux right now
+              rows = rows.sort {|a,b| a[:permission] <=> b[:permission] }
+              print as_pretty_table(rows, [:permission, :access], options)
+            rescue => ex
+              puts_error "Failed to parse feature permissions: #{ex}"
             end
-            print as_pretty_table(rows, [:code, :access], options)
           else
             puts yellow,"No permissions found.",reset
           end

data/lib/morpheus/cli/workflows.rb

@@ -6,7 +6,7 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::Workflows
   include Morpheus::Cli::CliCommand
 
-  register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :list, :get, :add, :update, :remove, :execute
   set_default_subcommand :list
   
   # def initialize()
@@ -15,8 +15,11 @@ class Morpheus::Cli::Workflows
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @tasks_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).tasks
-    @task_sets_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).task_sets
+    @task_sets_interface = @api_client.task_sets
+    @tasks_interface = @api_client.tasks
+    @option_types_interface = @api_client.option_types
+    @instances_interface = @api_client.instances
+    @servers_interface = @api_client.servers
   end
 
 
@@ -77,54 +80,185 @@ class Morpheus::Cli::Workflows
   def add(args)
     options = {}
     params = {}
+    tasks = nil
     task_arg_list = nil
+    option_types = nil
+    option_type_arg_list = nil
+    workflow_type = nil # 'provision'
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] --tasks taskId:phase,taskId2:phase,taskId3:phase")
       opts.on("--name NAME", String, "Name for workflow") do |val|
         params['name'] = val
       end
-      opts.on("--tasks x,y,z", Array, "List of tasks to run in order, in the format <Task ID>:<Task Phase> Task Phase is optional, the default is 'provision'.") do |list|
+      opts.on("--description DESCRIPTION", String, "Description of workflow") do |val|
+        params['description'] = val
+      end
+      opts.on("-t", "--type TYPE", "Type of workflow. i.e. provision or operation. Default is provision.") do |val|
+        workflow_type = val.to_s.downcase
+        if workflow_type.include?('provision')
+          workflow_type = 'provision'
+        elsif workflow_type.include?('operation')
+          workflow_type = 'operation'
+        end
+        params['type'] = workflow_type
+      end
+      opts.on("--operational", "--operational", "Create an operational workflow, alias for --type operational.") do |val|
+        workflow_type = 'operation'
+        params['type'] = workflow_type
+      end
+      opts.on("--tasks [x,y,z]", Array, "List of tasks to run in order, in the format <Task ID>:<Task Phase> Task Phase is optional. Default is the same workflow type: 'provision' or 'operation'.") do |list|
         task_arg_list = []
         list.each do |it|
           task_id, task_phase = it.split(":")
           task_arg_list << {task_id: task_id.to_s.strip, task_phase: task_phase.to_s.strip}
+        end if list
+      end
+      opts.on("--option-types x,y,z", Array, "List of option type name or IDs. For use with operational workflows to add configuration during execution.") do |list|
+        option_type_arg_list = []
+        list.each do |it|
+          option_type_arg_list << {option_type_id: it.to_s.strip}
         end
       end
+      opts.on('--platform [PLATFORM]', String, "Platform, eg. linux, windows or osx") do |val|
+        params['platform'] = val.to_s.empty? ? nil : val.to_s.downcase
+      end
+      opts.on('--allow-custom-config [on|off]', String, "Allow Custom Config") do |val|
+        params['allowCustomConfig'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--visibility VISIBILITY', String, "Visibility, eg. private or public") do |val|
+        params['visibility'] = val.to_s.downcase
+      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 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
     connect(options)
     begin
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       payload = nil
       if options[:payload]
         payload = options[:payload]
+        payload.deep_merge!({'taskSet' => passed_options})  unless passed_options.empty?
       else
-        if args[0] && !params['name']
+        params.deep_merge!(passed_options)  unless passed_options.empty?
+        if args[0]
           params['name'] = args[0]
         end
-        if (!params['name'] || task_arg_list.nil?)
-          puts optparse
-          return 1
+        # if params['name'].to_s.empty?
+        #   puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: [name]\n#{optparse}"
+        #   return 1
+        # end
+        # if task_arg_list.nil?
+        #   puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: --tasks\n#{optparse}"
+        #   return 1
+        # end
+        
+        # Name
+        if params['name'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name'}], options[:options], @api_client)
+          params['name'] = v_prompt['name'] unless v_prompt['name'].to_s.empty?
         end
-        tasks = []
-        if task_arg_list
-          task_arg_list.each do |task_arg|
-            found_task = find_task_by_name_or_id(task_arg[:task_id])
-            return 1 if found_task.nil?
-            row = {'taskId' => found_task['id']}
-            if !task_arg[:task_phase].to_s.strip.empty?
-              row['taskPhase'] = task_arg[:task_phase]
+
+        # Description
+        if params['description'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'description' => 'Description'}], options[:options], @api_client)
+          params['description'] = v_prompt['description'] unless v_prompt['description'].to_s.empty?
+        end
+        
+        # Type
+        if workflow_type.nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_workflow_types(), 'required' => true, 'description' => 'Workflow Type', 'defaultValue' => workflow_type || 'provision'}], options[:options], @api_client)
+          workflow_type = v_prompt['type'] unless v_prompt['type'].to_s.empty?
+          params['type'] = workflow_type
+        end
+
+        # Tasks
+        while tasks.nil? do
+          if task_arg_list.nil?
+            tasks_val = nil
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tasks', 'fieldLabel' => 'Tasks', 'type' => 'text', 'required' => false, 'description' => "List of tasks to run in order, in the format <Task ID>:<Task Phase> Task Phase is optional. Default is the same workflow type: 'provision' or 'operation'."}], options[:options], @api_client)
+            tasks_val = v_prompt['tasks'] unless v_prompt['tasks'].to_s.empty?
+            if tasks_val
+              task_arg_list = []
+              tasks_val.split(",").each do |it|
+                task_id, task_phase = it.split(":")
+                task_arg_list << {task_id: task_id.to_s.strip, task_phase: task_phase.to_s.strip}
+              end
+            else
+              # empty array is allowed
+              tasks = []
+            end
+          end
+          if task_arg_list
+            tasks = []
+            task_arg_list.each do |task_arg|
+              found_task = find_task_by_name_or_id(task_arg[:task_id])
+              #return 1 if found_task.nil?
+              if found_task.nil?
+                task_arg_list = nil
+                tasks = nil
+                break
+              end
+              row = {'taskId' => found_task['id']}
+              if !task_arg[:task_phase].to_s.strip.empty?
+                row['taskPhase'] = task_arg[:task_phase]
+              elsif workflow_type == 'operation'
+                row['taskPhase'] = 'operation'
+              end
+              tasks << row
+            end
+          else
+            if options[:no_prompt]
+              # empty array is allowed
+              tasks = []
+            end
+          end
+        end
+
+        # Option Types
+        if workflow_type == 'operation'
+          while option_types.nil? do
+            if option_type_arg_list.nil?
+              option_types_val = nil
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'optionTypes', 'fieldLabel' => 'Option Types', 'type' => 'text', 'description' => "List of option type name or IDs. For use with operational workflows to add configuration during execution."}], options[:options], @api_client)
+              option_types_val = v_prompt['optionTypes'] unless v_prompt['optionTypes'].to_s.empty?
+              if option_types_val
+                option_type_arg_list = []
+                option_types_val.split(",").each do |it|
+                  option_type_arg_list << {option_type_id: it.to_s.strip}
+                end
+              else
+                option_types = [] # not required, break out
+              end
+            end
+            if option_type_arg_list
+              option_types = []
+              option_type_arg_list.each do |option_type_arg|
+                found_option_type = find_option_type_by_name_or_id(option_type_arg[:option_type_id])
+                #return 1 if found_option_type.nil?
+                if found_option_type.nil?
+                  option_type_arg_list = nil
+                  option_types = nil
+                  break
+                end
+                option_types << found_option_type['id']
+              end
             end
-            tasks << row
           end
         end
+
         payload = {'taskSet' => {}}
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # params['type'] = workflow_type
         payload['taskSet'].deep_merge!(params)
-        if !tasks.empty?
+        if tasks
           payload['taskSet']['tasks'] = tasks
         end
+        if option_types && option_types.size > 0
+          payload['taskSet']['optionTypes'] = option_types
+        end
       end
       @task_sets_interface.setopts(options)
       if options[:dry_run]
@@ -136,7 +270,7 @@ class Morpheus::Cli::Workflows
         print JSON.pretty_generate(json_response)
       else
         workflow = json_response['taskSet']
-        print "\n", cyan, "Workflow #{workflow['name']} created successfully", reset, "\n\n"
+        print_green_success "Workflow #{workflow['name']} created"
         get([workflow['id']])
       end
     rescue RestClient::Exception => e
@@ -205,6 +339,10 @@ class Morpheus::Cli::Workflows
           "ID" => 'id',
           "Name" => 'name',
           "Description" => 'description',
+          "Type" => lambda {|workflow| format_workflow_type(workflow) },
+          "Platform" => lambda {|it| format_platform(it['platform']) },
+          "Allow Custom Config" => lambda {|it| format_boolean(it['allowCustomConfig']) },
+          "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
           "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
           "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
         }
@@ -228,9 +366,26 @@ class Morpheus::Cli::Workflows
             {"PHASE" => lambda {|it| it['taskPhase'] } }, # not returned yet?
           ]
           print cyan
-          puts as_pretty_table(tasks, task_set_task_columns)
+          print as_pretty_table(tasks, task_set_task_columns)
+        end
+
+        workflow_option_types = workflow['optionTypes']
+
+        if workflow_option_types && workflow_option_types.size() > 0
+          print_h2 "Workflow Option Types"
+          columns = [
+            {"ID" => lambda {|it| it['id'] } },
+            {"NAME" => lambda {|it| it['name'] } },
+            {"TYPE" => lambda {|it| it['type'] } },
+            {"FIELD NAME" => lambda {|it| it['fieldName'] } },
+            {"FIELD LABEL" => lambda {|it| it['fieldLabel'] } },
+            {"DEFAULT" => lambda {|it| it['defaultValue'] } },
+            {"REQUIRED" => lambda {|it| format_boolean it['required'] } },
+          ]
+          print as_pretty_table(workflow_option_types, columns)
         end
         print reset
+        print "\n"
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -241,25 +396,45 @@ class Morpheus::Cli::Workflows
   def update(args)
     options = {}
     params = {}
+    tasks = nil
     task_arg_list = nil
+    option_types = nil
+    option_type_arg_list = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] --tasks taskId:phase,taskId2:phase,taskId3:phase")
-      opts.on("--tasks x,y,z", Array, "New list of tasks to run in the format <Task ID>:<Phase>. Phase is optional, the default is 'provision'.") do |list|
+      opts.on("--name NAME", String, "New name for workflow") do |val|
+        params['name'] = val
+      end
+      opts.on("--description DESCRIPTION", String, "Description of workflow") do |val|
+        params['description'] = val
+      end
+      opts.on("--tasks [x,y,z]", Array, "List of tasks to run in order, in the format <Task ID>:<Task Phase> Task Phase is optional. Default is the same workflow type: 'provision' or 'operation'.") do |list|
         task_arg_list = []
         list.each do |it|
           task_id, task_phase = it.split(":")
           task_arg_list << {task_id: task_id.to_s.strip, task_phase: task_phase.to_s.strip}
-        end
+        end if list
       end
-      opts.on("--name NAME", String, "New name for workflow") do |val|
-        params['name'] = val
+      opts.on("--option-types [x,y,z]", Array, "List of option type name or IDs. For use with operational workflows to add configuration during execution.") do |list|
+        option_type_arg_list = []
+        list.each do |it|
+          option_type_arg_list << {option_type_id: it.to_s.strip}
+        end if list
+      end
+      opts.on('--platform [PLATFORM]', String, "Platform, eg. linux, windows or osx") do |val|
+        params['platform'] = val.to_s.empty? ? nil : val.to_s.downcase
+      end
+      opts.on('--allow-custom-config [on|off]', String, "Allow Custom Config") do |val|
+        params['allowCustomConfig'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--visibility VISIBILITY', String, "Visibility, eg. private or public") do |val|
+        params['visibility'] = val.to_s.downcase
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     workflow_name = args[0]
     connect(options)
@@ -270,8 +445,8 @@ class Morpheus::Cli::Workflows
       if options[:payload]
         payload = options[:payload]
       else
-        tasks = []
         if task_arg_list
+          tasks = []
           task_arg_list.each do |task_arg|
             found_task = find_task_by_name_or_id(task_arg[:task_id])
             return 1 if found_task.nil?
@@ -282,12 +457,23 @@ class Morpheus::Cli::Workflows
             tasks << row
           end
         end
+        if option_type_arg_list
+          option_types = []
+          option_type_arg_list.each do |option_type_arg|
+            found_option_type = find_option_type_by_name_or_id(option_type_arg[:option_type_id])
+            return 1 if found_option_type.nil?
+            option_types << found_option_type['id']
+          end
+        end
         payload = {'taskSet' => {}}
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         payload['taskSet'].deep_merge!(params)
-        if !tasks.empty?
+        if tasks
           payload['taskSet']['tasks'] = tasks
         end
+        if option_types
+          payload['taskSet']['optionTypes'] = option_types
+        end
       end
       @task_sets_interface.setopts(options)
       if options[:dry_run]
@@ -298,7 +484,7 @@ class Morpheus::Cli::Workflows
       if options[:json]
         print JSON.pretty_generate(json_response)
       elsif !options[:quiet]
-        print "\n", cyan, "Workflow #{json_response['taskSet']['name']} updated successfully", reset, "\n\n"
+        print_green_success "Workflow #{json_response['taskSet']['name']} updated"
         get([workflow['id']])
       end
     rescue RestClient::Exception => e
@@ -335,7 +521,7 @@ class Morpheus::Cli::Workflows
       if options[:json]
         print JSON.pretty_generate(json_response)
       elsif !options[:quiet]
-        print "\n", cyan, "Workflow #{workflow['name']} removed", reset, "\n\n"
+        print_green_success "Workflow #{workflow['name']} removed"
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -343,9 +529,141 @@ class Morpheus::Cli::Workflows
     end
   end
 
+  def execute(args)
+    params = {}
+    options = {}
+    target_type = nil
+    instance_ids = []
+    instances = []
+    server_ids = []
+    servers = []
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[workflow] --instance [instance] [options]")
+      opts.on('--instance INSTANCE', String, "Instance name or id to execute the workflow on. This option can be passed more than once.") do |val|
+        target_type = 'instance'
+        instance_ids << val
+      end
+      opts.on('--instances [LIST]', Array, "Instances, comma separated list of instance names or IDs.") do |list|
+        target_type = 'instance'
+        instance_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.on('--host HOST', String, "Host name or id to execute the workflow on. This option can be passed more than once.") do |val|
+        target_type = 'server'
+        server_ids << val
+      end
+      opts.on('--hosts [LIST]', Array, "Hosts, comma separated list of host names or IDs.") do |list|
+        target_type = 'server'
+        server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.on('--server HOST', String, "alias for --host") do |val|
+        target_type = 'server'
+        server_ids << val
+      end
+      opts.on('--servers [LIST]', Array, "alias for --hosts") do |list|
+        target_type = 'server'
+        server_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.add_hidden_option('--server')
+      opts.add_hidden_option('--servers')
+      opts.on('--config [TEXT]', String, "Custom config") do |val|
+        params['customConfig'] = val.to_s
+      end
+      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :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
+    workflow_name = args[0]
+    connect(options)
+    begin
+      workflow = find_workflow_by_name_or_id(workflow_name)
+      return 1 if workflow.nil?
+
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'job' => passed_options})  unless passed_options.empty?
+      else
+        if instance_ids.size > 0 && server_ids.size > 0
+          raise_command_error "Pass --instance or --host, not both.\n#{optparse}"
+        elsif instance_ids.size > 0
+          instance_ids.each do |instance_id|
+            instance = find_instance_by_name_or_id(instance_id)
+            return 1 if instance.nil?
+            instances << instance
+          end
+          params['instances'] = instances.collect {|it| it['id'] }
+        elsif server_ids.size > 0
+          server_ids.each do |server_id|
+            server = find_server_by_name_or_id(server_id)
+            return 1 if server.nil?
+            servers << server
+          end
+          params['servers'] = servers.collect {|it| it['id'] }
+        else
+          raise_command_error "missing required option: --instance or --host\n#{optparse}"
+        end
+
+        # todo: prompt to workflow optionTypes for customOptions
+        custom_options = nil
+        if workflow['optionTypes'] && workflow['optionTypes'].size() > 0
+          custom_option_types = workflow['optionTypes'].collect {|it|
+            it['fieldContext'] = 'customOptions'
+            it
+          }
+          custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
+        end
+
+        params['targetType'] = target_type
+
+        job_payload = {}
+        job_payload.deep_merge!(params)
+        passed_options.delete('customOptions')
+        job_payload.deep_merge!(passed_options) unless passed_options.empty?
+        if custom_options
+          # job_payload.deep_merge!('config' => custom_options)
+          job_payload.deep_merge!(custom_options)
+        end
+        payload = {'job' => job_payload}
+      end
+
+      @task_sets_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @task_sets_interface.dry.run(workflow['id'], payload)
+        return 0
+      end
+      response = @task_sets_interface.run(workflow['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        if !response['success']
+          return 1
+        end
+      else
+        target_desc = ""
+        if instances.size() > 0
+          target_desc = (instances.size() == 1) ? "instance #{instances[0]['name']}" : "#{instances.size()} instances"
+        elsif servers.size() > 0
+          target_desc = (servers.size() == 1) ? "host #{servers[0]['name']}" : "#{servers.size()} hosts"
+        end
+        print_green_success "Executing workflow #{workflow['name']} on #{target_desc}"
+        # todo: load job/execution
+        # get([workflow['id']])
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
 
   private
 
+  def get_available_workflow_types
+    [{"name" => "Provisioning", "value" => "provision", "isDefault" => true}, {"name" => "Operational", "value" => "operation"}]
+  end
+
   def find_workflow_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_workflow_by_id(val)
@@ -361,6 +679,7 @@ class Morpheus::Cli::Workflows
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
         print_red_alert "Workflow not found by id #{id}"
+        return nil
       else
         raise e
       end
@@ -397,6 +716,7 @@ class Morpheus::Cli::Workflows
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
         print_red_alert "Task not found by id #{id}"
+        return nil
       else
         raise e
       end
@@ -422,16 +742,148 @@ class Morpheus::Cli::Workflows
     columns = [
       {"ID" => lambda {|workflow| workflow['id'] } },
       {"NAME" => lambda {|workflow| workflow['name'] } },
+      {"DESCRIPTION" => lambda {|workflow| workflow['description'] } },
+      {"TYPE" => lambda {|workflow| format_workflow_type(workflow) } },
       {"TASKS" => lambda {|workflow| 
-        (workflow['taskSetTasks'] || []).sort { |x,y| x['taskOrder'].to_i <=> y['taskOrder'].to_i }.collect { |taskSetTask|
-          taskSetTask['task']['name']
-        }.join(', ')
+        # (workflow['taskSetTasks'] || []).sort { |x,y| x['taskOrder'].to_i <=> y['taskOrder'].to_i }.collect { |taskSetTask|
+        #   taskSetTask['task']['name']
+        # }.join(', ')
+        (workflow['taskSetTasks'] || []).size.to_s
        } },
-      {"DATE CREATED" => lambda {|workflow| format_local_dt(workflow['dateCreated']) } },
+      {"CREATED" => lambda {|workflow| format_local_dt(workflow['dateCreated']) } },
     ]
     if opts[:include_fields]
       columns = opts[:include_fields]
     end
     print as_pretty_table(workflows, columns, opts)
   end
+
+  def format_workflow_type(workflow)
+    if workflow['type'] == 'provision'
+      "Provisioning"
+    elsif workflow['type'] == 'operation'
+      "Operational"
+    else
+      workflow['type']
+    end
+  end
+
+  def format_platform(platform)
+    if platform.nil?
+      "All"
+    elsif platform == 'osx'
+      "OSX"
+    else
+      platform.to_s.capitalize
+    end
+  end
+
+  def find_option_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_option_type_by_id(val)
+    else
+      return find_option_type_by_name(val)
+    end
+  end
+
+  def find_option_type_by_id(id)
+    begin
+      json_response = @option_types_interface.get(id.to_i)
+      return json_response['optionType']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Option Type not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_option_type_by_name(name)
+    json_results = @option_types_interface.list({name: name.to_s})
+    if json_results['optionTypes'].empty?
+      print_red_alert "Option Type not found by name #{name}"
+      return nil
+    end
+    option_type = json_results['optionTypes'][0]
+    return option_type
+  end
+
+  def find_instance_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_instance_by_id(val)
+    else
+      return find_instance_by_name(val)
+    end
+  end
+
+  def find_instance_by_id(id)
+    begin
+      json_response = @instances_interface.get(id.to_i)
+      return json_response['instance']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Instance not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_instance_by_name(name)
+    instances = @instances_interface.list({name: name.to_s})['instances']
+    if instances.empty?
+      print_red_alert "Instance not found by name #{name}"
+      return nil
+    elsif instances.size > 1
+      print_red_alert "#{instances.size} instances found by name #{name}"
+      as_pretty_table(instances, [:id, :name], {color: red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return instances[0]
+    end
+  end
+
+  def find_server_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_server_by_id(val)
+    else
+      return find_server_by_name(val)
+    end
+  end
+
+  def find_server_by_id(id)
+    begin
+      json_response = @servers_interface.get(id.to_i)
+      return json_response['server']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Server not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_server_by_name(name)
+    servers = @servers_interface.list({name: name.to_s})['servers']
+    if servers.empty?
+      print_red_alert "Host not found by name #{name}"
+      return nil
+    elsif servers.size > 1
+      print_red_alert "#{servers.size} hosts found by name #{name}"
+      as_pretty_table(servers, [:id, :name], {color: red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return servers[0]
+    end
+  end
+
 end