Tekton: Delete commands should show confirmation info message and r…

…un without terminal
redhat-developer · Dec 5, 2019 · ea3a1a9 · ea3a1a9
1 parent dc0317a
commit ea3a1a9
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 20 deletions.
diff --git a/src/tekton/clustertask.ts b/src/tekton/clustertask.ts
@@ -5,6 +5,8 @@
 
 import { TektonItem } from './tektonitem';
 import { TektonNode, Command } from '../tkn';
+import { Progress } from '../util/progress';
+import { window } from 'vscode';
 
 export class ClusterTask extends TektonItem {
 
@@ -16,8 +18,14 @@ export class ClusterTask extends TektonItem {
             if (clustertasks) { ClusterTask.tkn.executeInTerminal(Command.listClusterTasksinTerminal()); }
     }
 
-    static async delete(clustertask: TektonNode): Promise<void> {
-        if (clustertask) { ClusterTask.tkn.executeInTerminal(Command.deleteClusterTask(clustertask.getName())); }
+    static async delete(clustertask: TektonNode): Promise<string> {
+        const value = await window.showWarningMessage(`Do you want to delete clustertask '${clustertask.getName()}\'?`, 'Yes', 'Cancel');
+        if (value === 'Yes') {
+            return Progress.execFunctionWithProgress(`Deleting the clustertask '${clustertask.getName()}'`, () => 
+                ClusterTask.tkn.execute(Command.deleteClusterTask(clustertask.getName())))
+                .then(() => `clustertask '${clustertask.getName()}' successfully deleted`)
+                .catch((err) => Promise.reject(`Failed to delete clustertask with error '${err}'`));
+        }
     }
 
 }
diff --git a/src/tekton/pipeline.ts b/src/tekton/pipeline.ts
@@ -12,7 +12,6 @@ import * as cliInstance from '../cli';
 import { Cli } from '../cli';
 import * as k8s from 'vscode-kubernetes-tools-api';
 
-
 export interface NameType {
     name: string;
     type: string;
@@ -271,8 +270,14 @@ export class Pipeline extends TektonItem {
         if (pipeline) { Pipeline.tkn.executeInTerminal(Command.listPipelinesInTerminal(pipeline.getName())); }
     }
 
-    static async delete(pipeline: TektonNode): Promise<void> {
-        if (pipeline) {Pipeline.tkn.executeInTerminal(Command.deletePipeline(pipeline.getName())); }
+    static async delete(pipeline: TektonNode): Promise<string> {
+        const value = await window.showWarningMessage(`Do you want to delete pipeline '${pipeline.getName()}\'?`, 'Yes', 'Cancel');
+        if (value === 'Yes') {
+            return Progress.execFunctionWithProgress(`Deleting the pipeline '${pipeline.getName()}'`, () => 
+                Pipeline.tkn.execute(Command.deletePipeline(pipeline.getName())))
+                .then(() => `pipeline '${pipeline.getName()}' successfully deleted`)
+                .catch((err) => Promise.reject(`Failed to delete pipeline with error '${err}'`));
+        }
     }
 
 }
diff --git a/src/tekton/pipelineresource.ts b/src/tekton/pipelineresource.ts
@@ -6,6 +6,8 @@
 import { TektonItem } from './tektonitem';
 import { TektonNode, Command } from '../tkn';
 import * as k8s from 'vscode-kubernetes-tools-api';
+import { Progress } from '../util/progress';
+import { window } from 'vscode';
 
 export class PipelineResource extends TektonItem {
 
@@ -18,8 +20,14 @@ export class PipelineResource extends TektonItem {
         if (pipelineresource) { PipelineResource.tkn.executeInTerminal(Command.listPipelineResourcesInTerminal(pipelineresource.getName())); }
     }
 
-     static async delete(pipelineresource: TektonNode): Promise<void> {
-        if (pipelineresource) { PipelineResource.tkn.executeInTerminal(Command.deletePipelineResource(pipelineresource.getName())); }
+     static async delete(pipelineresource: TektonNode): Promise<string> {
+        const value = await window.showWarningMessage(`Do you want to delete resource '${pipelineresource.getName()}\'?`, 'Yes', 'Cancel');
+        if (value === 'Yes') {
+            return Progress.execFunctionWithProgress(`Deleting the resource '${pipelineresource.getName()}'`, () => 
+                PipelineResource.tkn.execute(Command.deletePipelineResource(pipelineresource.getName())))
+                .then(() => `resource '${pipelineresource.getName()}' successfully deleted`)
+                .catch((err) => Promise.reject(`Failed to delete resource with error '${err}'`));
+        }
     }
 
 }
diff --git a/src/tekton/pipelinerun.ts b/src/tekton/pipelinerun.ts
@@ -5,7 +5,8 @@
 
 import { TektonItem } from './tektonitem';
 import { TektonNode, Command } from '../tkn';
-import * as k8s from 'vscode-kubernetes-tools-api';
+import { window } from 'vscode';
+import { Progress } from '../util/progress';
 
 export class PipelineRun extends TektonItem {
 
@@ -44,8 +45,14 @@ export class PipelineRun extends TektonItem {
         if (pipelinerun) { PipelineRun.tkn.executeInTerminal(Command.cancelPipelineRun(pipelinerun.getName())); }
     }
 
-    static async delete(pipelinerun: TektonNode): Promise<void> {
-        if (pipelinerun) { PipelineRun.tkn.executeInTerminal(Command.deletePipelineRun(pipelinerun.getName())); }
+    static async delete(pipelinerun: TektonNode): Promise<string> {
+        const value = await window.showWarningMessage(`Do you want to delete pipelinerun '${pipelinerun.getName()}\'?`, 'Yes', 'Cancel');
+        if (value === 'Yes') {
+            return Progress.execFunctionWithProgress(`Deleting the pipelinerun '${pipelinerun.getName()}'`, () => 
+                PipelineRun.tkn.execute(Command.deletePipelineRun(pipelinerun.getName())))
+                .then(() => `pipelinerun '${pipelinerun.getName()}' successfully deleted`)
+                .catch((err) => Promise.reject(`Failed to delete pipelinerun with error '${err}'`));
+        }
     }
 
 }
diff --git a/src/tekton/task.ts b/src/tekton/task.ts
@@ -5,6 +5,8 @@
 
 import { TektonItem } from './tektonitem';
 import { TektonNode, Command } from '../tkn';
+import { window } from 'vscode';
+import { Progress } from '../util/progress';
 
 export class Task extends TektonItem {
 
@@ -18,7 +20,13 @@ export class Task extends TektonItem {
         if (task) { Task.tkn.executeInTerminal(Command.listTasksinTerminal()); }
     }
 
-    static async delete(task: TektonNode): Promise<void> {
-        if (task) { Task.tkn.executeInTerminal(Command.deleteTask(task.getName())); }
+    static async delete(task: TektonNode): Promise<string> {
+        const value = await window.showWarningMessage(`Do you want to delete task '${task.getName()}\'?`, 'Yes', 'Cancel');
+        if (value === 'Yes') {
+            return Progress.execFunctionWithProgress(`Deleting the task '${task.getName()}'`, () => 
+                Task.tkn.execute(Command.deleteTask(task.getName())))
+                .then(() => `task '${task.getName()}' successfully deleted`)
+                .catch((err) => Promise.reject(`Failed to delete task with error '${err}'`));
+        }
     }
 }
diff --git a/src/tekton/taskrun.ts b/src/tekton/taskrun.ts
@@ -5,6 +5,8 @@
 
 import { TektonItem } from './tektonitem';
 import { TektonNode, Command } from '../tkn';
+import { window } from 'vscode';
+import { Progress } from '../util/progress';
 
 export class TaskRun extends TektonItem {
 
@@ -20,7 +22,13 @@ export class TaskRun extends TektonItem {
         if (taskrun) { TaskRun.tkn.executeInTerminal(Command.showTaskRunLogs(taskrun.getName())); }
     }
 
-    static async delete(taskrun: TektonNode): Promise<void> {
-        if (taskrun) { TaskRun.tkn.executeInTerminal(Command.deleteTaskRun(taskrun.getName())); }
+    static async delete(taskrun: TektonNode): Promise<string> {
+        const value = await window.showWarningMessage(`Do you want to delete taskrun '${taskrun.getName()}\'?`, 'Yes', 'Cancel');
+        if (value === 'Yes') {
+            return Progress.execFunctionWithProgress(`Deleting the taskrun '${taskrun.getName()}'`, () => 
+                TaskRun.tkn.execute(Command.deleteTaskRun(taskrun.getName())))
+                .then(() => `taskrun '${taskrun.getName()}' successfully deleted`)
+                .catch((err) => Promise.reject(`Failed to delete taskrun with error '${err}'`));
+        }
     }
 }
diff --git a/src/tkn.ts b/src/tkn.ts
@@ -110,7 +110,7 @@ export class Command {
     }
     @verbose
     static deletePipeline(name: string) {
-        return `tkn pipeline delete ${name}`;
+        return `tkn pipeline delete ${name} -f`;
     }
     @verbose
     static listPipelineResources() {
@@ -126,7 +126,7 @@ export class Command {
     }
     @verbose
     static deletePipelineResource(name: string) {
-        return `tkn resource delete ${name}`;
+        return `tkn resource delete ${name} -f`;
     }
     @verbose
     static listPipelines() {
@@ -158,7 +158,7 @@ export class Command {
     }
     @verbose
     static deletePipelineRun(name: string) {
-        return `tkn pipelinerun delete ${name}`;
+        return `tkn pipelinerun delete ${name} -f`;
     }
     @verbose
     static showPipelineRunLogs(name: string) {
@@ -182,7 +182,7 @@ export class Command {
     }
     @verbose
     static deleteTask(name: string) {
-        return `tkn task delete ${name}`;
+        return `tkn task delete ${name} -f`;
     }
     @verbose
     static listClusterTasks(namespace?: string) {
@@ -193,15 +193,15 @@ export class Command {
     }
     @verbose
     static deleteClusterTask(name: string) {
-        return `tkn task delete ${name}`;
+        return `tkn clustertask delete ${name} -f`;
     }
     @verbose
     static showTaskRunLogs(name: string) {
         return `tkn taskrun logs ${name}`;
     }
     @verbose
     static deleteTaskRun(name: string) {
-        return `tkn taskrun delete ${name}`;
+        return `tkn taskrun delete ${name} -f`;
     }
     @verbose
     static printTknVersion() {