Skip to content

Commit

Permalink
chore: update version schema to be compatible with current ory/cli (o…
Browse files Browse the repository at this point in the history
  • Loading branch information
zepatrik authored Aug 1, 2022
1 parent 75bdfc0 commit 2cee9e1
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ indent_size = 2
[{Makefile,go.mod,go.sum,*.go}]
indent_style = tab
indent_size = 4

[.schema/version.schema.json]
indent_style = space
indent_size = 4
45 changes: 39 additions & 6 deletions .schema/version.schema.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
{
"$id": "https://github.com/ory/kratos/.schema/versions.config.schema.json",
"$schema": "https://raw.githubusercontent.com/ory/cli/v0.0.21/.schema/version_meta.schema.json#",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "All Versions of the ORY Hydra Configuration",
"type": "object",
"oneOf": [
{
"allOf": [
{
"properties": {
"version": {
"const": "v1.11.7"
}
}
},
{
"$ref": "https://raw.githubusercontent.com/ory/hydra/v1.11.7/spec/config.json"
}
]
},
{
"allOf": [
{
Expand Down Expand Up @@ -257,16 +271,35 @@
]
},
{
"description": "This is the fallback to the latest version (the first one in this schema) in case no version is specified.",
"allOf": [
{
"properties": {
"version": {
"const": "v1.11.7"
"oneOf": [
{
"properties": {
"version": {
"type": "string",
"maxLength": 0
}
},
"required": [
"version"
]
},
{
"not": {
"properties": {
"version": {}
},
"required": [
"version"
]
}
}
}
]
},
{
"$ref": "https://raw.githubusercontent.com/ory/hydra/v1.11.7/spec/config.json"
"$ref": "#/oneOf/0/allOf/1"
}
]
}
Expand Down

0 comments on commit 2cee9e1

Please sign in to comment.