Display results in task/taskrun describe command

The results declared in the task will be displayed in the output of task/taskrun describe command

Signed-off-by: Chetan Banavikalmutt <[email protected]>

pkg/cmd/task/describe.go

@@ -91,6 +91,17 @@ const describeTemplate = `{{decorate "bold" "Name"}}: {{ .Task.Name }}
 {{- end }}
 {{- end }}
 
+{{decorate "results" ""}}{{decorate "underline bold" "Results\n"}}
+
+{{- if eq (len .Task.Spec.Results) 0 }}
+ No results
+{{- else }}
+ NAME DESCRIPTION
+{{- range $result := .Task.Spec.Results }}
+ {{ decorate "bullet" $result.Name }} {{ formatDesc $result.Description }}
+{{- end }}
+{{- end }}
+
 {{decorate "steps" ""}}{{decorate "underline bold" "Steps\n"}}
 
 {{- if eq (len .Task.Spec.Steps) 0 }}

pkg/cmd/task/describe_test.go

@@ -679,3 +679,65 @@ func TestTaskV1beta1Describe_Full(t *testing.T) {
  }
  golden.Assert(t, out, fmt.Sprintf("%s.golden", t.Name()))
 }
+
+func TestTaskDescribe_With_Results(t *testing.T) {
+ tasks := []*v1beta1.Task{
+ {
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: "ns",
+ Name: "task-1",
+ },
+ Spec: v1beta1.TaskSpec{
+ Description: "a test description",
+ Steps: []v1beta1.Step{
+ {
+ Container: corev1.Container{
+ Name: "hello",
+ Image: "busybox",
+ },
+ },
+ },
+ Results: []v1beta1.TaskResult{
+ {
+ Name: "result-1",
+ Description: "This is a description for result 1",
+ },
+ {
+ Name: "result-2",
+ Description: "This is a description for result 2",
+ },
+ {
+ Name: "result-3",
+ },
+ },
+ },
+ },
+ }
+
+ namespaces := []*corev1.Namespace{
+ {
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "ns",
+ },
+ },
+ }
+
+ version := "v1beta1"
+ tdc := testDynamic.Options{}
+ dynamic, err := tdc.Client(
+ cb.UnstructuredV1beta1T(tasks[0], version),
+ )
+ if err != nil {
+ t.Errorf("unable to create dynamic client: %v", err)
+ }
+
+ cs, _ := test.SeedV1beta1TestData(t, pipelinev1beta1test.Data{Tasks: tasks, Namespaces: namespaces})
+ cs.Pipeline.Resources = cb.APIResourceList(version, []string{"task", "taskrun"})
+ p := &test.Params{Tekton: cs.Pipeline, Kube: cs.Kube, Dynamic: dynamic}
+ task := Command(p)
+ out, err := test.ExecuteCommand(task, "desc", "task-1")
+ if err != nil {
+ t.Errorf("Unexpected error: %v", err)
+ }
+ golden.Assert(t, out, fmt.Sprintf("%s.golden", t.Name()))
+}

pkg/cmd/task/testdata/TestTaskDescribe_Full.golden

@@ -23,6 +23,10 @@ Params
  print string params with sting t... somethingdifferent
  output array [booms booms booms]
 
+Results
+
+ No results
+
 Steps
 
  hello

pkg/cmd/task/testdata/TestTaskDescribe_OnlyName.golden

@@ -13,6 +13,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
  No steps

pkg/cmd/task/testdata/TestTaskDescribe_OnlyNameDiffNameSpace.golden

@@ -13,6 +13,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
  No steps

pkg/cmd/task/testdata/TestTaskDescribe_OnlyNameParams.golden

@@ -16,6 +16,10 @@ Params
  myprint string testing very long d... ---
  myarray array ---
 
+Results
+
+ No results
+
 Steps
 
  No steps

pkg/cmd/task/testdata/TestTaskDescribe_With_Results.golden

@@ -0,0 +1,30 @@
+Name: task-1
+Namespace: ns
+Description: a test description
+
+Input Resources
+
+ No input resources
+
+Output Resources
+
+ No output resources
+
+Params
+
+ No params
+
+Results
+
+ NAME DESCRIPTION
+ result-1 This is a descripti...
+ result-2 This is a descripti...
+ result-3 
+
+Steps
+
+ hello
+
+Taskruns
+
+ No taskruns

pkg/cmd/task/testdata/TestTaskDescribe_WithoutNameIfOnlyOneTaskPresent.golden

@@ -13,6 +13,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
  No steps

pkg/cmd/task/testdata/TestTaskDescribe_WithoutNameIfOnlyOneV1beta1TaskPresent.golden

@@ -13,6 +13,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
  No steps

pkg/cmd/task/testdata/TestTaskV1beta1Describe_Full.golden

@@ -23,6 +23,10 @@ Params
  print string somethingdifferent
  output array [booms booms booms]
 
+Results
+
+ No results
+
 Steps
 
  hello

pkg/cmd/taskrun/describe_test.go

@@ -956,3 +956,72 @@ func TestTaskRunDescribe_last(t *testing.T) {
  }
  golden.Assert(t, actual, fmt.Sprintf("%s.golden", t.Name()))
 }
+
+func TestTaskRunDescribe_With_Results(t *testing.T) {
+ clock := clockwork.NewFakeClock()
+ taskRuns := []*v1beta1.TaskRun{
+ {
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: "ns",
+ Name: "tr-1",
+ Labels: map[string]string{"tekton.dev/task": "task-1"},
+ },
+ Spec: v1beta1.TaskRunSpec{
+ TaskRef: &v1beta1.TaskRef{
+ Name: "task-1",
+ },
+ },
+ Status: v1beta1.TaskRunStatus{
+ Status: duckv1beta1.Status{
+ Conditions: duckv1beta1.Conditions{
+ {
+ Status: corev1.ConditionFalse,
+ Reason: v1beta1.TaskRunReasonFailed.String(),
+ },
+ },
+ },
+ TaskRunStatusFields: v1beta1.TaskRunStatusFields{
+ StartTime: &metav1.Time{Time: clock.Now().Add(-10 * time.Minute)},
+ CompletionTime: &metav1.Time{Time: clock.Now().Add(-5 * time.Minute)},
+ TaskRunResults: []v1alpha1.TaskRunResult{
+ {
+ Name: "result-1",
+ Value: "value-1",
+ },
+ {
+ Name: "result-2",
+ Value: "value-2",
+ },
+ },
+ },
+ },
+ },
+ }
+
+ namespaces := []*corev1.Namespace{
+ {
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "ns",
+ },
+ },
+ }
+
+ version := "v1beta1"
+ tdc := testDynamic.Options{}
+ dynamic, err := tdc.Client(
+ cb.UnstructuredV1beta1TR(taskRuns[0], version),
+ )
+ if err != nil {
+ t.Errorf("unable to create dynamic client: %v", err)
+ }
+ cs, _ := test.SeedV1beta1TestData(t, pipelinev1beta1test.Data{Namespaces: namespaces, TaskRuns: taskRuns})
+ cs.Pipeline.Resources = cb.APIResourceList(version, []string{"taskrun"})
+ p := &test.Params{Tekton: cs.Pipeline, Kube: cs.Kube, Dynamic: dynamic}
+ taskrun := Command(p)
+ got, err := test.ExecuteCommand(taskrun, "desc", "tr-1")
+
+ if err != nil {
+ t.Errorf("Unexpected error: %v", err)
+ }
+ golden.Assert(t, got, fmt.Sprintf("%s.golden", t.Name()))
+}

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_With_Results.golden

@@ -0,0 +1,36 @@
+Name: tr-1
+Namespace: ns
+Task Ref: task-1
+Labels:
+ tekton.dev/task=task-1
+
+Status
+
+STARTED DURATION STATUS
+10 minutes ago 5 minutes Failed
+
+Input Resources
+
+ No input resources
+
+Output Resources
+
+ No output resources
+
+Params
+
+ No params
+
+Results
+
+ NAME VALUE
+ result-1 value-1
+ result-2 value-2
+
+Steps
+
+No steps
+
+Sidecars
+
+No sidecars

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_cancel_taskrun.golden

@@ -22,6 +22,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
 No steps

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_empty_taskrun.golden

@@ -22,6 +22,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
 No steps

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_failed.golden

@@ -24,6 +24,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
 No steps

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_last.golden

@@ -26,6 +26,10 @@ Params
  input param
  input2 param2
 
+Results
+
+ No results
+
 Steps
 
  NAME STATUS

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_lastV1beta1.golden

@@ -21,6 +21,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
 No steps

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_no_resourceref.golden

@@ -26,6 +26,10 @@ Params
  input param
  input2 param2
 
+Results
+
+ No results
+
 Steps
 
  NAME STATUS

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_no_taskref.golden

@@ -22,6 +22,10 @@ Params
 
  No params
 
+Results
+
+ No results
+
 Steps
 
 No steps

pkg/cmd/taskrun/testdata/TestTaskRunDescribe_only_taskrun.golden

@@ -26,6 +26,10 @@ Params
  input param
  input2 param2
 
+Results
+
+ No results
+
 Steps
 
  NAME STATUS