From 903a4eb5c80ace631aa15d2e20bd81eea737141e Mon Sep 17 00:00:00 2001
From: Jerome Ju <jeromeju@google.com>
Date: Wed, 8 Mar 2023 20:22:11 +0000
Subject: [PATCH] Remove PipelineResourceResultType of PipelineResourceResult
 Struct

This commit removes the PipelineResourceResultType of
PipelineResourceResult Struct given now the PipelineResources have been
removed.
---
 pkg/apis/pipeline/v1beta1/resource_types.go |  2 --
 pkg/apis/pipeline/v1beta1/task_types.go     |  4 +---
 pkg/pod/status.go                           |  2 --
 pkg/pod/status_test.go                      | 18 ++++--------------
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/pkg/apis/pipeline/v1beta1/resource_types.go b/pkg/apis/pipeline/v1beta1/resource_types.go
index 5280c62d8fe..ddbf9d586fd 100644
--- a/pkg/apis/pipeline/v1beta1/resource_types.go
+++ b/pkg/apis/pipeline/v1beta1/resource_types.go
@@ -63,8 +63,6 @@ func (r *ResultType) UnmarshalJSON(data []byte) error {
 	switch asString {
 	case "TaskRunResult":
 		*r = TaskRunResultType
-	case "PipelineResourceResult":
-		*r = PipelineResourceResultType
 	case "InternalTektonResult":
 		*r = InternalTektonResultType
 	default:
diff --git a/pkg/apis/pipeline/v1beta1/task_types.go b/pkg/apis/pipeline/v1beta1/task_types.go
index d400d93cb8f..49a198bd761 100644
--- a/pkg/apis/pipeline/v1beta1/task_types.go
+++ b/pkg/apis/pipeline/v1beta1/task_types.go
@@ -27,10 +27,8 @@ import (
 const (
 	// TaskRunResultType default task run result value
 	TaskRunResultType ResultType = 1
-	// PipelineResourceResultType default pipeline result value
-	PipelineResourceResultType = 2
 	// InternalTektonResultType default internal tekton result value
-	InternalTektonResultType = 3
+	InternalTektonResultType = 2
 	// UnknownResultType default unknown result type value
 	UnknownResultType = 10
 )
diff --git a/pkg/pod/status.go b/pkg/pod/status.go
index 47ab62cdcf7..15a356c2ce5 100644
--- a/pkg/pod/status.go
+++ b/pkg/pod/status.go
@@ -290,8 +290,6 @@ func filterResultsAndResources(results []v1beta1.PipelineResourceResult, specRes
 		case v1beta1.InternalTektonResultType:
 			// Internal messages are ignored because they're not used as external result
 			continue
-		case v1beta1.PipelineResourceResultType:
-			fallthrough
 		default:
 			pipelineResourceResults = append(pipelineResourceResults, r)
 			filteredResults = append(filteredResults, r)
diff --git a/pkg/pod/status_test.go b/pkg/pod/status_test.go
index 62f6c46105c..831b74a0452 100644
--- a/pkg/pod/status_test.go
+++ b/pkg/pod/status_test.go
@@ -870,7 +870,7 @@ func TestMakeTaskRunStatus(t *testing.T) {
 				Name: "step-pear",
 				State: corev1.ContainerState{
 					Terminated: &corev1.ContainerStateTerminated{
-						Message: `[{"key":"resultNameOne","value":"","type":2}, {"key":"resultNameTwo","value":"","type":3}, {"key":"resultNameThree","value":"","type":1}]`},
+						Message: `[{"key":"resultNameOne","value":"","type":2}, {"key":"resultNameThree","value":"","type":1}]`},
 				},
 			}},
 		},
@@ -880,17 +880,12 @@ func TestMakeTaskRunStatus(t *testing.T) {
 				Steps: []v1beta1.StepState{{
 					ContainerState: corev1.ContainerState{
 						Terminated: &corev1.ContainerStateTerminated{
-							Message: `[{"key":"resultNameOne","value":"","type":2},{"key":"resultNameThree","value":"","type":1}]`,
+							Message: `[{"key":"resultNameThree","value":"","type":1}]`,
 						}},
 					Name:          "pear",
 					ContainerName: "step-pear",
 				}},
 				Sidecars: []v1beta1.SidecarState{},
-				ResourcesResult: []v1beta1.PipelineResourceResult{{
-					Key:        "resultNameOne",
-					Value:      "",
-					ResultType: v1beta1.PipelineResourceResultType,
-				}},
 				TaskRunResults: []v1beta1.TaskRunResult{{
 					Name:  "resultNameThree",
 					Type:  v1beta1.ResultsTypeString,
@@ -908,7 +903,7 @@ func TestMakeTaskRunStatus(t *testing.T) {
 				Name: "step-pear",
 				State: corev1.ContainerState{
 					Terminated: &corev1.ContainerStateTerminated{
-						Message: `[{"key":"resultNameOne","value":"","type":"PipelineResourceResult"}, {"key":"resultNameTwo","value":"","type":"InternalTektonResult"}, {"key":"resultNameThree","value":"","type":"TaskRunResult"}]`,
+						Message: `[{"key":"resultNameTwo","value":"","type":"InternalTektonResult"}, {"key":"resultNameThree","value":"","type":"TaskRunResult"}]`,
 					},
 				},
 			}},
@@ -919,17 +914,12 @@ func TestMakeTaskRunStatus(t *testing.T) {
 				Steps: []v1beta1.StepState{{
 					ContainerState: corev1.ContainerState{
 						Terminated: &corev1.ContainerStateTerminated{
-							Message: `[{"key":"resultNameOne","value":"","type":2},{"key":"resultNameThree","value":"","type":1}]`,
+							Message: `[{"key":"resultNameThree","value":"","type":1}]`,
 						}},
 					Name:          "pear",
 					ContainerName: "step-pear",
 				}},
 				Sidecars: []v1beta1.SidecarState{},
-				ResourcesResult: []v1beta1.PipelineResourceResult{{
-					Key:        "resultNameOne",
-					Value:      "",
-					ResultType: v1beta1.PipelineResourceResultType,
-				}},
 				TaskRunResults: []v1beta1.TaskRunResult{{
 					Name:  "resultNameThree",
 					Type:  v1beta1.ResultsTypeString,