V1: sync v1beta1 changes

This commit syncs the code updates in v1beta1 for the v1 release.
kerthcet · Sep 29, 2022 · a7f6ce7 · a7f6ce7
1 parent b506b77
commit a7f6ce7
Show file tree

Hide file tree

Showing 10 changed files with 1,000 additions and 65 deletions.
diff --git a/pkg/apis/pipeline/v1/pipeline_validation.go b/pkg/apis/pipeline/v1/pipeline_validation.go
@@ -64,7 +64,7 @@ func (ps *PipelineSpec) Validate(ctx context.Context) (errs *apis.FieldError) {
  errs = errs.Also(validatePipelineWorkspacesUsage(ctx, ps.Workspaces, ps.Tasks).ViaField("tasks"))
  errs = errs.Also(validatePipelineWorkspacesUsage(ctx, ps.Workspaces, ps.Finally).ViaField("finally"))
  // Validate the pipeline's results
- errs = errs.Also(validatePipelineResults(ps.Results, ps.Tasks))
+ errs = errs.Also(validatePipelineResults(ps.Results, ps.Tasks, ps.Finally))
  errs = errs.Also(validateTasksAndFinallySection(ps))
  errs = errs.Also(validateFinalTasks(ps.Tasks, ps.Finally))
  errs = errs.Also(validateWhenExpressions(ps.Tasks, ps.Finally))
@@ -242,8 +242,9 @@ func filter(arr []string, cond func(string) bool) []string {
 }
 
 // validatePipelineResults ensure that pipeline result variables are properly configured
-func validatePipelineResults(results []PipelineResult, tasks []PipelineTask) (errs *apis.FieldError) {
+func validatePipelineResults(results []PipelineResult, tasks []PipelineTask, finally []PipelineTask) (errs *apis.FieldError) {
  pipelineTaskNames := getPipelineTasksNames(tasks)
+ pipelineFinallyTaskNames := getPipelineTasksNames(finally)
  for idx, result := range results {
  expressions, ok := GetVarSubstitutionExpressionsForPipelineResult(result)
  if !ok {
@@ -263,7 +264,7 @@ func validatePipelineResults(results []PipelineResult, tasks []PipelineTask) (er
  "value").ViaFieldIndex("results", idx))
  }
 
- if !taskContainsResult(result.Value.StringVal, pipelineTaskNames) {
+ if !taskContainsResult(result.Value.StringVal, pipelineTaskNames, pipelineFinallyTaskNames) {
  errs = errs.Also(apis.ErrInvalidValue("referencing a nonexistent task",
  "value").ViaFieldIndex("results", idx))
  }
@@ -284,16 +285,26 @@ func getPipelineTasksNames(pipelineTasks []PipelineTask) sets.String {
 
 // taskContainsResult ensures the result value is referenced within the
 // task names
-func taskContainsResult(resultExpression string, pipelineTaskNames sets.String) bool {
+func taskContainsResult(resultExpression string, pipelineTaskNames sets.String, pipelineFinallyTaskNames sets.String) bool {
  // split incase of multiple resultExpressions in the same result.Value string
  // i.e "$(task.<task-name).result.<result-name>) - $(task2.<task2-name).result2.<result2-name>)"
  split := strings.Split(resultExpression, "$")
  for _, expression := range split {
  if expression != "" {
- pipelineTaskName, _, _, _, _ := parseExpression(stripVarSubExpression("$" + expression))
- if !pipelineTaskNames.Has(pipelineTaskName) {
+ value := stripVarSubExpression("$" + expression)
+ pipelineTaskName, _, _, _, err := parseExpression(value)
+
+ if err != nil {
+ return false
+ }
+
+ if strings.HasPrefix(value, "tasks") && !pipelineTaskNames.Has(pipelineTaskName) {
  return false
  }
+ if strings.HasPrefix(value, "finally") && !pipelineFinallyTaskNames.Has(pipelineTaskName) {
+ return false
+ }
+
  }
  }
  return true