Show Sidecar Names with tkn tr desc

pkg/cmd/taskrun/describe_test.go

@@ -40,6 +40,20 @@ var (
 	reasonRunning   = corev1.ContainerStateRunning{StartedAt: metav1.Time{Time: time.Now()}}
 )
 
+// Pass one or more names for sidecar containers for testing with tkn tr describe.
+// Replace with test builder option once https://github.com/tektoncd/pipeline/issues/2078
+// is closed.
+func sidecarState(names ...string) tb.TaskRunStatusOp {
+	return func(s *v1alpha1.TaskRunStatus) {
+		for _, name := range names {
+			sidecar := &v1alpha1.SidecarState{
+				Name: name,
+			}
+			s.Sidecars = append(s.Sidecars, *sidecar)
+		}
+	}
+}
+
 func TestTaskRunDescribe_invalid_namespace(t *testing.T) {
 	cs, _ := test.SeedTestData(t, pipelinetest.Data{
 		Namespaces: []*corev1.Namespace{
@@ -362,9 +376,11 @@ func TestTaskRunDescribe_step_status_default(t *testing.T) {
 	golden.Assert(t, actual, fmt.Sprintf("%s.golden", t.Name()))
 }
 
-func TestTaskRunDescribe_step_status_pending(t *testing.T) {
+func TestTaskRunDescribe_step_status_pending_one_sidecar(t *testing.T) {
 	clock := clockwork.NewFakeClock()
 
+	sidecarState := sidecarState("sidecar1")
+
 	trs := []*v1alpha1.TaskRun{
 		tb.TaskRun("tr-1", "ns",
 			tb.TaskRunStatus(
@@ -382,6 +398,7 @@ func TestTaskRunDescribe_step_status_pending(t *testing.T) {
 					cb.StepName("step2"),
 					tb.SetStepStateWaiting(reasonWaiting),
 				),
+				sidecarState,
 			),
 			tb.TaskRunSpec(
 				tb.TaskRunTaskRef("t1"),
@@ -417,9 +434,11 @@ func TestTaskRunDescribe_step_status_pending(t *testing.T) {
 	golden.Assert(t, actual, fmt.Sprintf("%s.golden", t.Name()))
 }
 
-func TestTaskRunDescribe_step_status_running(t *testing.T) {
+func TestTaskRunDescribe_step_status_running_multiple_sidecars(t *testing.T) {
 	clock := clockwork.NewFakeClock()
 
+	sidecarState := sidecarState("sidecar1", "sidecar2")
+
 	trs := []*v1alpha1.TaskRun{
 		tb.TaskRun("tr-1", "ns",
 			tb.TaskRunStatus(
@@ -437,6 +456,7 @@ func TestTaskRunDescribe_step_status_running(t *testing.T) {
 					cb.StepName("step2"),
 					tb.SetStepStateRunning(reasonRunning),
 				),
+				sidecarState,
 			),
 			tb.TaskRunSpec(
 				tb.TaskRunTaskRef("t1"),

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_cancel_taskrun.golden

@@ -25,3 +25,7 @@ No params
 Steps
 
 No steps
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_empty_taskrun.golden

@@ -22,3 +22,7 @@ No params
 Steps
 
 No steps
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_failed.golden

@@ -26,3 +26,7 @@ No params
 Steps
 
 No steps
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_no_resourceref.golden

@@ -30,3 +30,7 @@ Steps
  NAME    STATUS
  step1   Completed
  step2   Completed
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_no_taskref.golden

@@ -25,3 +25,7 @@ No params
 Steps
 
 No steps
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_only_taskrun.golden

@@ -30,3 +30,7 @@ Steps
  NAME    STATUS
  step1   Completed
  step2   Completed
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_step_status_default.golden

@@ -30,3 +30,7 @@ Steps
  NAME    STATUS
  step1   Error
  step2   ---
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_step_status_pending.golden → pkg/cmd/taskrun/testdata/TestTaskRunDescribe_step_status_pending_one_sidecar.golden

@@ -30,3 +30,8 @@ Steps
  NAME    STATUS
  step1   PodInitializing
  step2   PodInitializing
+
+Sidecars
+
+ NAME
+ sidecar1

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_step_status_running.golden → pkg/cmd/taskrun/testdata/TestTaskRunDescribe_step_status_running_multiple_sidecars.golden

@@ -30,3 +30,9 @@ Steps
  NAME    STATUS
  step1   Running
  step2   Running
+
+Sidecars
+
+ NAME
+ sidecar1
+ sidecar2

pkg/formatted/color.go

@@ -64,6 +64,8 @@ func DecorateAttr(attrString, message string) string {
 		return fmt.Sprintf("💌 ")
 	case "taskruns":
 		return fmt.Sprintf("🗂  ")
+	case "sidecars":
+		return fmt.Sprintf("🚗 ")
 	}
 
 	attr := color.Reset

pkg/formatted/color_test.go

@@ -80,13 +80,13 @@ func TestDecoration(t *testing.T) {
 	funcMap := template.FuncMap{
 		"decorate": DecorateAttr,
 	}
-	aTemplate := `{{decorate "bullet" "Foo"}} {{decorate "resources" ""}}{{decorate "params" ""}}{{decorate "tasks" ""}}{{decorate "pipelineruns" ""}}{{decorate "status" ""}}{{decorate "inputresources" ""}}{{decorate "outputresources" ""}}{{decorate "steps" ""}}{{decorate "message" ""}}{{decorate "taskruns" ""}}{{decorate "red" "Red"}} {{decorate "underline" "Foo"}}`
+	aTemplate := `{{decorate "bullet" "Foo"}} {{decorate "resources" ""}}{{decorate "params" ""}}{{decorate "tasks" ""}}{{decorate "pipelineruns" ""}}{{decorate "status" ""}}{{decorate "inputresources" ""}}{{decorate "outputresources" ""}}{{decorate "steps" ""}}{{decorate "message" ""}}{{decorate "taskruns" ""}}{{decorate "sidecars" ""}}{{decorate "red" "Red"}} {{decorate "underline" "Foo"}}`
 	processed := template.Must(template.New("Describe Pipeline").Funcs(funcMap).Parse(aTemplate))
 	buf := new(bytes.Buffer)
 
 	if err := processed.Execute(buf, nil); err != nil {
 		t.Error("Could not process the template.")
 	}
-	test.AssertOutput(t, "∙ Foo 📦 ⚓ 🗒  ⛩  🌡️  📨 📡 🦶 💌 🗂  \x1b[91mRed\x1b[0m \x1b[4mFoo\x1b[0m", buf.String())
+	test.AssertOutput(t, "∙ Foo 📦 ⚓ 🗒  ⛩  🌡️  📨 📡 🦶 💌 🗂  🚗 \x1b[91mRed\x1b[0m \x1b[4mFoo\x1b[0m", buf.String())
 
 }

pkg/helper/taskrun/description/taskrun_description.go

@@ -91,6 +91,17 @@ No steps
  {{decorate "bullet" $step.Name }}	{{ $reason }}
 {{- end }}
 {{- end }}
+
+{{decorate "sidecars" ""}}{{decorate "underline bold" "Sidecars"}}
+{{$sidecars := .TaskRun.Status.Sidecars }}
+{{- $l := len $sidecars }}{{ if eq $l 0 }}
+No sidecars
+{{- else }}
+ NAME
+{{- range $sidecar := $sidecars }}
+ {{decorate "bullet" $sidecar.Name }}
+{{- end }}
+{{- end }}
 `
 
 func sortStepStatesByStartTime(steps []v1alpha1.StepState) []v1alpha1.StepState {