Fail-fast during overriding.

Signed-off-by: David Festal <[email protected]>

pkg/utils/overriding/overriding.go

@@ -72,6 +72,10 @@ func OverrideDevWorkspaceTemplateSpecBytes(originalBytes []byte, patchBytes []by
 //
 // The result is a transformed `DevfileWorkspaceTemplateSpec` object.
 func OverrideDevWorkspaceTemplateSpec(original *workspaces.DevWorkspaceTemplateSpecContent, patch workspaces.Overrides) (*workspaces.DevWorkspaceTemplateSpecContent, error) {
+	if err := ensureOnlyExistingElementsAreOverridden(original, patch); err != nil {
+		return nil, err
+	}
+
 	if err := unions.Normalize(&original); err != nil {
 		return nil, err
 	}
@@ -98,10 +102,6 @@ func OverrideDevWorkspaceTemplateSpec(original *workspaces.DevWorkspaceTemplateS
 		return nil, err
 	}
 
-	if err := ensureOnlyExistingElementsAreOverridden(original, patch); err != nil {
-		return nil, err
-	}
-
 	schema, err := strategicpatch.NewPatchMetaFromStruct(original)
 	if err != nil {
 		return nil, err