Allow extra keys in default

tektoncd · Apr 29, 2022 · be2448f · be2448f
1 parent e843edd
commit be2448f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/apis/pipeline/v1beta1/task_validation.go b/pkg/apis/pipeline/v1beta1/task_validation.go
@@ -357,9 +357,10 @@ func validateObjectKeysInDefault(defaultObject map[string]string, neededObjectKe
 		providedObjectKeysInDefault = append(providedObjectKeysInDefault, k)
 	}
 
-	if err := list.IsSame(providedObjectKeysInDefault, neededObjectKeysInSpec); err != nil {
+	missingObjectKeys := list.DiffLeft(neededObjectKeysInSpec, providedObjectKeysInDefault)
+	if len(missingObjectKeys) != 0 {
 		return &apis.FieldError{
-			Message: fmt.Sprintf("miss match found between keys specified in properties and keys provided in default for the parameter \"%s\"", paramName),
+			Message: fmt.Sprintf("Required keys %v declared in properties are not provided in default", missingObjectKeys),
 			// Empty path is required to make the `ViaField`, … work
 			Paths: []string{""},
 		}

diff --git a/pkg/apis/pipeline/v1beta1/task_validation_test.go b/pkg/apis/pipeline/v1beta1/task_validation_test.go
@@ -579,13 +579,14 @@ func TestTaskSpecValidateError(t *testing.T) {
 					"key2": {},
 				},
 				Default: v1beta1.NewObject(map[string]string{
-					"not_exist1": "var1",
+					"key1": "var1",
+					"key3": "var1",
 				}),
 			}},
 			Steps: validSteps,
 		},
 		expectedError: apis.FieldError{
-			Message: `miss match found between keys specified in properties and keys provided in default for the parameter "task"`,
+			Message: fmt.Sprintf("Required keys %v declared in properties are not provided in default", []string{"key2"}),
 			Paths:   []string{""},
 		},
 	}, {