Add flag to task and pipeline to only delete related resources

docs/cmd/tkn_pipeline_delete.md

@@ -28,7 +28,7 @@ or
 ### Options
 
 ```
-  -a, --all                           Whether to delete related resources (pipelineruns) (default: false)
+  -a, --all                           Whether to also delete related resources (pipelineruns) (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/cmd/tkn_pipelinerun_delete.md

@@ -32,6 +32,7 @@ or
   -f, --force                         Whether to force deletion (default: false)
   -h, --help                          help for delete
   -o, --output string                 Output format. One of: json|yaml|name|go-template|go-template-file|template|templatefile|jsonpath|jsonpath-file.
+  -p, --pipeline string               The name of a pipeline whose pipelineruns should be deleted (does not delete the pipeline)
       --template string               Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview].
 ```
 

docs/cmd/tkn_task_delete.md

@@ -28,7 +28,7 @@ or
 ### Options
 
 ```
-  -a, --all                           Whether to delete related resources (taskruns) (default: false)
+  -a, --all                           Whether to also 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/cmd/tkn_taskrun_delete.md

@@ -32,6 +32,7 @@ or
   -f, --force                         Whether to force deletion (default: false)
   -h, --help                          help for delete
   -o, --output string                 Output format. One of: json|yaml|name|go-template|go-template-file|template|templatefile|jsonpath|jsonpath-file.
+  -t, --task string                   The name of a task whose taskruns should be deleted (does not delete the task)
       --template string               Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview].
 ```
 

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

@@ -21,7 +21,7 @@ Delete pipelines in a namespace
 .SH OPTIONS
 .PP
 \fB\-a\fP, \fB\-\-all\fP[=false]
-    Whether to delete related resources (pipelineruns) (default: false)
+    Whether to also delete related resources (pipelineruns) (default: false)
 
 .PP
 \fB\-\-allow\-missing\-template\-keys\fP[=true]

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

@@ -35,6 +35,10 @@ Delete pipelineruns in a namespace
 \fB\-o\fP, \fB\-\-output\fP=""
     Output format. One of: json|yaml|name|go\-template|go\-template\-file|template|templatefile|jsonpath|jsonpath\-file.
 
+.PP
+\fB\-p\fP, \fB\-\-pipeline\fP=""
+    The name of a pipeline whose pipelineruns should be deleted (does not delete the pipeline)
+
 .PP
 \fB\-\-template\fP=""
     Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

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

@@ -21,7 +21,7 @@ Delete task resources in a namespace
 .SH OPTIONS
 .PP
 \fB\-a\fP, \fB\-\-all\fP[=false]
-    Whether to delete related resources (taskruns) (default: false)
+    Whether to also delete related resources (taskruns) (default: false)
 
 .PP
 \fB\-\-allow\-missing\-template\-keys\fP[=true]

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

@@ -35,6 +35,10 @@ Delete taskruns in a namespace
 \fB\-o\fP, \fB\-\-output\fP=""
     Output format. One of: json|yaml|name|go\-template|go\-template\-file|template|templatefile|jsonpath|jsonpath\-file.
 
+.PP
+\fB\-t\fP, \fB\-\-task\fP=""
+    The name of a task whose taskruns should be deleted (does not delete the task)
+
 .PP
 \fB\-\-template\fP=""
     Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

pkg/cmd/clustertask/delete.go

@@ -75,5 +75,7 @@ func deleteClusterTasks(s *cli.Stream, p cli.Params, tNames []string) error {
 	d := deleter.New("ClusterTask", func(taskName string) error {
 		return cs.Tekton.TektonV1alpha1().ClusterTasks().Delete(taskName, &metav1.DeleteOptions{})
 	})
-	return d.Execute(s, tNames)
+	d.Delete(s, tNames)
+	d.PrintSuccesses(s)
+	return d.Errors()
 }

pkg/cmd/condition/delete.go

@@ -80,5 +80,7 @@ func deleteConditions(s *cli.Stream, p cli.Params, condNames []string) error {
 	d := deleter.New("Condition", func(conditionName string) error {
 		return cs.Tekton.TektonV1alpha1().Conditions(p.Namespace()).Delete(conditionName, &metav1.DeleteOptions{})
 	})
-	return d.Execute(s, condNames)
+	d.Delete(s, condNames)
+	d.PrintSuccesses(s)
+	return d.Errors()
 }

pkg/cmd/eventlistener/delete.go

@@ -81,5 +81,7 @@ func deleteEventListeners(s *cli.Stream, p cli.Params, elNames []string) error {
 	d := deleter.New("EventListener", func(listenerName string) error {
 		return cs.Triggers.TektonV1alpha1().EventListeners(p.Namespace()).Delete(listenerName, &metav1.DeleteOptions{})
 	})
-	return d.Execute(s, elNames)
+	d.Delete(s, elNames)
+	d.PrintSuccesses(s)
+	return d.Errors()
 }

pkg/cmd/pipeline/delete.go

@@ -68,7 +68,7 @@ or
 	}
 	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 (pipelineruns) (default: false)")
+	c.Flags().BoolVarP(&opts.DeleteAll, "all", "a", false, "Whether to also delete related resources (pipelineruns) (default: false)")
 
 	_ = c.MarkZshCompPositionalArgumentCustom(1, "__tkn_get_pipeline")
 	return c
@@ -82,12 +82,15 @@ func deletePipelines(opts *options.DeleteOptions, s *cli.Stream, p cli.Params, p
 	d := deleter.New("Pipeline", func(pipelineName string) error {
 		return cs.Tekton.TektonV1alpha1().Pipelines(p.Namespace()).Delete(pipelineName, &metav1.DeleteOptions{})
 	})
+	d.WithRelated("PipelineRun", pipelineRunLister(p, cs), func(pipelineRunName string) error {
+		return cs.Tekton.TektonV1alpha1().PipelineRuns(p.Namespace()).Delete(pipelineRunName, &metav1.DeleteOptions{})
+	})
+	deletedPipelineNames := d.Delete(s, pNames)
 	if opts.DeleteAll {
-		d.WithRelated("PipelineRun", pipelineRunLister(p, cs), func(pipelineRunName string) error {
-			return cs.Tekton.TektonV1alpha1().PipelineRuns(p.Namespace()).Delete(pipelineRunName, &metav1.DeleteOptions{})
-		})
+		d.DeleteRelated(s, deletedPipelineNames)
 	}
-	return d.Execute(s, pNames)
+	d.PrintSuccesses(s)
+	return d.Errors()
 }
 
 func pipelineRunLister(p cli.Params, cs *cli.Clients) func(string) ([]string, error) {

pkg/cmd/pipeline/delete_test.go

@@ -36,7 +36,7 @@ func TestPipelineDelete(t *testing.T) {
 	clock := clockwork.NewFakeClock()
 
 	seeds := make([]pipelinetest.Clients, 0)
-	for i := 0; i < 5; i++ {
+	for i := 0; i < 7; i++ {
 		cs, _ := test.SeedTestData(t, pipelinetest.Data{
 			Pipelines: []*v1alpha1.Pipeline{
 				tb.Pipeline("pipeline", "ns",

pkg/cmd/pipelineresource/delete.go

@@ -82,5 +82,7 @@ func deleteResources(s *cli.Stream, p cli.Params, preNames []string) error {
 	d := deleter.New("PipelineResource", func(resourceName string) error {
 		return cs.Tekton.TektonV1alpha1().PipelineResources(p.Namespace()).Delete(resourceName, &metav1.DeleteOptions{})
 	})
-	return d.Execute(s, preNames)
+	d.Delete(s, preNames)
+	d.PrintSuccesses(s)
+	return d.Errors()
 }

pkg/cmd/pipelinerun/delete.go

@@ -15,6 +15,7 @@
 package pipelinerun
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -27,7 +28,7 @@ import (
 )
 
 func deleteCommand(p cli.Params) *cobra.Command {
-	opts := &options.DeleteOptions{Resource: "pipelinerun", ForceDelete: false}
+	opts := &options.DeleteOptions{Resource: "pipelinerun", ForceDelete: false, ParentResource: "pipeline"}
 	f := cliopts.NewPrintFlags("delete")
 	eg := `Delete PipelineRuns with names 'foo' and 'bar' in namespace 'quux':
 
@@ -43,7 +44,7 @@ or
 		Aliases:      []string{"rm"},
 		Short:        "Delete pipelineruns in a namespace",
 		Example:      eg,
-		Args:         cobra.MinimumNArgs(1),
+		Args:         cobra.MinimumNArgs(0),
 		SilenceUsage: true,
 		Annotations: map[string]string{
 			"commandType": "main",
@@ -63,22 +64,53 @@ or
 				return err
 			}
 
-			return deletePipelineRuns(s, p, args)
+			return deletePipelineRuns(s, p, args, opts.ParentResourceName)
 		},
 	}
 	f.AddFlags(c)
 	c.Flags().BoolVarP(&opts.ForceDelete, "force", "f", false, "Whether to force deletion (default: false)")
+	c.Flags().StringVarP(&opts.ParentResourceName, "pipeline", "p", "", "The name of a pipeline whose pipelineruns should be deleted (does not delete the pipeline)")
 	_ = c.MarkZshCompPositionalArgumentCustom(1, "__tkn_get_pipelinerun")
 	return c
 }
 
-func deletePipelineRuns(s *cli.Stream, p cli.Params, prNames []string) error {
+func deletePipelineRuns(s *cli.Stream, p cli.Params, prNames []string, parentPipeline string) error {
 	cs, err := p.Clients()
 	if err != nil {
 		return fmt.Errorf("failed to create tekton client")
 	}
-	d := deleter.New("PipelineRun", func(pipelineRunName string) error {
-		return cs.Tekton.TektonV1alpha1().PipelineRuns(p.Namespace()).Delete(pipelineRunName, &metav1.DeleteOptions{})
-	})
-	return d.Execute(s, prNames)
+	var d *deleter.Deleter
+	if parentPipeline == "" {
+		d = deleter.New("PipelineRun", func(pipelineRunName string) error {
+			return cs.Tekton.TektonV1alpha1().PipelineRuns(p.Namespace()).Delete(pipelineRunName, &metav1.DeleteOptions{})
+		})
+		d.Delete(s, prNames)
+	} else {
+		d = deleter.New("Pipeline", func(_ string) error {
+			return errors.New("the pipeline should not be deleted")
+		})
+		d.WithRelated("PipelineRun", pipelineRunLister(p, cs), func(pipelineRunName string) error {
+			return cs.Tekton.TektonV1alpha1().PipelineRuns(p.Namespace()).Delete(pipelineRunName, &metav1.DeleteOptions{})
+		})
+		d.DeleteRelated(s, []string{parentPipeline})
+	}
+	d.PrintSuccesses(s)
+	return d.Errors()
+}
+
+func pipelineRunLister(p cli.Params, cs *cli.Clients) func(string) ([]string, error) {
+	return func(pipelineName string) ([]string, error) {
+		lOpts := metav1.ListOptions{
+			LabelSelector: fmt.Sprintf("tekton.dev/pipeline=%s", pipelineName),
+		}
+		pipelineRuns, err := cs.Tekton.TektonV1alpha1().PipelineRuns(p.Namespace()).List(lOpts)
+		if err != nil {
+			return nil, err
+		}
+		var names []string
+		for _, pr := range pipelineRuns.Items {
+			names = append(names, pr.Name)
+		}
+		return names, nil
+	}
 }

pkg/cmd/pipelinerun/delete_test.go

@@ -130,6 +130,22 @@ func TestPipelineRunDelete(t *testing.T) {
 			wantError:   true,
 			want:        "failed to delete pipelinerun \"nonexistent\": pipelineruns.tekton.dev \"nonexistent\" not found",
 		},
+		{
+			name:        "Attempt remove forgetting to include pipelinerun names",
+			command:     []string{"rm", "-n", "ns"},
+			input:       seeds[2],
+			inputStream: nil,
+			wantError:   true,
+			want:        "must provide pipelineruns to delete or --pipeline flag",
+		},
+		{
+			name:        "Remove pipelineruns of a pipeline",
+			command:     []string{"rm", "--pipeline", "pipeline", "-n", "ns"},
+			input:       seeds[0],
+			inputStream: strings.NewReader("y"),
+			wantError:   false,
+			want:        `Are you sure you want to delete all pipelineruns related to pipeline "pipeline" (y/n): `,
+		},
 	}
 
 	for _, tp := range testParams {
@@ -144,12 +160,13 @@ func TestPipelineRunDelete(t *testing.T) {
 			out, err := test.ExecuteCommand(pipelinerun, tp.command...)
 			if tp.wantError {
 				if err == nil {
-					t.Errorf("Error expected here")
+					t.Errorf("error expected here")
+				} else {
+					test.AssertOutput(t, tp.want, err.Error())
 				}
-				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)
 			}

pkg/cmd/task/delete.go

@@ -68,7 +68,7 @@ or
 	}
 	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)")
+	c.Flags().BoolVarP(&opts.DeleteAll, "all", "a", false, "Whether to also delete related resources (taskruns) (default: false)")
 
 	_ = c.MarkZshCompPositionalArgumentCustom(1, "__tkn_get_task")
 	return c
@@ -82,12 +82,15 @@ func deleteTask(opts *options.DeleteOptions, s *cli.Stream, p cli.Params, taskNa
 	d := deleter.New("Task", func(taskName string) error {
 		return cs.Tekton.TektonV1alpha1().Tasks(p.Namespace()).Delete(taskName, &metav1.DeleteOptions{})
 	})
+	d.WithRelated("TaskRun", taskRunLister(p, cs), func(taskRunName string) error {
+		return cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).Delete(taskRunName, &metav1.DeleteOptions{})
+	})
+	deletedTaskNames := d.Delete(s, taskNames)
 	if opts.DeleteAll {
-		d.WithRelated("TaskRun", taskRunLister(p, cs), func(taskRunName string) error {
-			return cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).Delete(taskRunName, &metav1.DeleteOptions{})
-		})
+		d.DeleteRelated(s, deletedTaskNames)
 	}
-	return d.Execute(s, taskNames)
+	d.PrintSuccesses(s)
+	return d.Errors()
 }
 
 func taskRunLister(p cli.Params, cs *cli.Clients) func(string) ([]string, error) {

pkg/cmd/taskrun/delete.go

@@ -15,6 +15,7 @@
 package taskrun
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -27,7 +28,7 @@ import (
 )
 
 func deleteCommand(p cli.Params) *cobra.Command {
-	opts := &options.DeleteOptions{Resource: "taskrun", ForceDelete: false}
+	opts := &options.DeleteOptions{Resource: "taskrun", ForceDelete: false, ParentResource: "task"}
 	f := cliopts.NewPrintFlags("delete")
 	eg := `Delete TaskRuns with names 'foo' and 'bar' in namespace 'quux':
 
@@ -43,7 +44,7 @@ or
 		Aliases:      []string{"rm"},
 		Short:        "Delete taskruns in a namespace",
 		Example:      eg,
-		Args:         cobra.MinimumNArgs(1),
+		Args:         cobra.MinimumNArgs(0),
 		SilenceUsage: true,
 		Annotations: map[string]string{
 			"commandType": "main",
@@ -63,22 +64,53 @@ or
 				return err
 			}
 
-			return deleteTaskRuns(s, p, args)
+			return deleteTaskRuns(s, p, args, opts.ParentResourceName)
 		},
 	}
 	f.AddFlags(c)
 	c.Flags().BoolVarP(&opts.ForceDelete, "force", "f", false, "Whether to force deletion (default: false)")
+	c.Flags().StringVarP(&opts.ParentResourceName, "task", "t", "", "The name of a task whose taskruns should be deleted (does not delete the task)")
 	_ = c.MarkZshCompPositionalArgumentCustom(1, "__tkn_get_taskrun")
 	return c
 }
 
-func deleteTaskRuns(s *cli.Stream, p cli.Params, trNames []string) error {
+func deleteTaskRuns(s *cli.Stream, p cli.Params, trNames []string, parentTask string) error {
 	cs, err := p.Clients()
 	if err != nil {
 		return fmt.Errorf("failed to create tekton client")
 	}
-	d := deleter.New("TaskRun", func(taskRunName string) error {
-		return cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).Delete(taskRunName, &metav1.DeleteOptions{})
-	})
-	return d.Execute(s, trNames)
+	var d *deleter.Deleter
+	if parentTask == "" {
+		d = deleter.New("TaskRun", func(taskRunName string) error {
+			return cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).Delete(taskRunName, &metav1.DeleteOptions{})
+		})
+		d.Delete(s, trNames)
+	} else {
+		d = deleter.New("Task", func(_ string) error {
+			return errors.New("the task should not be deleted")
+		})
+		d.WithRelated("TaskRun", taskRunLister(p, cs), func(taskRunName string) error {
+			return cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).Delete(taskRunName, &metav1.DeleteOptions{})
+		})
+		d.DeleteRelated(s, []string{parentTask})
+	}
+	d.PrintSuccesses(s)
+	return d.Errors()
+}
+
+func taskRunLister(p cli.Params, cs *cli.Clients) func(string) ([]string, error) {
+	return func(taskName string) ([]string, error) {
+		lOpts := metav1.ListOptions{
+			LabelSelector: fmt.Sprintf("tekton.dev/task=%s", taskName),
+		}
+		taskRuns, err := cs.Tekton.TektonV1alpha1().TaskRuns(p.Namespace()).List(lOpts)
+		if err != nil {
+			return nil, err
+		}
+		var names []string
+		for _, tr := range taskRuns.Items {
+			names = append(names, tr.Name)
+		}
+		return names, nil
+	}
 }