napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[netinstall] Remove unnecessary $id from schema

Browse Source 
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.
This commit is contained in:
Adriaan de Groot 2024-07-20 23:29:00 +02:00
parent 13ccb51010
commit 3a6f604232
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/netinstall/netinstall.schema.yaml
View File

@ -6,7 +6,6 @@ $schema: https://json-schema.org/draft-07/schema#
$id: https://calamares.io/schemas/netinstall $id: https://calamares.io/schemas/netinstall
definitions: definitions:
package: package:
$id: 'definitions/package'
oneOf: oneOf:
- -
type: string type: string
@ -20,7 +19,6 @@ definitions:
name: { type: string } name: { type: string }
description: { type: string } description: { type: string }
group: group:
$id: 'definitions/group'
type: object type: object
description: Longer discussion in `netinstall.conf` file under 'Groups Format' description: Longer discussion in `netinstall.conf` file under 'Groups Format'
properties: properties:
@ -55,9 +53,7 @@ definitions:
maxItems: 0 maxItems: 0
then: then:
required: [name, description, packages] # bottom-most (sub)group requires some package (otherwise, why bother?) required: [name, description, packages] # bottom-most (sub)group requires some package (otherwise, why bother?)
# This should validate `netinstall.yaml` also.
groups: groups:
$id: 'definitions/groups'
type: array type: array
items: { $ref: '#/definitions/group' } items: { $ref: '#/definitions/group' }