Skip to content

Commit dae9264

Browse files
catenacybervictorjulien
authored andcommitted
doc: really enforce more the completeness of json schema
Completes commit f1f32a3 End better describe exception_policy
1 parent cf4a861 commit dae9264

2 files changed

Lines changed: 34 additions & 22 deletions

File tree

.github/workflows/builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ jobs:
238238
run: ./scripts/schema-sort.py --check ./etc/schema.json
239239

240240
- name: Check EVE schema has all additionalProperties
241-
run: test $(cat etc/schema.json | 'paths( objects | (.type == "object" and (has("additionalProperties") | not) )) | join(".")' | wc -l) = "0"
241+
run: test $(cat etc/schema.json | jq 'paths( objects | (.type == "object" and (has("additionalProperties") | not) )) | join(".")' | wc -l) = "0"
242242

243243
almalinux-9:
244244
name: AlmaLinux 9 (schema)

etc/schema.json

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7176,44 +7176,56 @@
71767176
"properties": {
71777177
"app_layer": {
71787178
"type": "object",
7179-
"error": {
7180-
"description":
7179+
"additionalProperties": false,
7180+
"properties": {
7181+
"error": {
7182+
"description":
71817183
"Consolidated stats on how many times app-layer error exception policy was applied, and which one",
7182-
"$ref": "#/$defs/exceptionPolicy"
7184+
"$ref": "#/$defs/exceptionPolicy"
7185+
}
71837186
}
71847187
},
71857188
"defrag": {
71867189
"type": "object",
7187-
"memcap": {
7188-
"description":
7190+
"additionalProperties": false,
7191+
"properties": {
7192+
"memcap": {
7193+
"description":
71897194
"How many times defrag memcap exception policy was applied, and which one",
7190-
"$ref": "#/$defs/exceptionPolicy"
7195+
"$ref": "#/$defs/exceptionPolicy"
7196+
}
71917197
}
71927198
},
71937199
"flow": {
71947200
"type": "object",
7195-
"memcap": {
7196-
"description":
7201+
"additionalProperties": false,
7202+
"properties": {
7203+
"memcap": {
7204+
"description":
71977205
"How many times flow memcap exception policy was applied, and which one",
7198-
"$ref": "#/$defs/exceptionPolicy"
7206+
"$ref": "#/$defs/exceptionPolicy"
7207+
}
71997208
}
72007209
},
72017210
"tcp": {
72027211
"type": "object",
7203-
"midstream": {
7204-
"description":
7212+
"additionalProperties": false,
7213+
"properties": {
7214+
"midstream": {
7215+
"description":
72057216
"How many times midstream exception policy was applied, and which one",
7206-
"$ref": "#/$defs/exceptionPolicy"
7207-
},
7208-
"ssn_memcap": {
7209-
"description":
7210-
"How many times session memcap exception policy was applied, and which one",
7211-
"$ref": "#/$defs/exceptionPolicy"
7212-
},
7213-
"reassembly": {
7214-
"description":
7217+
"$ref": "#/$defs/exceptionPolicy"
7218+
},
7219+
"reassembly": {
7220+
"description":
72157221
"How many times reassembly memcap exception policy was applied, and which one",
7216-
"$ref": "#/$defs/exceptionPolicy"
7222+
"$ref": "#/$defs/exceptionPolicy"
7223+
},
7224+
"ssn_memcap": {
7225+
"description":
7226+
"How many times session memcap exception policy was applied, and which one",
7227+
"$ref": "#/$defs/exceptionPolicy"
7228+
}
72177229
}
72187230
}
72197231
}

0 commit comments

Comments
 (0)