Remove ResourceResult field with the removal of PipelineResources

The `resourcesResult` field of TaskRun is removed along with the removal of `pipelineResources`.
tektoncd · Mar 6, 2023 · 84bd64d · 84bd64d
1 parent eb0486a
commit 84bd64d
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 248 deletions.
diff --git a/docs/pipeline-api.md b/docs/pipeline-api.md
@@ -9593,9 +9593,6 @@ string
 </table>
 <h3 id="tekton.dev/v1beta1.PipelineResourceResult">PipelineResourceResult
 </h3>
-<p>
-(<em>Appears on:</em><a href="#tekton.dev/v1beta1.TaskRunStatusFields">TaskRunStatusFields</a>)
-</p>
 <div>
 <p>PipelineResourceResult used to export the image name and digest as json</p>
 </div>
@@ -13589,21 +13586,6 @@ All TaskRunStatus stored in RetriesStatus will have no date within the RetriesSt
 </tr>
 <tr>
 <td>
-<code>resourcesResult</code><br/>
-<em>
-<a href="#tekton.dev/v1beta1.PipelineResourceResult">
-[]PipelineResourceResult
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Results from Resources built during the TaskRun. currently includes
-the digest of build container images</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>taskResults</code><br/>
 <em>
 <a href="#tekton.dev/v1beta1.TaskRunResult">

diff --git a/pkg/apis/pipeline/v1beta1/openapi_generated.go b/pkg/apis/pipeline/v1beta1/openapi_generated.go
diff --git a/pkg/apis/pipeline/v1beta1/pipelinerun_conversion_test.go b/pkg/apis/pipeline/v1beta1/pipelinerun_conversion_test.go
@@ -97,11 +97,6 @@ var (
 					ImageID:       "image-id",
 					ContainerName: "sidecar-error",
 				}},
-				ResourcesResult: []v1beta1.PipelineResourceResult{{
-					Key:          "digest",
-					Value:        "sha256:1234",
-					ResourceName: "source-image",
-				}},
 			},
 		},
 		WhenExpressions: v1beta1.WhenExpressions{{

diff --git a/pkg/apis/pipeline/v1beta1/swagger.json b/pkg/apis/pipeline/v1beta1/swagger.json
@@ -2933,15 +2933,6 @@
           "description": "Provenance contains some key authenticated metadata about how a software artifact was built (what sources, what inputs/outputs, etc.).",
           "$ref": "#/definitions/v1beta1.Provenance"
         },
-        "resourcesResult": {
-          "description": "Results from Resources built during the TaskRun. currently includes the digest of build container images",
-          "type": "array",
-          "items": {
-            "default": {},
-            "$ref": "#/definitions/v1beta1.PipelineResourceResult"
-          },
-          "x-kubernetes-list-type": "atomic"
-        },
         "retriesStatus": {
           "description": "RetriesStatus contains the history of TaskRunStatus in case of a retry in order to keep record of failures. All TaskRunStatus stored in RetriesStatus will have no date within the RetriesStatus as is redundant.",
           "type": "array",
@@ -3025,15 +3016,6 @@
           "description": "Provenance contains some key authenticated metadata about how a software artifact was built (what sources, what inputs/outputs, etc.).",
           "$ref": "#/definitions/v1beta1.Provenance"
         },
-        "resourcesResult": {
-          "description": "Results from Resources built during the TaskRun. currently includes the digest of build container images",
-          "type": "array",
-          "items": {
-            "default": {},
-            "$ref": "#/definitions/v1beta1.PipelineResourceResult"
-          },
-          "x-kubernetes-list-type": "atomic"
-        },
         "retriesStatus": {
           "description": "RetriesStatus contains the history of TaskRunStatus in case of a retry in order to keep record of failures. All TaskRunStatus stored in RetriesStatus will have no date within the RetriesStatus as is redundant.",
           "type": "array",

diff --git a/pkg/apis/pipeline/v1beta1/taskrun_conversion.go b/pkg/apis/pipeline/v1beta1/taskrun_conversion.go
@@ -47,9 +47,6 @@ func (tr *TaskRun) ConvertTo(ctx context.Context, to apis.Convertible) error {
 		if err := serializeTaskRunCloudEvents(&sink.ObjectMeta, &tr.Status); err != nil {
 			return err
 		}
-		if err := serializeTaskRunResourcesResult(&sink.ObjectMeta, &tr.Status); err != nil {
-			return err
-		}
 		if err := tr.Status.ConvertTo(ctx, &sink.Status); err != nil {
 			return err
 		}
@@ -124,9 +121,6 @@ func (tr *TaskRun) ConvertFrom(ctx context.Context, from apis.Convertible) error
 		if err := deserializeTaskRunCloudEvents(&tr.ObjectMeta, &tr.Status); err != nil {
 			return err
 		}
-		if err := deserializeTaskRunResourcesResult(&tr.ObjectMeta, &tr.Status); err != nil {
-			return err
-		}
 		if err := tr.Status.ConvertFrom(ctx, source.Status); err != nil {
 			return err
 		}
@@ -397,22 +391,3 @@ func deserializeTaskRunCloudEvents(meta *metav1.ObjectMeta, status *TaskRunStatu
 	}
 	return nil
 }
-
-func serializeTaskRunResourcesResult(meta *metav1.ObjectMeta, status *TaskRunStatus) error {
-	if status.ResourcesResult == nil {
-		return nil
-	}
-	return version.SerializeToMetadata(meta, status.ResourcesResult, resourcesResultAnnotationKey)
-}
-
-func deserializeTaskRunResourcesResult(meta *metav1.ObjectMeta, status *TaskRunStatus) error {
-	resourcesResult := []PipelineResourceResult{}
-	err := version.DeserializeFromMetadata(meta, &resourcesResult, resourcesResultAnnotationKey)
-	if err != nil {
-		return err
-	}
-	if len(resourcesResult) != 0 {
-		status.ResourcesResult = resourcesResult
-	}
-	return nil
-}
diff --git a/pkg/apis/pipeline/v1beta1/taskrun_conversion_test.go b/pkg/apis/pipeline/v1beta1/taskrun_conversion_test.go
@@ -457,56 +457,6 @@ func TestTaskRunConversionFromDeprecated(t *testing.T) {
 				},
 			},
 		},
-	}, {
-		name: "resourcesResult",
-		in: &v1beta1.TaskRun{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "foo",
-				Namespace: "bar",
-			},
-			Spec: v1beta1.TaskRunSpec{
-				TaskRef: &v1beta1.TaskRef{
-					Name: "test-resources-result",
-				},
-			},
-			Status: v1beta1.TaskRunStatus{
-				TaskRunStatusFields: v1beta1.TaskRunStatusFields{
-					ResourcesResult: []v1beta1.PipelineResourceResult{{
-						Key:          "digest",
-						Value:        "sha256:1234",
-						ResourceName: "source-image",
-					}, {
-						Key:          "digest-11",
-						Value:        "sha256:1234",
-						ResourceName: "source-image",
-					}},
-				},
-			},
-		},
-		want: &v1beta1.TaskRun{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "foo",
-				Namespace: "bar",
-			},
-			Spec: v1beta1.TaskRunSpec{
-				TaskRef: &v1beta1.TaskRef{
-					Name: "test-resources-result",
-				},
-			},
-			Status: v1beta1.TaskRunStatus{
-				TaskRunStatusFields: v1beta1.TaskRunStatusFields{
-					ResourcesResult: []v1beta1.PipelineResourceResult{{
-						Key:          "digest",
-						Value:        "sha256:1234",
-						ResourceName: "source-image",
-					}, {
-						Key:          "digest-11",
-						Value:        "sha256:1234",
-						ResourceName: "source-image",
-					}},
-				},
-			},
-		},
 	}}
 	for _, test := range tests {
 		versions := []apis.Convertible{&v1.TaskRun{}}

diff --git a/pkg/apis/pipeline/v1beta1/taskrun_types.go b/pkg/apis/pipeline/v1beta1/taskrun_types.go
@@ -266,12 +266,6 @@ type TaskRunStatusFields struct {
 	// +listType=atomic
 	RetriesStatus []TaskRunStatus `json:"retriesStatus,omitempty"`
 
-	// Results from Resources built during the TaskRun. currently includes
-	// the digest of build container images
-	// +optional
-	// +listType=atomic
-	ResourcesResult []PipelineResourceResult `json:"resourcesResult,omitempty"`
-
 	// TaskRunResults are the list of results written out by the task's containers
 	// +optional
 	// +listType=atomic

diff --git a/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go b/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/pod/status.go b/pkg/pod/status.go
@@ -175,10 +175,9 @@ func setTaskRunStatusBasedOnStepStatus(ctx context.Context, logger *zap.SugaredL
 		}
 
 		// populate task run CRD with results from sidecar logs
-		taskResults, pipelineResourceResults, _ := filterResultsAndResources(sidecarLogResults, specResults)
+		taskResults, _ := filterResultsAndResources(sidecarLogResults, specResults)
 		if tr.IsSuccessful() {
 			trs.TaskRunResults = append(trs.TaskRunResults, taskResults...)
-			trs.ResourcesResult = append(trs.ResourcesResult, pipelineResourceResults...)
 		}
 	}
 	// Continue with extraction of termination messages
@@ -202,10 +201,9 @@ func setTaskRunStatusBasedOnStepStatus(ctx context.Context, logger *zap.SugaredL
 					merr = multierror.Append(merr, err)
 				}
 
-				taskResults, pipelineResourceResults, filteredResults := filterResultsAndResources(results, specResults)
+				taskResults, filteredResults := filterResultsAndResources(results, specResults)
 				if tr.IsSuccessful() {
 					trs.TaskRunResults = append(trs.TaskRunResults, taskResults...)
-					trs.ResourcesResult = append(trs.ResourcesResult, pipelineResourceResults...)
 				}
 				msg, err = createMessageFromResults(filteredResults)
 				if err != nil {
@@ -255,7 +253,7 @@ func createMessageFromResults(results []v1beta1.PipelineResourceResult) (string,
 	return string(bytes), nil
 }
 
-func filterResultsAndResources(results []v1beta1.PipelineResourceResult, specResults []v1beta1.TaskResult) ([]v1beta1.TaskRunResult, []v1beta1.PipelineResourceResult, []v1beta1.PipelineResourceResult) {
+func filterResultsAndResources(results []v1beta1.PipelineResourceResult, specResults []v1beta1.TaskResult) ([]v1beta1.TaskRunResult, []v1beta1.PipelineResourceResult) {
 	var taskResults []v1beta1.TaskRunResult
 	var pipelineResourceResults []v1beta1.PipelineResourceResult
 	var filteredResults []v1beta1.PipelineResourceResult
@@ -266,7 +264,7 @@ func filterResultsAndResources(results []v1beta1.PipelineResourceResult, specRes
 	for _, r := range results {
 		switch r.ResultType {
 		case v1beta1.TaskRunResultType:
-			var taskRunResult v1beta1.TaskRunResult
+			taskRunResult := v1beta1.TaskRunResult{}
 			if neededTypes[r.Key] == v1beta1.ResultsTypeString {
 				taskRunResult = v1beta1.TaskRunResult{
 					Name:  r.Key,
@@ -298,7 +296,7 @@ func filterResultsAndResources(results []v1beta1.PipelineResourceResult, specRes
 		}
 	}
 
-	return taskResults, pipelineResourceResults, filteredResults
+	return taskResults, filteredResults
 }
 
 func removeDuplicateResults(taskRunResult []v1beta1.TaskRunResult) []v1beta1.TaskRunResult {