Support structured results for PipelineRunObject

tektoncd · Oct 20, 2022 · 3f71de7 · 3f71de7
1 parent 015ff9a
commit 3f71de7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/pkg/artifacts/signable.go b/pkg/artifacts/signable.go
@@ -319,23 +319,11 @@ func ExtractStructuredTargetFromResults(obj objects.TektonObject, categoryMarker
 
 	// TODO(#592): support structured results using Run
 	results := []objects.Result{}
-	tr, isTaskRun := obj.GetObject().(*v1beta1.TaskRun)
-	if isTaskRun {
-		for _, res := range tr.Status.TaskRunResults {
-			results = append(results, objects.Result{
-				Name:  res.Name,
-				Value: res.Value,
-			})
-		}
-
-	} else {
-		pr := obj.GetObject().(*v1beta1.PipelineRun)
-		for _, res := range pr.Status.PipelineResults {
-			results = append(results, objects.Result{
-				Name:  res.Name,
-				Value: res.Value,
-			})
-		}
+	for _, res := range obj.GetResults() {
+		results = append(results, objects.Result{
+			Name:  res.Name,
+			Value: res.Value,
+		})
 	}
 	for _, res := range results {
 		if strings.HasSuffix(res.Name, categoryMarker) {

diff --git a/pkg/chains/objects/objects.go b/pkg/chains/objects/objects.go
@@ -156,11 +156,8 @@ func (pro *PipelineRunObject) GetResults() []Result {
 	res := []Result{}
 	for _, key := range pro.Status.PipelineResults {
 		res = append(res, Result{
-			Name: key.Name,
-			Value: v1beta1.ArrayOrString{
-				Type:      v1beta1.ParamTypeString,
-				StringVal: key.Value.StringVal,
-			},
+			Name:  key.Name,
+			Value: key.Value,
 		})
 	}
 	return res