From e51a1f1672bf3d1cbe5bed676212f343925752b9 Mon Sep 17 00:00:00 2001 From: Chuang Wang Date: Mon, 23 May 2022 15:30:07 -0700 Subject: [PATCH] Fix test cases for validatePipelineParameterVariables function Prior to this commit, many success tests were meaningless because they just use the param names in the format of `$(baz)`, `$(foo-is-baz)`. In validation, without using the format of `$(params.)`, the two examples above will be treated as just string literal instead of param reference, and thus in fact validation agains using correct params are not executed. That explains why there is no problem even though declared param is actually called `baz`, but using `$(bazzzz)`. In this commit, the usage of param names is corrected to `$(params.)` and type for ArrayOrString is added so that the param reference is really validated. --- .../pipeline/v1beta1/pipeline_validation_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go b/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go index 6a6e27bccac..22e81c9f9be 100644 --- a/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go +++ b/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go @@ -1239,7 +1239,7 @@ func TestValidatePipelineParameterVariables_Success(t *testing.T) { Name: "bar", TaskRef: &TaskRef{Name: "bar-task"}, Params: []Param{{ - Name: "a-param", Value: ArrayOrString{StringVal: "$(baz) and $(foo-is-baz)"}, + Name: "a-param", Value: ArrayOrString{Type: ParamTypeString, StringVal: "$(params.baz) and $(params.foo-is-baz)"}, }}, }}, }, { @@ -1289,7 +1289,7 @@ func TestValidatePipelineParameterVariables_Success(t *testing.T) { Name: "bar", TaskRef: &TaskRef{Name: "bar-task"}, Params: []Param{{ - Name: "a-param", Value: ArrayOrString{ArrayVal: []string{"$(baz)", "and", "$(foo-is-baz)"}}, + Name: "a-param", Value: ArrayOrString{Type: ParamTypeArray, ArrayVal: []string{"$(params.baz)", "and", "$(params.foo-is-baz)"}}, }}, }}, }, { @@ -1303,7 +1303,7 @@ func TestValidatePipelineParameterVariables_Success(t *testing.T) { Name: "bar", TaskRef: &TaskRef{Name: "bar-task"}, Params: []Param{{ - Name: "a-param", Value: ArrayOrString{ArrayVal: []string{"$(baz[*])", "and", "$(foo-is-baz[*])"}}, + Name: "a-param", Value: ArrayOrString{Type: ParamTypeArray, ArrayVal: []string{"$(params.baz[*])", "and", "$(params.foo-is-baz[*])"}}, }}, }}, }, { @@ -1315,7 +1315,7 @@ func TestValidatePipelineParameterVariables_Success(t *testing.T) { Name: "bar", TaskRef: &TaskRef{Name: "bar-task"}, Params: []Param{{ - Name: "a-param", Value: ArrayOrString{StringVal: "$(input.workspace.$(baz))"}, + Name: "a-param", Value: ArrayOrString{Type: ParamTypeString, StringVal: "$(input.workspace.$(params.baz))"}, }}, }}, }, { @@ -1329,7 +1329,7 @@ func TestValidatePipelineParameterVariables_Success(t *testing.T) { Name: "bar", TaskRef: &TaskRef{Name: "bar-task"}, Matrix: []Param{{ - Name: "a-param", Value: ArrayOrString{Type: ParamTypeArray, ArrayVal: []string{"$(baz)", "and", "$(foo-is-baz)"}}, + Name: "a-param", Value: ArrayOrString{Type: ParamTypeArray, ArrayVal: []string{"$(params.baz)", "and", "$(params.foo-is-baz)"}}, }}, }}, }, { @@ -1343,7 +1343,7 @@ func TestValidatePipelineParameterVariables_Success(t *testing.T) { Name: "bar", TaskRef: &TaskRef{Name: "bar-task"}, Matrix: []Param{{ - Name: "a-param", Value: ArrayOrString{Type: ParamTypeArray, ArrayVal: []string{"$(baz[*])", "and", "$(foo-is-baz[*])"}}, + Name: "a-param", Value: ArrayOrString{Type: ParamTypeArray, ArrayVal: []string{"$(params.baz[*])", "and", "$(params.foo-is-baz[*])"}}, }}, }}, }}