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

[netinstall] Repair schema IDs

Browse Source 
The schema is considered invalid by **some** versions of
configvalidator (or rather, the underlying jsonschema):

```
128: '#definitions/groups' does not match '^[^#]*#?$'
128:
128: Failed validating 'pattern' in metaschema['properties']['definitions']['additionalProperties']['$dynamicRef']['allOf'][0]['properties']['$id']:
128:     {'$comment': 'Non-empty fragments not allowed.',
128:      '$ref': '#/$defs/uriReferenceString',
128:      'pattern': '^[^#]*#?$'}
```

Remove the `#` from the IDs.
This commit is contained in:
Adriaan de Groot 2022-06-27 23:12:31 +02:00
parent cdbc7fffca
commit bb05deca33
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ $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' $id: 'definitions/package'
oneOf: oneOf:
- -
type: string type: string
@ -20,7 +20,7 @@ definitions:
name: { type: string } name: { type: string }
description: { type: string } description: { type: string }
group: group:
$id: '#definitions/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:
@ -28,7 +28,7 @@ definitions:
description: { type: string } description: { type: string }
packages: packages:
type: array type: array
items: { $ref: '#definitions/package' } items: { $ref: 'definitions/package' }
hidden: { type: boolean, default: false } hidden: { type: boolean, default: false }
selected: { type: boolean } selected: { type: boolean }
critical: { type: boolean, default: false } critical: { type: boolean, default: false }
@ -36,7 +36,7 @@ definitions:
expanded: { type: boolean } expanded: { type: boolean }
subgroups: subgroups:
type: array type: array
items: { $ref: '#definitions/group' } items: { $ref: 'definitions/group' }
pre-install: pre-install:
type: string type: string
description: an optional command to run within the new system before the group's description: an optional command to run within the new system before the group's
@ -56,9 +56,9 @@ definitions:
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. # This should validate `netinstall.yaml` also.
groups: groups:
$id: '#definitions/groups' $id: 'definitions/groups'
type: array type: array
items: { $ref: '#definitions/group' } items: { $ref: 'definitions/group' }
oneOf: oneOf:
- # netinstall.conf - # netinstall.conf
@ -74,16 +74,16 @@ oneOf:
properties: properties:
sidebar: { type: string } sidebar: { type: string }
title: { type: string } title: { type: string }
groups: { $ref: '#definitions/groups' } groups: { $ref: 'definitions/groups' }
required: [ groupsUrl ] required: [ groupsUrl ]
- # Groups file with top level *groups* key - # Groups file with top level *groups* key
type: object type: object
description: Groups file with top level *groups* key description: Groups file with top level *groups* key
additionalProperties: false additionalProperties: false
properties: properties:
groups: { $ref: '#definitions/groups' } groups: { $ref: 'definitions/groups' }
required: [ groups ] required: [ groups ]
- # Groups file bare - # Groups file bare
{ $ref: '#definitions/groups' } { $ref: 'definitions/groups' }