[FEATURE] Schema: Allow builder.resources.exclude config for modules

Author: RandomByte

lib/validation/schema/specVersion/kind/project/module.json

@@ -6,13 +6,13 @@
 	"required": ["specVersion", "type", "metadata"],
 	"if": {
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1"] }
+			"specVersion": { "enum": ["3.1"] }
 		}
 	},
 	"then": {
 		"additionalProperties": false,
 		"properties": {
-			"specVersion": { "enum": ["3.0", "3.1"] },
+			"specVersion": { "enum": ["3.1"] },
 			"kind": {
 				"enum": ["project", null]
 			},
@@ -26,7 +26,7 @@
 				"$ref": "#/definitions/resources"
 			},
 			"builder": {
-				"$ref": "#/definitions/builder-specVersion-2.5"
+				"$ref": "#/definitions/builder-specVersion-3.1"
 			},
 			"server": {
 				"$ref": "../project.json#/definitions/server"
@@ -40,21 +40,21 @@
 	"else": {
 		"if": {
 			"properties": {
-				"specVersion": { "enum": ["2.5", "2.6"] }
+				"specVersion": { "enum": ["3.0"] }
 			}
 		},
 		"then": {
 			"additionalProperties": false,
 			"properties": {
-				"specVersion": { "enum": ["2.5", "2.6"] },
+				"specVersion": { "enum": ["3.0"] },
 				"kind": {
 					"enum": ["project", null]
 				},
 				"type": {
 					"enum": ["module"]
 				},
 				"metadata": {
-					"$ref": "../project.json#/definitions/metadata"
+					"$ref": "../project.json#/definitions/metadata-3.0"
 				},
 				"resources": {
 					"$ref": "#/definitions/resources"
@@ -74,13 +74,13 @@
 		"else": {
 			"if": {
 				"properties": {
-					"specVersion": { "enum": ["2.1", "2.2", "2.3", "2.4"] }
+					"specVersion": { "enum": ["2.5", "2.6"] }
 				}
 			},
 			"then": {
 				"additionalProperties": false,
 				"properties": {
-					"specVersion": { "enum": ["2.1", "2.2", "2.3", "2.4"] },
+					"specVersion": { "enum": ["2.5", "2.6"] },
 					"kind": {
 						"enum": ["project", null]
 					},
@@ -93,27 +93,62 @@
 					"resources": {
 						"$ref": "#/definitions/resources"
 					},
+					"builder": {
+						"$ref": "#/definitions/builder-specVersion-2.5"
+					},
+					"server": {
+						"$ref": "../project.json#/definitions/server"
+					},
 					"customConfiguration": {
 						"type": "object",
 						"additionalProperties": true
 					}
 				}
 			},
 			"else": {
-				"additionalProperties": false,
-				"properties": {
-					"specVersion": { "enum": ["2.0"] },
-					"kind": {
-						"enum": ["project", null]
-					},
-					"type": {
-						"enum": ["module"]
-					},
-					"metadata": {
-						"$ref": "../project.json#/definitions/metadata"
-					},
-					"resources": {
-						"$ref": "#/definitions/resources"
+				"if": {
+					"properties": {
+						"specVersion": { "enum": ["2.1", "2.2", "2.3", "2.4"] }
+					}
+				},
+				"then": {
+					"additionalProperties": false,
+					"properties": {
+						"specVersion": { "enum": ["2.1", "2.2", "2.3", "2.4"] },
+						"kind": {
+							"enum": ["project", null]
+						},
+						"type": {
+							"enum": ["module"]
+						},
+						"metadata": {
+							"$ref": "../project.json#/definitions/metadata"
+						},
+						"resources": {
+							"$ref": "#/definitions/resources"
+						},
+						"customConfiguration": {
+							"type": "object",
+							"additionalProperties": true
+						}
+					}
+				},
+				"else": {
+					"additionalProperties": false,
+					"properties": {
+						"specVersion": { "enum": ["2.0"] },
+						"kind": {
+							"enum": ["project", null]
+						},
+						"type": {
+							"enum": ["module"]
+						},
+						"metadata": {
+							"$ref": "../project.json#/definitions/metadata"
+						},
+						"resources": {
+							"$ref": "#/definitions/resources"
+						}
 					}
 				}
 			}
@@ -149,6 +184,18 @@
 					"$ref": "../project.json#/definitions/builder-settings"
 				}
 			}
+		},
+		"builder-specVersion-3.1": {
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"resources": {
+					"$ref": "../project.json#/definitions/builder-resources"
+				},
+				"settings": {
+					"$ref": "../project.json#/definitions/builder-settings"
+				}
+			}
 		}
 	}
 }

test/lib/validation/schema/specVersion/kind/project/module.js

@@ -418,4 +418,25 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 	});
 });
 
+SpecificationVersion.getVersionsForRange(">=3.1").forEach(function(specVersion) {
+	test(`Builder resource excludes (specVersion ${specVersion})`, async (t) => {
+		await assertValidation(t, {
+			"specVersion": specVersion,
+			"kind": "project",
+			"type": "module",
+			"metadata": {
+				"name": "my-module"
+			},
+			"builder": {
+				"resources": {
+					"excludes": [
+						"/resources/some/project/name/test_results/**",
+						"!/test-resources/some/project/name/demo-app/**"
+					]
+				}
+			}
+		});
+	});
+});
+
 project.defineTests(test, assertValidation, "module");