Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix schema syntax and naming #1217

Merged
merged 38 commits into from
Sep 13, 2024
Merged

fix: fix schema syntax and naming #1217

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
30a359f
fix: fix schema syntax and naming
vordimous Aug 27, 2024
4367c7c
fix: remove extra schema:version option for the cataloged $def
vordimous Aug 27, 2024
be172b4
fix: remove entry as a global property
vordimous Aug 27, 2024
3d9b3a0
fix: remove "schema" from the cataloged refs
vordimous Aug 27, 2024
e8b74b2
fix: remove null type option and add default for enum
vordimous Aug 28, 2024
dce81e2
feat: update routes titles and type
vordimous Aug 29, 2024
c3427f4
fix: update types and defaults
vordimous Aug 29, 2024
ac821a6
fix: update tls binding ref structure
vordimous Aug 29, 2024
28c8a4e
fix: remove global catalog
vordimous Aug 29, 2024
1060348
fix: add schema back to test catalog
vordimous Aug 30, 2024
ee0d32a
Revert "fix: update tls binding ref structure"
vordimous Aug 30, 2024
b882837
feat: update tcp and tls object inheritance to add object type and title
vordimous Sep 5, 2024
ffebce5
fix: move catalog
vordimous Sep 6, 2024
fd602d5
fix: keep the default value at the root when adding expressions
vordimous Sep 9, 2024
d252621
Revert "fix: remove global catalog"
vordimous Sep 9, 2024
c5de549
Revert "fix: move catalog"
vordimous Sep 9, 2024
34a2886
fix: disable etry and catalog at global level
vordimous Sep 9, 2024
4d4b2d5
fix: remove catalog object
vordimous Sep 9, 2024
6550776
Merge branch 'develop' of github.com:aklivity/zilla into schema-synta…
vordimous Sep 9, 2024
db77ce2
fix: multiple options of object not necessary
vordimous Sep 9, 2024
214066d
feat: add catalog title
vordimous Sep 9, 2024
4ec3456
fix: move global catalog def to the binding
vordimous Sep 9, 2024
945d99e
fix: update test to reflect not allowing null ALPN
vordimous Sep 9, 2024
98b0afd
add grpc options back
vordimous Sep 9, 2024
b9d5818
add global entry back
vordimous Sep 9, 2024
05b03c2
add defaults to the schema
vordimous Sep 9, 2024
c71172b
Update specs/binding-http.spec/src/main/scripts/io/aklivity/zilla/spe…
vordimous Sep 9, 2024
0315be5
revert options titles to remove context
vordimous Sep 10, 2024
75b93d2
remove mutual default
vordimous Sep 10, 2024
9aa2e67
Merge branch 'develop' of github.com:aklivity/zilla into schema-synta…
vordimous Sep 10, 2024
2ca7d7f
move entry back
vordimous Sep 10, 2024
80af2a7
Revert "fix: move global catalog def to the binding"
vordimous Sep 11, 2024
c988eb9
fix removed properties
vordimous Sep 11, 2024
9e031cc
Merge branch 'develop' of github.com:aklivity/zilla into schema-synta…
vordimous Sep 13, 2024
f2fe442
use title Authorization
vordimous Sep 13, 2024
ae29acb
fix bad rebase
vordimous Sep 13, 2024
bdd12da
remove null option
vordimous Sep 13, 2024
23d1695
remove added entry section
vordimous Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ....spec/src/main/scripts/io/aklivity/zilla/specs/binding/amqp/schema/amqp.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,26 @@
{
"enum": [ "server" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options": false,
"routes":
{
"title": "Routes",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"when":
{
"title": "When",
"type": "array",
"items":
{
"type": "object",
"additionalProperties": false,
"properties":
{
Expand Down
2 changes: 2 additions & 0 deletions ...pec/src/main/scripts/io/aklivity/zilla/specs/binding/pgsql/schema/pgsql.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "client", "server" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options": false,
"routes": false
Expand Down
4 changes: 2 additions & 2 deletions ...e/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/EngineConfigAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ else if (key.equals("type") && isPrimitiveType(value))
else if (jsonObject.containsKey("type") &&
isPrimitiveType(jsonObject.get("type")))
{
if (key.equals("title") || key.equals("description"))
if (key.equals("title") || key.equals("description") || key.equals("default"))
{
builder.add(key, value);
}
Expand Down Expand Up @@ -137,7 +137,7 @@ private JsonArray createAnyOfTypes(

properties.forEach((key, value) ->
{
if (!"title".equals(key) && !"description".equals(key))
if (!"title".equals(key) && !"description".equals(key) && !"default".equals(key))
{
objectBuilder.add(key, value);
}
Expand Down
9 changes: 9 additions & 0 deletions ...c/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/schema/asyncapi.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "server", "client", "proxy" ]
},
"entry": false,
"catalog": false,
"options":
{
"properties":
Expand Down Expand Up @@ -78,6 +80,7 @@
},
"catalog":
{
"title": "Catalog",
"type": "object",
"patternProperties":
{
Expand Down Expand Up @@ -201,14 +204,20 @@
},
"routes":
{
"title": "Routes",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"when":
{
"title": "When",
"type": "array",
"items":
{
"type": "object",
"additionalProperties": false,
"properties":
{
Expand Down
2 changes: 2 additions & 0 deletions ....spec/src/main/scripts/io/aklivity/zilla/specs/binding/echo/schema/echo.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "server" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options": false,
"routes": false,
Expand Down
2 changes: 2 additions & 0 deletions ...an.spec/src/main/scripts/io/aklivity/zilla/specs/binding/fan/schema/fan.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "server" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options": false,
"routes": false
Expand Down
2 changes: 2 additions & 0 deletions ...in/scripts/io/aklivity/zilla/specs/binding/filesystem/schema/filesystem.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "server" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options":
{
Expand Down
12 changes: 11 additions & 1 deletion ...in/scripts/io/aklivity/zilla/specs/binding/grpc/kafka/schema/grpc.kafka.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "proxy" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options":
{
Expand Down Expand Up @@ -123,14 +125,20 @@
},
"routes":
{
"title": "Routes",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"when":
{
"title": "When",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"method":
Expand Down Expand Up @@ -192,6 +200,7 @@
"type": "array",
"items":
{
"type": "object",
"properties":
{
"key":
Expand Down Expand Up @@ -233,7 +242,8 @@
{
"title": "Acks",
"type": "string",
"enum": [ "none", "leader_only", "in_sync_replicas" ]
"enum": [ "none", "leader_only", "in_sync_replicas" ],
"default": "in_sync_replicas"
},
"key":
{
Expand Down
43 changes: 43 additions & 0 deletions ....spec/src/main/scripts/io/aklivity/zilla/specs/binding/grpc/schema/grpc.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,20 @@
"vault": false,
"routes":
{
"title": "Routes",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"when":
{
"title": "When",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"method":
Expand Down Expand Up @@ -107,6 +113,7 @@
{
"const": "server"
},
"entry": false,
"options":
{
"properties":
Expand All @@ -124,6 +131,40 @@
}
},
"additionalProperties": false
},
"catalog":
{
"title": "Catalog",
"type": "object",
"patternProperties":
{
"^[a-zA-Z]+[a-zA-Z0-9\\._\\-]*$":
{
"type": "array",
"items":
{
"type": "object",
"properties":
{
"subject":
{
"type": "string"
},
"version":
{
"type": "string",
"default": "latest"
}
},
"required":
[
"subject"
],
"additionalProperties": false
}
}
},
"maxProperties": 1
}
}
},
Expand All @@ -134,6 +175,8 @@
{
"const": "client"
},
"entry": false,
"catalog": false,
"options": false
}
}
Expand Down
8 changes: 8 additions & 0 deletions .../io/aklivity/zilla/specs/binding/http/filesystem/schema/http.filesystem.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,26 @@
{
"enum": [ "proxy" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options": false,
"routes":
{
"title": "Routes",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"when":
{
"title": "When",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"path":
Expand Down
12 changes: 11 additions & 1 deletion ...in/scripts/io/aklivity/zilla/specs/binding/http/kafka/schema/http.kafka.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "proxy" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options":
{
Expand Down Expand Up @@ -94,14 +96,20 @@
},
"routes":
{
"title": "Routes",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"when":
{
"title": "When",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"method":
Expand Down Expand Up @@ -143,6 +151,7 @@
"type": "array",
"items":
{
"type": "object",
"properties":
{
"key":
Expand Down Expand Up @@ -228,7 +237,8 @@
{
"title": "Acks",
"type": "string",
"enum": [ "none", "leader_only", "in_sync_replicas" ]
"enum": [ "none", "leader_only", "in_sync_replicas" ],
"default": "in_sync_replicas"
},
"key":
{
Expand Down
13 changes: 11 additions & 2 deletions ....spec/src/main/scripts/io/aklivity/zilla/specs/binding/http/schema/http.schema.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
{
"enum": [ "server", "client" ]
},
"entry": false,
"catalog": false,
"vault": false,
"options":
{
Expand All @@ -57,7 +59,8 @@
"policy":
{
"title": "Policy",
"type": "string"
"type": "string",
"enum": [ "same-origin" , "cross-origin" ]
}
},
"oneOf":
Expand Down Expand Up @@ -346,14 +349,20 @@
},
"routes":
{
"title": "Routes",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"when":
{
"title": "When",
"type": "array",
"items":
{
"type": "object",
"properties":
{
"headers":
Expand Down Expand Up @@ -434,7 +443,7 @@
{
"^[a-zA-Z]+[a-zA-Z0-9\\._\\-]*$":
{
"title": "Authorization",
"title": "Guard",
"type": "object",
"properties":
{
Expand Down
Loading