Skip to content

Commit 8274aea

Browse files
(SCHEMAS) Regenerate 2024/04 schemas
This change regenerates the canonical schemas from the updated source definitions.
1 parent 78f6640 commit 8274aea

File tree

8 files changed

+733
-31
lines changed

8 files changed

+733
-31
lines changed

schemas/2024/04/bundled/outputs/resource/list.json

Lines changed: 117 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"SetHandlesExist",
2727
"Test",
2828
"Delete",
29-
"Export"
29+
"Export",
30+
"Resolve"
3031
]
3132
}
3233
},
@@ -125,7 +126,8 @@
125126
"enum": [
126127
"Resource",
127128
"Adapter",
128-
"Group"
129+
"Group",
130+
"Import"
129131
]
130132
},
131133
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/definitions/semver.json": {
@@ -146,8 +148,7 @@
146148
"required": [
147149
"$schema",
148150
"type",
149-
"version",
150-
"get"
151+
"version"
151152
],
152153
"properties": {
153154
"$schema": {
@@ -211,6 +212,9 @@
211212
"validate": {
212213
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.validate.json"
213214
},
215+
"resolve": {
216+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.resolve.json"
217+
},
214218
"adapter": {
215219
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.adapter.json"
216220
},
@@ -244,7 +248,48 @@
244248
"schema": {
245249
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.schema.json"
246250
}
247-
}
251+
},
252+
"allOf": [
253+
{
254+
"if": {
255+
"properties": {
256+
"kind": {
257+
"const": "Adapter"
258+
}
259+
},
260+
"required": [
261+
"kind"
262+
]
263+
},
264+
"then": {
265+
"required": [
266+
"adapter"
267+
]
268+
}
269+
},
270+
{
271+
"if": {
272+
"properties": {
273+
"kind": {
274+
"const": "Import"
275+
}
276+
},
277+
"required": [
278+
"kind"
279+
]
280+
},
281+
"then": {
282+
"required": [
283+
"resolve"
284+
]
285+
},
286+
"else": {
287+
"required": [
288+
"get"
289+
]
290+
}
291+
}
292+
]
248293
},
249294
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.get.json": {
250295
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -669,6 +714,73 @@
669714
}
670715
]
671716
},
717+
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.resolve.json": {
718+
"$schema": "https://json-schema.org/draft/2020-12/schema",
719+
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.resolve.json",
720+
"title": "Resolve method",
721+
"description": "Defines how DSC must call the DSC Resource to resolve an external source to nested DSC Resource instances. Define this method for importer resources where the resource kind is set to `Import`.",
722+
"type": "object",
723+
"required": [
724+
"executable"
725+
],
726+
"properties": {
727+
"executable": {
728+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/definitions/commandExecutable.json"
729+
},
730+
"args": {
731+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/definitions/commandArgs.json"
732+
},
733+
"input": {
734+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/definitions/inputKind.json"
735+
}
736+
},
737+
"oneOf": [
738+
{
739+
"required": [
740+
"input"
741+
],
742+
"not": {
743+
"properties": {
744+
"args": {
745+
"contains": {
746+
"type": "object"
747+
}
748+
}
749+
}
750+
}
751+
},
752+
{
753+
"not": {
754+
"required": [
755+
"input"
756+
]
757+
},
758+
"properties": {
759+
"args": {
760+
"contains": {
761+
"type": "object"
762+
},
763+
"minContains": 1,
764+
"maxContains": 1
765+
}
766+
}
767+
},
768+
{
769+
"required": [
770+
"input"
771+
],
772+
"properties": {
773+
"args": {
774+
"contains": {
775+
"type": "object"
776+
},
777+
"minContains": 1,
778+
"maxContains": 1
779+
}
780+
}
781+
}
782+
]
783+
},
672784
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.adapter.json": {
673785
"$schema": "https://json-schema.org/draft/2020-12/schema",
674786
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.adapter.json",

schemas/2024/04/bundled/outputs/resource/list.vscode.json

Lines changed: 194 additions & 10 deletions
Large diffs are not rendered by default.

schemas/2024/04/bundled/resource/manifest.json

Lines changed: 114 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
"required": [
88
"$schema",
99
"type",
10-
"version",
11-
"get"
10+
"version"
1211
],
1312
"properties": {
1413
"$schema": {
@@ -72,6 +71,9 @@
7271
"validate": {
7372
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.validate.json"
7473
},
74+
"resolve": {
75+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.resolve.json"
76+
},
7577
"adapter": {
7678
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.adapter.json"
7779
},
@@ -106,6 +108,47 @@
106108
"$ref": "/PowerShell/DSC/main/schemas/2024/04/resource/manifest.schema.json"
107109
}
108110
},
111+
"allOf": [
112+
{
113+
"if": {
114+
"properties": {
115+
"kind": {
116+
"const": "Adapter"
117+
}
118+
},
119+
"required": [
120+
"kind"
121+
]
122+
},
123+
"then": {
124+
"required": [
125+
"adapter"
126+
]
127+
}
128+
},
129+
{
130+
"if": {
131+
"properties": {
132+
"kind": {
133+
"const": "Import"
134+
}
135+
},
136+
"required": [
137+
"kind"
138+
]
139+
},
140+
"then": {
141+
"required": [
142+
"resolve"
143+
]
144+
},
145+
"else": {
146+
"required": [
147+
"get"
148+
]
149+
}
150+
}
151+
],
109152
"$defs": {
110153
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/definitions/resourceType.json": {
111154
"$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -133,7 +176,8 @@
133176
"enum": [
134177
"Resource",
135178
"Adapter",
136-
"Group"
179+
"Group",
180+
"Import"
137181
]
138182
},
139183
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.get.json": {
@@ -559,6 +603,73 @@
559603
}
560604
]
561605
},
606+
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.resolve.json": {
607+
"$schema": "https://json-schema.org/draft/2020-12/schema",
608+
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.resolve.json",
609+
"title": "Resolve method",
610+
"description": "Defines how DSC must call the DSC Resource to resolve an external source to nested DSC Resource instances. Define this method for importer resources where the resource kind is set to `Import`.",
611+
"type": "object",
612+
"required": [
613+
"executable"
614+
],
615+
"properties": {
616+
"executable": {
617+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/definitions/commandExecutable.json"
618+
},
619+
"args": {
620+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/definitions/commandArgs.json"
621+
},
622+
"input": {
623+
"$ref": "/PowerShell/DSC/main/schemas/2024/04/definitions/inputKind.json"
624+
}
625+
},
626+
"oneOf": [
627+
{
628+
"required": [
629+
"input"
630+
],
631+
"not": {
632+
"properties": {
633+
"args": {
634+
"contains": {
635+
"type": "object"
636+
}
637+
}
638+
}
639+
}
640+
},
641+
{
642+
"not": {
643+
"required": [
644+
"input"
645+
]
646+
},
647+
"properties": {
648+
"args": {
649+
"contains": {
650+
"type": "object"
651+
},
652+
"minContains": 1,
653+
"maxContains": 1
654+
}
655+
}
656+
},
657+
{
658+
"required": [
659+
"input"
660+
],
661+
"properties": {
662+
"args": {
663+
"contains": {
664+
"type": "object"
665+
},
666+
"minContains": 1,
667+
"maxContains": 1
668+
}
669+
}
670+
}
671+
]
672+
},
562673
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.adapter.json": {
563674
"$schema": "https://json-schema.org/draft/2020-12/schema",
564675
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/resource/manifest.adapter.json",

0 commit comments

Comments
 (0)