Skip to content

Commit

Permalink
Perform matrix results validation on only result ref params
Browse files Browse the repository at this point in the history
This will add a check to skip the validation of normal params
while doing the validation for resultref params are provided in
matrix format
  • Loading branch information
piyush-garg committed Jul 3, 2024
1 parent 4ed602f commit f9743f6
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkg/apis/pipeline/v1/pipeline_validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,9 @@ func findAndValidateResultRefsForMatrix(tasks []PipelineTask, taskMapping map[st
func validateMatrixedPipelineTaskConsumed(expressions []string, taskMapping map[string]PipelineTask) (resultRefs []*ResultRef, errs *apis.FieldError) {
var filteredExpressions []string
for _, expression := range expressions {
if !resultref.LooksLikeResultRef(expression) {
continue
}
// ie. "tasks.<pipelineTaskName>.results.<resultName>[*]"
subExpressions := strings.Split(expression, ".")
pipelineTask := subExpressions[1] // pipelineTaskName
Expand Down
59 changes: 59 additions & 0 deletions pkg/apis/pipeline/v1/pipeline_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,65 @@ func TestPipeline_Validate_Success(t *testing.T) {
}},
},
},
}, {
name: "param with different type of values",
p: &Pipeline{
ObjectMeta: metav1.ObjectMeta{
Name: "pipelinelinename",
},
Spec: PipelineSpec{
Params: ParamSpecs{{
Name: "pipeline-words",
Default: &ParamValue{
Type: ParamTypeObject,
ObjectVal: map[string]string{"hello": "pipeline"},
},
Type: ParamTypeObject,
Properties: map[string]PropertySpec{
"hello": {Type: ParamTypeString},
},
}},
Tasks: []PipelineTask{{
Name: "echoit",
TaskSpec: &EmbeddedTask{TaskSpec: TaskSpec{
Steps: []Step{{
Name: "echo",
Image: "ubuntu",
Command: []string{"echo"},
Args: []string{"$(params.pipeline-words.hello)"},
}},
}},
Params: Params{
{
Name: "name",
Value: ParamValue{
Type: ParamTypeString,
StringVal: "$(params.pipeline-words.hello)",
},
},
{
Name: "name2",
Value: ParamValue{
Type: ParamTypeString,
StringVal: "$(tasks.pipeline-words.results.hello) + $(pipeline-words)",
},
},
},
RunAfter: []string{"pipeline-words"},
},
{
Name: "pipeline-words",
TaskSpec: &EmbeddedTask{TaskSpec: TaskSpec{
Steps: []Step{{
Name: "echo",
Image: "ubuntu",
Command: []string{"echo"},
Args: []string{"$(params.pipeline-words.hello)"},
}},
}},
}},
},
},
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down

0 comments on commit f9743f6

Please sign in to comment.