fix: revert constant ref

tektoncd · May 7, 2024 · 41ea597 · 41ea597
1 parent e684c6d
commit 41ea597
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/pkg/apis/pipeline/v1/task_validation.go b/pkg/apis/pipeline/v1/task_validation.go
@@ -30,7 +30,6 @@ import (
  "github.com/tektoncd/pipeline/pkg/apis/pipeline"
  "github.com/tektoncd/pipeline/pkg/apis/validate"
  "github.com/tektoncd/pipeline/pkg/internal/resultref"
- "github.com/tektoncd/pipeline/pkg/pod"
  "github.com/tektoncd/pipeline/pkg/substitution"
 
  "golang.org/x/exp/slices"
@@ -313,7 +312,7 @@ func errorIfStepResultReferenceinField(value, fieldName string) (errs *apis.Fiel
 }
 
 func stepArtifactReferenceExists(src string) bool {
- return len(artifactref.StepArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$("+pod.StepArtifactPathPattern+")")
+ return len(artifactref.StepArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$(step.artifacts.path)")
 }
 func errorIfStepArtifactReferencedInField(value, fieldName string) (errs *apis.FieldError) {
  if stepArtifactReferenceExists(value) {

diff --git a/pkg/apis/pipeline/v1beta1/task_validation.go b/pkg/apis/pipeline/v1beta1/task_validation.go
@@ -31,7 +31,6 @@ import (
  v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
  "github.com/tektoncd/pipeline/pkg/apis/validate"
  "github.com/tektoncd/pipeline/pkg/internal/resultref"
- "github.com/tektoncd/pipeline/pkg/pod"
  "github.com/tektoncd/pipeline/pkg/substitution"
 
  "golang.org/x/exp/slices"
@@ -302,7 +301,7 @@ func errorIfStepResultReferenceinField(value, fieldName string) (errs *apis.Fiel
 }
 
 func stepArtifactReferenceExists(src string) bool {
- return len(artifactref.StepArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$("+pod.StepArtifactPathPattern+")")
+ return len(artifactref.StepArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$(step.artifacts.path)")
 }
 
 func errorIfStepArtifactReferencedInField(value, fieldName string) (errs *apis.FieldError) {

diff --git a/pkg/entrypoint/entrypointer.go b/pkg/entrypoint/entrypointer.go
@@ -300,7 +300,7 @@ func readArtifacts(fp string) ([]result.RunResult, error) {
  if err != nil {
  return nil, err
  }
- return []result.RunResult{{Key: fp, Value: string(file), ResultType: result.StepResultType}}, nil
+ return []result.RunResult{{Key: fp, Value: string(file), ResultType: result.StepArtifactsResultType}}, nil
 }
 
 func (e Entrypointer) readResultsFromDisk(ctx context.Context, resultDir string, resultType result.ResultType) error {