From ba7ee6ecbb364f6b7355e8b1d905d0050c2fa01c Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Tue, 17 Dec 2024 17:06:00 +0000 Subject: [PATCH] docs/tutorial/converting-json-schema-to-cue: use 2020-12 schema Use draft/2020-12 to be more up-to-date in our example. This will not fix the breaking tip build; that happens in the next CL. Signed-off-by: Paul Jolly Change-Id: I2044c9822fdda3ecdeb351f40957deda92dfc361 Dispatch-Trailer: {"type":"trybot","CL":1205925,"patchset":2,"ref":"refs/changes/25/1205925/2","targetBranch":"master"} --- content/docs/tutorial/converting-json-schema-to-cue/en.md | 6 +++--- .../tutorial/converting-json-schema-to-cue/gen_cache.cue | 8 ++++---- .../docs/tutorial/converting-json-schema-to-cue/index.md | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/docs/tutorial/converting-json-schema-to-cue/en.md b/content/docs/tutorial/converting-json-schema-to-cue/en.md index 461cb965d..e5e781ec2 100644 --- a/content/docs/tutorial/converting-json-schema-to-cue/en.md +++ b/content/docs/tutorial/converting-json-schema-to-cue/en.md @@ -58,7 +58,7 @@ Create a JSON schema file: {{{with upload "en" "json schema"}}} -- schema.json -- { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "additionalProperties": false, "required": [ @@ -80,7 +80,7 @@ Create a JSON schema file: } } }, - "definitions": { + "$defs": { "table": { "type": "object", "additionalProperties": false, @@ -127,7 +127,7 @@ Here, we choose the `cuisine` package. package cuisine #restaurant: { - @jsonschema(schema="http://json-schema.org/draft-07/schema#") + @jsonschema(schema="https://json-schema.org/draft/2020-12/schema") close({ name!: string cuisine!: string diff --git a/content/docs/tutorial/converting-json-schema-to-cue/gen_cache.cue b/content/docs/tutorial/converting-json-schema-to-cue/gen_cache.cue index 95a28b3a3..fa8a0e44f 100644 --- a/content/docs/tutorial/converting-json-schema-to-cue/gen_cache.cue +++ b/content/docs/tutorial/converting-json-schema-to-cue/gen_cache.cue @@ -7,15 +7,15 @@ package site page: { cache: { upload: { - "json schema": "jfEbTSe7qSCZzRSleBi4PCmRHTtKWjQHA0gfziyren8=" - "schema.cue": "iKD/BMEMVrR2UYOyDSEcz34lqrW7XscResx21BBLZB0=" + "json schema": "iEVS2DSLh/ky16GL3ikDxbDTvIoZMv454zcFfWjBk/Y=" + "schema.cue": "3MbJbkYu0kPoCoId58kRl+Y8xmflaaWwoKmU6lQHptg=" "split_pea.yml": "UxEgCk8nWpEluNf8r6tVMWJl9Sh1rS/8SX3/Xpl/1+U=" "pomodoro.yml": "Pt5o2CsF9LCtktGp5Odo3B/vanYAwn7hjVQG1S9sDoU=" "pomodoro.yml fixed": "iKrYngHQKdG8RN6GyUeyk74mQ53lSnQnnfqlNHNACCE=" } multi_step: { - hash: "SS1JHSITK2AVITGDUMB1T0HS8V74OFNSKTFE44GCUM0B0OB1OCB0====" - scriptHash: "F13IT2J3MN36GG3N09O9518426I38RFFPOPK0L8BIOG0OSCEHI0G====" + hash: "BO5358MUA58V67556OOVNF5IBAS6QSA9M18FNV6U1BE5HODBO4E0====" + scriptHash: "C4LR0D5POADT8TNNESICONGVCB5E89FSU7UHCQ06E31VTC5S7HF0====" steps: [{ doc: "#ellipsis 1" cmd: "cue version" diff --git a/hugo/content/en/docs/tutorial/converting-json-schema-to-cue/index.md b/hugo/content/en/docs/tutorial/converting-json-schema-to-cue/index.md index 79fd978eb..03750d6aa 100644 --- a/hugo/content/en/docs/tutorial/converting-json-schema-to-cue/index.md +++ b/hugo/content/en/docs/tutorial/converting-json-schema-to-cue/index.md @@ -59,7 +59,7 @@ Create a JSON schema file: {{< code-tabs >}} {{< code-tab name="schema.json" language="json" area="top-left" >}} { - "$schema": "http://json-schema.org/draft-07/schema#", + "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "additionalProperties": false, "required": [ @@ -81,7 +81,7 @@ Create a JSON schema file: } } }, - "definitions": { + "$defs": { "table": { "type": "object", "additionalProperties": false, @@ -122,7 +122,7 @@ Here, we choose the `cuisine` package. package cuisine #restaurant: { - @jsonschema(schema="http://json-schema.org/draft-07/schema#") + @jsonschema(schema="https://json-schema.org/draft/2020-12/schema") close({ name!: string cuisine!: string