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.

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

docs: improve schemas #773

Merged
merged 3 commits into from
Oct 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 8 additions & 13 deletions .schema/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
"title": "ORY Kratos Configuration",
"type": "object",
"definitions": {
"version": {
"type": "string",
"description": "SemVer according to https://semver.org/ prefixed with `v` as in our releases.",
"pattern": "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
},
"defaultReturnTo": {
"title": "Redirect browsers to set URL per default",
"description": "ORY Kratos redirects to this URL per default on completion of self-service flows and other browser interaction. Read this [article for more information on browser redirects](https://www.ory.sh/kratos/docs/concepts/browser-redirect-flow-completion).",
Expand Down Expand Up @@ -1103,7 +1098,8 @@
"properties": {
"domain": {
"title": "Session Cookie Domain",
"description": "Sets the session cookie domain. Useful when dealing with subdomains. Use with care!"
"description": "Sets the session cookie domain. Useful when dealing with subdomains. Use with care!",
"type": "string"
},
"persistent": {
"title": "Make Session Cookie Persistent",
Expand Down Expand Up @@ -1133,13 +1129,12 @@
}
},
"version": {
"allOf": [
{
"title": "The kratos version this config is written for."
},
{
"$ref": "#/definitions/version"
}
"title": "The kratos version this config is written for.",
"description": "SemVer according to https://semver.org/ prefixed with `v` as in our releases.",
"type": "string",
"pattern": "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
"examples": [
"v0.5.0-alpha.1"
]
}
},
Expand Down
14 changes: 0 additions & 14 deletions .schema/version.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,6 @@
}
]
},
{
"allOf": [
{
"properties": {
"version": {
"const": "v0.5.0-alpha.1.pre.1"
}
}
},
{
"$ref": "https://raw.githubusercontent.com/ory/kratos/v0.5.0-alpha.1.pre.1/.schema/config.schema.json"
}
]
},
{
"allOf": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version: x1.0.0

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,5 @@ hashers:
parallelism: 1
salt_length: 16
key_length: 16

version: v1.0.0

This file was deleted.