fix: tekton validation on pipeline results value

jenkins-x · Jun 28, 2023 · b7b8816 · b7b8816
1 parent 67920b3
commit b7b8816
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/pkg/triggerconfig/inrepo/load_pipelinerun.go b/pkg/triggerconfig/inrepo/load_pipelinerun.go
@@ -122,7 +122,7 @@ func LoadTektonResourceAsPipelineRun(resolver *UsesResolver, data []byte) (*tekt
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to unmarshal PipelineRun YAML %s", message)
 		}
-		prs.Spec.PipelineSpec.Results = []tektonv1beta1.PipelineResult{}
+
 		re, err := loadTektonRefsFromFilesPattern(prs)
 		if err != nil {
 			return prs, err

diff --git a/pkg/triggerconfig/inrepo/load_pipelinerun_test.go b/pkg/triggerconfig/inrepo/load_pipelinerun_test.go
@@ -104,10 +104,6 @@ func TestLoadPipelineRunTest(t *testing.T) {
 			data, err := os.ReadFile(path)
 			require.NoError(t, err, "failed to load "+message)
 
-			if strings.Contains(path, "custom-git") {
-				fmt.Printf("here!")
-			}
-
 			pr, err := LoadTektonResourceAsPipelineRun(resolver, data)
 
 			if strings.HasSuffix(name, "-fails") {

diff --git a/pkg/triggerconfig/inrepo/params.go b/pkg/triggerconfig/inrepo/params.go
@@ -2,6 +2,7 @@ package inrepo
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
@@ -33,7 +34,7 @@ func UseParametersAndResults(ctx context.Context, loc *UseLocation, uses *v1beta
 	ps := loc.PipelineSpec
 	if ps != nil {
 		ps.Params = useParameterSpecs(ctx, ps.Params, parameterSpecs)
-		ps.Results = usePipelineResults(ps.Results, results)
+		ps.Results = usePipelineResults(ps.Results, results, loc.TaskName)
 		ps.Workspaces = usePipelineWorkspaces(ps.Workspaces, uses.Workspaces)
 	}
 	pt := loc.PipelineTask
@@ -169,7 +170,7 @@ func useParameterEnvVars(env []corev1.EnvVar, uses []v1beta1.Param) []corev1.Env
 	return env
 }
 
-func usePipelineResults(results []v1beta1.PipelineResult, uses []v1beta1.TaskResult) []v1beta1.PipelineResult {
+func usePipelineResults(results []v1beta1.PipelineResult, uses []v1beta1.TaskResult, taskName string) []v1beta1.PipelineResult {
 	for _, u := range uses {
 		found := false
 		for i := range results {
@@ -186,6 +187,7 @@ func usePipelineResults(results []v1beta1.PipelineResult, uses []v1beta1.TaskRes
 			results = append(results, v1beta1.PipelineResult{
 				Name:        u.Name,
 				Description: u.Description,
+				Value:       *v1beta1.NewStructuredValues(fmt.Sprintf("$(tasks.%s.results.%s)", taskName, u.Name)),
 			})
 		}
 	}

diff --git a/pkg/triggerconfig/inrepo/test_data/load_pipelinerun/uses-steps-custom-git/expected.yaml b/pkg/triggerconfig/inrepo/test_data/load_pipelinerun/uses-steps-custom-git/expected.yaml
@@ -159,10 +159,10 @@ spec:
     results:
     - description: The precise commit SHA that was fetched by this Task
       name: commit
-      value: ""
+      value: $(tasks.from-build-pack.results.commit)
     - description: The precise URL that was fetched by this Task
       name: url
-      value: ""
+      value: $(tasks.from-build-pack.results.url)
     tasks:
     - name: from-build-pack
       params:

diff --git a/pkg/triggerconfig/inrepo/test_data/load_pipelinerun/uses-steps-custom-git/source.yaml b/pkg/triggerconfig/inrepo/test_data/load_pipelinerun/uses-steps-custom-git/source.yaml
@@ -15,7 +15,7 @@ spec:
           image: uses:lighthouse:jenkins-x/jx3-pipeline-catalog/packs/javascript/.lighthouse/jenkins-x/pullrequest.yaml@1d39235ee9235d7d52d4025a8e59cb8bda04306a
         steps:
         - name: clone
-          image: uses:tektoncd/catalog/task/git-clone/0.9/git-clone.yaml@HEAD
+          image: uses:tektoncd/catalog/task/git-clone/0.2/git-clone.yaml@HEAD
         - name: jx-variables
         - name: build-npm-install
         - name: build-npm-test