From 8dd3b45cce14ddfa585279633cb4a645d0496df9 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Thu, 25 Jul 2019 23:59:43 +0300 Subject: [PATCH 1/2] Fix resolving of variables for che commands Signed-off-by: Roman Nikitenko --- plugins/task-plugin/src/task/che-task-provider.ts | 11 +++++++---- plugins/task-plugin/src/task/task-protocol.ts | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/task-plugin/src/task/che-task-provider.ts b/plugins/task-plugin/src/task/che-task-provider.ts index 61cc9bd6a..8cbed2909 100644 --- a/plugins/task-plugin/src/task/che-task-provider.ts +++ b/plugins/task-plugin/src/task/che-task-provider.ts @@ -10,7 +10,7 @@ import { injectable, inject } from 'inversify'; import * as che from '@eclipse-che/plugin'; -import { Task } from '@theia/plugin'; +import { Task, ShellExecution } from '@theia/plugin'; import { CHE_TASK_TYPE, CheTaskDefinition, Target } from './task-protocol'; import { MachinesPicker } from '../machine/machines-picker'; import { CheWorkspaceClient } from '../che-workspace-client'; @@ -55,17 +55,20 @@ export class CheTaskProvider { resultTarget.workingDir = target.workingDir; } - const command = await che.variables.resolve(cheTaskDefinition.command); + const execution = task.execution as ShellExecution; + if (execution && execution.command) { + execution.command = await che.variables.resolve(execution.command as string); + } + return { definition: { type: taskType, - command: command, target: resultTarget, previewUrl: cheTaskDefinition.previewUrl }, name: task.name, source: task.source, - execution: task.execution + execution: execution }; } } diff --git a/plugins/task-plugin/src/task/task-protocol.ts b/plugins/task-plugin/src/task/task-protocol.ts index f6ca298f8..9d0613d1d 100644 --- a/plugins/task-plugin/src/task/task-protocol.ts +++ b/plugins/task-plugin/src/task/task-protocol.ts @@ -17,7 +17,6 @@ export const WORKING_DIR_ATTRIBUTE: string = 'workingDir'; export interface CheTaskDefinition extends TaskDefinition { readonly target?: Target, - readonly command: string, readonly previewUrl?: string } From 5cb3a8019e2d296a20064102a4db9da711e3bcc7 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Mon, 29 Jul 2019 14:32:28 +0300 Subject: [PATCH 2/2] Resolve variables for 'workingDir' property Signed-off-by: Roman Nikitenko --- plugins/task-plugin/src/task/che-task-provider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/task-plugin/src/task/che-task-provider.ts b/plugins/task-plugin/src/task/che-task-provider.ts index 8cbed2909..a10fdbb1b 100644 --- a/plugins/task-plugin/src/task/che-task-provider.ts +++ b/plugins/task-plugin/src/task/che-task-provider.ts @@ -52,7 +52,7 @@ export class CheTaskProvider { } if (target && target.workingDir) { - resultTarget.workingDir = target.workingDir; + resultTarget.workingDir = await che.variables.resolve(target.workingDir); } const execution = task.execution as ShellExecution;