fix

tektoncd · Feb 8, 2023 · 09cc73b · 09cc73b
1 parent 1594422
commit 09cc73b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/pkg/reconciler/taskrun/validate_resources.go b/pkg/reconciler/taskrun/validate_resources.go
@@ -440,7 +440,7 @@ func validateParamArrayIndex(ctx context.Context, params []v1beta1.Param, spec *
 }
 
 // FindInvalidParamArrayReference checks if the alpha feature gate is enabled when array
-// indexing is used. And also find out out of bound params
+// indexing is used. And also find out of bound params
 func FindInvalidParamArrayReference(ctx context.Context, paramReference string, arrayParams map[string]int, outofBoundParams *sets.String) error {
 	list := substitution.ExtractParamsExpressions(paramReference)
 	for _, val := range list {
@@ -464,9 +464,12 @@ func FindInvalidParamArrayReference(ctx context.Context, paramReference string,
 
 func validateStepsParamArrayIndexing(ctx context.Context, steps []v1beta1.Step, arrayParams map[string]int, outofBoundParams *sets.String) error {
 	for _, step := range steps {
-		FindInvalidParamArrayReference(ctx, step.Script, arrayParams, outofBoundParams)
+		err := FindInvalidParamArrayReference(ctx, step.Script, arrayParams, outofBoundParams)
+		if err != nil {
+			return err
+		}
 		container := step.ToK8sContainer()
-		err := validateContainerParamArrayIndexing(ctx, container, arrayParams, outofBoundParams)
+		err = validateContainerParamArrayIndexing(ctx, container, arrayParams, outofBoundParams)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/reconciler/taskrun/validate_resources_test.go b/pkg/reconciler/taskrun/validate_resources_test.go
@@ -1137,15 +1137,15 @@ func TestValidateParamArrayIndex(t *testing.T) {
 			},
 			},
 		},
-		apifields:     "stable",
-		expectedError: fmt.Errorf(`indexing into an array param %s requires "enable-api-fields" feature gate to be "alpha"`, "$(params.array-params[3])"),
+		apifields: "stable",
+		expectedError: fmt.Errorf(`indexing into array param %s requires "enable-api-fields" feature gate to be "alpha"`, "$(params.array-params[3])"),
 	},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			ctx := context.Background()
-			if tc.apifields != "stable" {
-				ctx = config.ToContext(context.Background(), &config.Config{FeatureFlags: &config.FeatureFlags{EnableAPIFields: "alpha"}})
+			ctx:= context.Background()
+			if tc.apifields!="stable"{
+				ctx = config.ToContext(ctx, &config.Config{FeatureFlags: &config.FeatureFlags{EnableAPIFields: "alpha"}})
 			}
 			err := validateParamArrayIndex(ctx, tc.params, tc.taskspec)
 			if d := cmp.Diff(tc.expectedError.Error(), err.Error()); d != "" {