Add delete all flag to task command

Author: 16yuki0702

docs/cmd/tkn_task_delete.md

@@ -20,12 +20,13 @@ Delete a task resource in a namespace
 # Delete a Task of name 'foo' in namespace 'bar'
 tkn task delete foo -n bar
 
-tkn t rm foo -n bar",
+tkn t rm foo -n bar
 
 
 ### Options
 
 ```
+  -a, --all                           Whether to delete related resources (taskruns) (default: false)
       --allow-missing-template-keys   If true, ignore any errors in templates when a field or map key is missing in the template. Only applies to golang and jsonpath output formats. (default true)
   -f, --force                         Whether to force deletion (default: false)
   -h, --help                          help for delete

docs/man/man1/tkn-task-delete.1

@@ -19,6 +19,10 @@ Delete a task resource in a namespace
 
 
 .SH OPTIONS
+.PP
+\fB\-a\fP, \fB\-\-all\fP[=false]
+    Whether to delete related resources (taskruns) (default: false)
+
 .PP
 \fB\-\-allow\-missing\-template\-keys\fP[=true]
     If true, ignore any errors in templates when a field or map key is missing in the template. Only applies to golang and jsonpath output formats.
@@ -58,7 +62,7 @@ Delete a task resource in a namespace
 tkn task delete foo \-n bar
 
 .PP
-tkn t rm foo \-n bar",
+tkn t rm foo \-n bar
 
 
 .SH SEE ALSO

pkg/cmd/task/delete.go

@@ -27,16 +27,20 @@ import (
 
 type deleteOptions struct {
 	forceDelete bool
+	deleteAll   bool
 }
 
 func deleteCommand(p cli.Params) *cobra.Command {
-	opts := &deleteOptions{forceDelete: false}
+	opts := &deleteOptions{
+		forceDelete: false,
+		deleteAll:   false,
+	}
 	f := cliopts.NewPrintFlags("delete")
 	eg := `
 # Delete a Task of name 'foo' in namespace 'bar'
 tkn task delete foo -n bar
 
-tkn t rm foo -n bar",
+tkn t rm foo -n bar
 `
 
 	c := &cobra.Command{
@@ -60,25 +64,47 @@ tkn t rm foo -n bar",
 				return err
 			}
 
-			return deleteTask(s, p, args[0])
+			return deleteTask(opts, s, p, args[0])
 		},
 	}
 	f.AddFlags(c)
 	c.Flags().BoolVarP(&opts.forceDelete, "force", "f", false, "Whether to force deletion (default: false)")
+	c.Flags().BoolVarP(&opts.deleteAll, "all", "a", false, "Whether to delete related resources (taskruns) (default: false)")
 	return c
 }
 
-func deleteTask(s *cli.Stream, p cli.Params, tName string) error {
+func deleteTask(opts *deleteOptions, s *cli.Stream, p cli.Params, tName string) error {
 	cs, err := p.Clients()
 	if err != nil {
-		return fmt.Errorf("Failed to create tekton client")
+		return fmt.Errorf("failed to create tekton client")
 	}
 
 	if err := cs.Tekton.TektonV1alpha1().Tasks(p.Namespace()).Delete(tName, &metav1.DeleteOptions{}); err != nil {
-		return fmt.Errorf("Failed to delete task %q: %s", tName, err)
+		return fmt.Errorf("failed to delete task %q: %s", tName, err)
 	}
-
 	fmt.Fprintf(s.Out, "Task deleted: %s\n", tName)
+
+	if !opts.deleteAll {
+		return nil
+	}
+
+	lOpts := metav1.ListOptions{
+		LabelSelector: fmt.Sprintf("tekton.dev/task=%s", tName),
+	}
+
+	taskRuns, err := cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).List(lOpts)
+	if err != nil {
+		return err
+	}
+
+	for _, tr := range taskRuns.Items {
+		if err := cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).Delete(tr.Name, &metav1.DeleteOptions{}); err != nil {
+			return fmt.Errorf("failed to delete taskrun %q: %s", tr.Name, err)
+		}
+
+		fmt.Fprintf(s.Out, "TaskRun deleted: %s\n", tr.Name)
+	}
+
 	return nil
 }
 
@@ -87,14 +113,19 @@ func checkOptions(opts *deleteOptions, s *cli.Stream, p cli.Params, tName string
 		return nil
 	}
 
-	fmt.Fprintf(s.Out, "Are you sure you want to delete task %q (y/n): ", tName)
+	if opts.deleteAll {
+		fmt.Fprintf(s.Out, "Are you sure you want to delete task and related resources (taskruns) %q (y/n): ", tName)
+	} else {
+		fmt.Fprintf(s.Out, "Are you sure you want to delete task %q (y/n): ", tName)
+	}
+
 	scanner := bufio.NewScanner(s.In)
 	for scanner.Scan() {
 		t := strings.TrimSpace(scanner.Text())
 		if t == "y" {
 			break
 		} else if t == "n" {
-			return fmt.Errorf("Canceled deleting task %q", tName)
+			return fmt.Errorf("canceled deleting task %q", tName)
 		}
 		fmt.Fprint(s.Out, "Please enter (y/n): ")
 	}

pkg/cmd/task/delete_test.go

@@ -24,19 +24,45 @@ import (
 	"github.com/tektoncd/cli/pkg/test"
 	cb "github.com/tektoncd/cli/pkg/test/builder"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
+	"github.com/tektoncd/pipeline/pkg/reconciler/v1alpha1/pipelinerun/resources"
 	pipelinetest "github.com/tektoncd/pipeline/test"
 	tb "github.com/tektoncd/pipeline/test/builder"
+	corev1 "k8s.io/api/core/v1"
+	"knative.dev/pkg/apis"
 )
 
 func TestTaskDelete(t *testing.T) {
 	clock := clockwork.NewFakeClock()
 
 	seeds := make([]pipelinetest.Clients, 0)
-	for i := 0; i < 3; i++ {
-		tasks := []*v1alpha1.Task{
-			tb.Task("tomatoes", "ns", cb.TaskCreationTime(clock.Now().Add(-1*time.Minute))),
-		}
-		cs, _ := test.SeedTestData(t, pipelinetest.Data{Tasks: tasks})
+	for i := 0; i < 5; i++ {
+		cs, _ := test.SeedTestData(t, pipelinetest.Data{
+			Tasks: []*v1alpha1.Task{
+				tb.Task("task", "ns", cb.TaskCreationTime(clock.Now().Add(-1*time.Minute))),
+			},
+			TaskRuns: []*v1alpha1.TaskRun{
+				tb.TaskRun("task-run-1", "ns",
+					tb.TaskRunLabel("tekton.dev/task", "task"),
+					tb.TaskRunSpec(tb.TaskRunTaskRef("task")),
+					tb.TaskRunStatus(
+						tb.StatusCondition(apis.Condition{
+							Status: corev1.ConditionTrue,
+							Reason: resources.ReasonSucceeded,
+						}),
+					),
+				),
+				tb.TaskRun("task-run-2", "ns",
+					tb.TaskRunLabel("tekton.dev/task", "task"),
+					tb.TaskRunSpec(tb.TaskRunTaskRef("task")),
+					tb.TaskRunStatus(
+						tb.StatusCondition(apis.Condition{
+							Status: corev1.ConditionTrue,
+							Reason: resources.ReasonSucceeded,
+						}),
+					),
+				),
+			},
+		})
 		seeds = append(seeds, cs)
 	}
 
@@ -50,43 +76,59 @@ func TestTaskDelete(t *testing.T) {
 	}{
 		{
 			name:        "With force delete flag (shorthand)",
-			command:     []string{"rm", "tomatoes", "-n", "ns", "-f"},
+			command:     []string{"rm", "task", "-n", "ns", "-f"},
 			input:       seeds[0],
 			inputStream: nil,
 			wantError:   false,
-			want:        "Task deleted: tomatoes\n",
+			want:        "Task deleted: task\n",
 		},
 		{
 			name:        "With force delete flag",
-			command:     []string{"rm", "tomatoes", "-n", "ns", "--force"},
+			command:     []string{"rm", "task", "-n", "ns", "--force"},
 			input:       seeds[1],
 			inputStream: nil,
 			wantError:   false,
-			want:        "Task deleted: tomatoes\n",
+			want:        "Task deleted: task\n",
 		},
 		{
 			name:        "Without force delete flag, reply no",
-			command:     []string{"rm", "tomatoes", "-n", "ns"},
+			command:     []string{"rm", "task", "-n", "ns"},
 			input:       seeds[2],
 			inputStream: strings.NewReader("n"),
 			wantError:   true,
-			want:        "Canceled deleting task \"tomatoes\"",
+			want:        "canceled deleting task \"task\"",
 		},
 		{
 			name:        "Without force delete flag, reply yes",
-			command:     []string{"rm", "tomatoes", "-n", "ns"},
+			command:     []string{"rm", "task", "-n", "ns"},
 			input:       seeds[2],
 			inputStream: strings.NewReader("y"),
 			wantError:   false,
-			want:        "Are you sure you want to delete task \"tomatoes\" (y/n): Task deleted: tomatoes\n",
+			want:        "Are you sure you want to delete task \"task\" (y/n): Task deleted: task\n",
 		},
 		{
 			name:        "Remove non existent resource",
 			command:     []string{"rm", "nonexistent", "-n", "ns"},
 			input:       seeds[2],
 			inputStream: strings.NewReader("y"),
 			wantError:   true,
-			want:        "Failed to delete task \"nonexistent\": tasks.tekton.dev \"nonexistent\" not found",
+			want:        "failed to delete task \"nonexistent\": tasks.tekton.dev \"nonexistent\" not found",
+		},
+		{
+			name:        "With delete all flag, reply yes",
+			command:     []string{"rm", "task", "-n", "ns", "-a"},
+			input:       seeds[3],
+			inputStream: strings.NewReader("y"),
+			wantError:   false,
+			want:        "Are you sure you want to delete task and related resources (taskruns) \"task\" (y/n): Task deleted: task\nTaskRun deleted: task-run-1\nTaskRun deleted: task-run-2\n",
+		},
+		{
+			name:        "With delete all and force delete flag",
+			command:     []string{"rm", "task", "-n", "ns", "-f", "--all"},
+			input:       seeds[4],
+			inputStream: nil,
+			wantError:   false,
+			want:        "Task deleted: task\nTaskRun deleted: task-run-1\nTaskRun deleted: task-run-2\n",
 		},
 	}
 
@@ -102,12 +144,12 @@ func TestTaskDelete(t *testing.T) {
 			out, err := test.ExecuteCommand(task, tp.command...)
 			if tp.wantError {
 				if err == nil {
-					t.Errorf("Error expected here")
+					t.Errorf("error expected here")
 				}
 				test.AssertOutput(t, tp.want, err.Error())
 			} else {
 				if err != nil {
-					t.Errorf("Unexpected Error")
+					t.Errorf("unexpected Error")
 				}
 				test.AssertOutput(t, tp.want, out)
 			}