Use OpenShift Terminal for Serverless

- Also fix a race condition that caused the terminal spawn to fail

Signed-off-by: David Thompson <davthomp@redhat.com>

Author: datho7561

src/cli.ts

@@ -22,7 +22,6 @@ export interface CliExitData {
 export interface Cli {
     execute(cmd: string, opts?: cp.ExecOptions): Promise<CliExitData>;
     executeTool(command: CommandText, opts?: cp.ExecOptions): Promise<CliExitData>;
-    spawn(cmd: string, params: string[], opts: cp.SpawnOptions): cp.ChildProcess;
     spawnTool(cmd: CommandText, opts: cp.SpawnOptions): Promise<cp.ChildProcess>;
     executeInTerminal(cmd: CommandText, cwd?: string, terminalName?: string, addEnv?: {[key : string]: string}): void;
 }
@@ -157,10 +156,6 @@ export class CliChannel implements Cli {
         await OpenShiftTerminalManager.getInstance().createTerminal(command, name, cwd, merged);
     }
 
-    spawn(cmd: string, params: string[], opts: cp.SpawnOptions = {cwd: undefined, env: process.env}): cp.ChildProcess {
-        return cp.spawn(cmd, params, opts);
-    }
-
     async spawnTool(cmd: CommandText, opts: cp.SpawnOptions = {cwd: undefined, env: process.env}): Promise<cp.ChildProcess> {
         const toolLocation = await ToolsConfig.detect(cmd.command);
         const optWithTelemetryEnv = CliChannel.applyEnv(opts, CliChannel.createTelemetryEnv());

src/openshift/component.ts

@@ -12,7 +12,7 @@ import * as YAML from 'yaml';
 import { CliChannel } from '../cli';
 import { Command } from '../odo/command';
 import { ascDevfileFirst, ComponentTypeAdapter, ComponentTypeDescription } from '../odo/componentType';
-import { StarterProject, CommandProvider } from '../odo/componentTypeDescription';
+import { CommandProvider, StarterProject } from '../odo/componentTypeDescription';
 import { ComponentWorkspaceFolder } from '../odo/workspace';
 import * as odo3 from '../odo3';
 import sendTelemetry, { NewComponentCommandProps } from '../telemetry';
@@ -342,7 +342,7 @@ export class Component extends OpenShiftItem {
         const componentState = Component.componentStates.get(component.contextPath)
         if (componentState) {
             componentState.devTerminal.focusTerminal();
-            componentState.devTerminal.sendText('\u0003');
+            componentState.devTerminal.kill();
         }
         return;
     }
@@ -835,10 +835,11 @@ export class Component extends OpenShiftItem {
             if (Component.isUsingWebviewEditor()) {
                 DescribeViewLoader.loadView(`Component ${componentName}: Run '${componentCommand.id}' Command`, command, componentFolder);
             } else {
-                void Component.odo.executeInTerminal(
+                void OpenShiftTerminalManager.getInstance().createTerminal(
                     command,
+                    `Component ${componentName}: Run '${componentCommand.id}' Command`,
                     componentFolder.contextPath,
-                    `OpenShift: Component ${componentName}: Run '${componentCommand.id}' Command`);
+                );
             }
         } else {
             void window.showErrorMessage(`No Command found in Component '${componentName}`);