From 3a6f604232b11cf8f28f11ab99ff4c8629102519 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 20 Jul 2024 23:29:00 +0200 Subject: [PATCH] [netinstall] Remove unnecessary $id from schema The base-URI of the schema is already set; references that are relative and contain only a fragment (e.g. start with `#`) resolve against the base-URI, so that's within this document. Since we already have `definitions` as a key, `#/definitions` references that sub-schema. We don't need the `$id` settings in each sub-schema, which messes up the base-URI; it should have been an `$anchor`, maybe, but isn't necessary after all. --- src/modules/netinstall/netinstall.schema.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/modules/netinstall/netinstall.schema.yaml b/src/modules/netinstall/netinstall.schema.yaml index 8f057b503..1faf65651 100644 --- a/src/modules/netinstall/netinstall.schema.yaml +++ b/src/modules/netinstall/netinstall.schema.yaml @@ -6,7 +6,6 @@ $schema: https://json-schema.org/draft-07/schema# $id: https://calamares.io/schemas/netinstall definitions: package: - $id: 'definitions/package' oneOf: - type: string @@ -20,7 +19,6 @@ definitions: name: { type: string } description: { type: string } group: - $id: 'definitions/group' type: object description: Longer discussion in `netinstall.conf` file under 'Groups Format' properties: @@ -55,9 +53,7 @@ definitions: maxItems: 0 then: required: [name, description, packages] # bottom-most (sub)group requires some package (otherwise, why bother?) - # This should validate `netinstall.yaml` also. groups: - $id: 'definitions/groups' type: array items: { $ref: '#/definitions/group' }