Skip to content

Commit 050e4d2

Browse files
authored
Merge pull request #342 from apasel422/config-validate
Refine e2e configuration validation
2 parents a0a78f5 + 6d30ae5 commit 050e4d2

File tree

3 files changed

+44
-12
lines changed

3 files changed

+44
-12
lines changed

impl/e2e.schema.json

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,38 @@
99
"type": "object",
1010
"additionalProperties": {
1111
"enum": ["dap-15-histogram"]
12+
},
13+
"propertyNames": {
14+
"format": "uri"
1215
}
1316
},
1417
"maxConversionCallersPerImpression": {
15-
"type": "integer"
18+
"type": "integer",
19+
"minimum": 0
1620
},
1721
"maxConversionSitesPerImpression": {
18-
"type": "integer"
22+
"type": "integer",
23+
"minimum": 0
1924
},
2025
"maxCreditSize": {
21-
"type": "integer"
26+
"type": "integer",
27+
"minimum": 1
2228
},
2329
"maxHistogramSize": {
24-
"type": "integer"
30+
"type": "integer",
31+
"minimum": 1
2532
},
2633
"maxLookbackDays": {
27-
"type": "integer"
34+
"type": "integer",
35+
"minimum": 1
2836
},
2937
"privacyBudgetEpochDays": {
30-
"type": "integer"
38+
"type": "integer",
39+
"minimum": 1
3140
},
3241
"privacyBudgetMicroEpsilons": {
33-
"type": "integer"
42+
"type": "integer",
43+
"minimum": 1
3444
}
3545
},
3646
"required": [
@@ -83,7 +93,8 @@
8393
{
8494
"type": "array",
8595
"items": {
86-
"type": "integer"
96+
"type": "integer",
97+
"minimum": 0
8798
}
8899
},
89100
{

impl/package-lock.json

Lines changed: 23 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

impl/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
"lint": "eslint src",
1010
"serve": "http-server -c-1 dist",
1111
"serve-local": "http-server -c-1 -a 127.0.0.1 dist",
12-
"validate-e2e": "ajv validate --strict -s e2e.schema.json ./e2e-tests/*.json"
12+
"validate-e2e": "ajv validate --strict -s e2e.schema.json -c ajv-formats ./e2e-tests/*.json"
1313
},
1414
"devDependencies": {
1515
"@jirutka/ajv-cli": "^6.0.0",
1616
"@types/node": "^24.2.0",
1717
"@types/psl": "^1.1.3",
18+
"ajv-formats": "^3.0.1",
1819
"eslint": "^9.32.0",
1920
"html-webpack-plugin": "^5.6.3",
2021
"http-server": "^14.1.1",

0 commit comments

Comments
 (0)