Skip to content

Commit

Permalink
(SCHEMA) Add Microsoft.DSC config metadata schema
Browse files Browse the repository at this point in the history
This change updates the `metadata` property of the configuration
document schema to include the validated `Microsoft.DSC` property,
with the `requiredSecurityContext` child property, as implemented
in PowerShell#351.

This change updates both the source and composed schemas.
  • Loading branch information
michaeltlombardi committed Apr 18, 2024
1 parent 2d14880 commit 333fa8c
Show file tree
Hide file tree
Showing 6 changed files with 265 additions and 88 deletions.
32 changes: 29 additions & 3 deletions schemas/2024/04/bundled/config/document.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@
}
},
"metadata": {
"title": "Configuration metadata",
"description": "Defines a set of key-value pairs for the configuration. This metadata isn't validated.",
"type": "object"
"$ref": "/PowerShell/DSC/main/schemas/2024/04/config/document.metadata.json"
}
},
"$defs": {
Expand Down Expand Up @@ -317,6 +315,34 @@
}
}
},
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.metadata.json": {
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.metadata.json",
"title": "Configuration metadata",
"description": "Defines a set of key-value pairs for the configuration. Except for the `Microsoft.DSC` property, this metadata isn't validated. You can pass any data into this property of a configuration document.",
"type": "object",
"properties": {
"Microsoft.DSC": {
"type": "object",
"title": "DSC metadata",
"description": "The `Microsoft.DSC` metadata property contains directives and information that DSC itself uses when processing a configuration document. Unlike other metadata key-value pairs, DSC validates these properties.",
"unevaluatedProperties": false,
"properties": {
"requiredSecurityContext": {
"type": "string",
"enum": [
"Current",
"Elevated",
"Restricted"
],
"default": "Current",
"title": "Required security context",
"description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `Current`."
}
}
}
}
},
"https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/definitions/parameters/dataTypes.json": {
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/definitions/parameters/dataTypes.json",
Expand Down
97 changes: 65 additions & 32 deletions schemas/2024/04/bundled/config/document.vscode.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,38 +122,7 @@
"markdownDescription": "***\n[_Online Documentation_][01]\n***\n\nDefines a list of DSC Resource instances for the configuration to manage.\n\n[01]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/document?view=dsc-3.0&preserve-view=true#resources\n"
},
"metadata": {
"title": "Configuration metadata",
"description": "Defines a set of key-value pairs for the configuration. This metadata isn't validated.",
"type": "object",
"markdownDescription": "***\n[_Online Documentation_][01]\n***\n\nDefines a set of key-value pairs for the configuration. This metadata isn't validated.\n\n[01]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/document?view=dsc-3.0&preserve-view=true#metadata-1\n",
"defaultSnippets": [
{
"label": " New metadata property",
"markdownDescription": "Defines a key-value pair for the metadata:\n\n```yaml\nmetadataName: value\n```",
"body": {
"${1:metadataName}": "${2:value}"
}
},
{
"label": " New metadata property (object)",
"markdownDescription": "Defines a new key-value pair for the metadata where the value is an object.\n\n```yaml\nmetadataName:\n key: value\n```",
"body": {
"${1:metadataName}": {
"${2:key}": "${3:value}"
}
}
},
{
"label": " New metadata property (array)",
"markdownDescription": "Defines a new key-value pair for the metadata where the value is an array.\n\n```yaml\nmetadataName:\n - firstValue\n - secondValue\n```",
"body": {
"${1:metadataName}": [
"${2:firstValue}",
"${3:secondValue}"
]
}
}
]
"$ref": "#/$defs/PowerShell/DSC/main/schemas/2024/04/config/document.metadata.json"
}
},
"$defs": {
Expand Down Expand Up @@ -500,6 +469,70 @@
}
}
]
},
"document.metadata.json": {
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.metadata.json",
"title": "Configuration metadata",
"description": "Defines a set of key-value pairs for the configuration. Except for the `Microsoft.DSC` property, this metadata isn't validated. You can pass any data into this property of a configuration document.",
"type": "object",
"properties": {
"Microsoft.DSC": {
"type": "object",
"title": "DSC metadata",
"description": "The `Microsoft.DSC` metadata property contains directives and information that DSC itself uses when processing a configuration document. Unlike other metadata key-value pairs, DSC validates these properties.",
"markdownDescription": "***\n[_Online Documentation_][01]\n***\n\nThe `Microsoft.DSC` metadata property contains directives and information that DSC itself\nuses when processing a configuration document. Unlike other metadata key-value pairs, DSC\nvalidates these properties.\n\n[01]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/metadata?view=dsc-3.0&preserve-view=true#microsoft.dsc\n",
"unevaluatedProperties": false,
"properties": {
"requiredSecurityContext": {
"type": "string",
"enum": [
"Current",
"Elevated",
"Restricted"
],
"default": "Current",
"title": "Required security context",
"description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `Current`.",
"markdownDescription": "***\n[_Online Documentation_][01]\n***\n\nThis property defines the security context a configuration requires. If you invoke a DSC\noperation against the configuration document in a security context that conflicts with\nthis metadata, DSC raises an error when it validates the configuration document.\n\nThe default security context is `Current`.\n\n[01]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/metadata?view=dsc-3.0&preserve-view=true#microsoft.dsc\n",
"markdownEnumDescriptions": [
"<!-- force a line break -->\n\n> ### Current security context\n>\n> Indicates that the configuration document is usable under any security context. You\n> can invoke DSC operations against the document when elevated as root or an\n> administrator and as a normal user or account.\n",
"<!-- force a line break -->\n\n> ### Elevated security context\n>\n> Indicates that the configuration document is usable only in an elevated security\n> context. You can invoke DSC operations against the document when elevated as root or\n> an administrator. When you invoke DSC operations against the document as a\n> non-elevated user or account, DSC raises an error when it validates the configuration\n> document.\n",
"<!-- force a line break -->\n\n> ### Restricted security context\n>\n> Indicates that the configuration document is usable only in a non-elevated security\n> context. You can invoke DSC operations against the document as a non-elevated user or\n> account. When you invoke DSC operations against the document as root or an\n> administrator, DSC raises an error when it validates the configuration document.\n"
]
}
}
}
},
"markdownDescription": "***\n[_Online Documentation_][01]\n***\n\nDefines a set of key-value pairs for the configuration. Except for the `Microsoft.DSC`\nproperty, this metadata isn't validated. You can pass any data into this property of a\nconfiguration document.\n\nThe `Microsoft.DSC` metadata property contains metadata directives and information that DSC\nitself uses when processing the configuration document. For more information, see\n[Microsoft.DSC][02]\n\n[01]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/metadata?view=dsc-3.0&preserve-view=true\n[02]: https://learn.microsoft.com/powershell/dsc/reference/schemas/config/metadata?view=dsc-3.0&preserve-view=true#microsoft.dsc\n",
"defaultSnippets": [
{
"label": " New metadata property",
"markdownDescription": "Defines a key-value pair for the metadata:\n\n```yaml\nmetadataName: value\n```",
"body": {
"${1:metadataName}": "${2:value}"
}
},
{
"label": " New metadata property (object)",
"markdownDescription": "Defines a new key-value pair for the metadata where the value is an object.\n\n```yaml\nmetadataName:\n key: value\n```",
"body": {
"${1:metadataName}": {
"${2:key}": "${3:value}"
}
}
},
{
"label": " New metadata property (array)",
"markdownDescription": "Defines a new key-value pair for the metadata where the value is an array.\n\n```yaml\nmetadataName:\n - firstValue\n - secondValue\n```",
"body": {
"${1:metadataName}": [
"${2:firstValue}",
"${3:secondValue}"
]
}
}
]
}
},
"definitions": {
Expand Down
4 changes: 1 addition & 3 deletions schemas/2024/04/config/document.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@
}
},
"metadata": {
"title": "Configuration metadata",
"description": "Defines a set of key-value pairs for the configuration. This metadata isn't validated.",
"type": "object"
"$ref": "/PowerShell/DSC/main/schemas/2024/04/config/document.metadata.json"
}
}
}
28 changes: 28 additions & 0 deletions schemas/2024/04/config/document.metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.metadata.json",
"title": "Configuration metadata",
"description": "Defines a set of key-value pairs for the configuration. Except for the `Microsoft.DSC` property, this metadata isn't validated. You can pass any data into this property of a configuration document.",
"type": "object",
"properties": {
"Microsoft.DSC": {
"type": "object",
"title": "DSC metadata",
"description": "The `Microsoft.DSC` metadata property contains directives and information that DSC itself uses when processing a configuration document. Unlike other metadata key-value pairs, DSC validates these properties.",
"unevaluatedProperties": false,
"properties": {
"requiredSecurityContext": {
"type": "string",
"enum": [
"Current",
"Elevated",
"Restricted"
],
"default": "Current",
"title": "Required security context",
"description": "This property defines the security context a configuration requires. If you invoke a DSC operation against the configuration document in a security context that conflicts with this metadata, DSC raises an error when it validates the configuration document.\nThe default security context is `Current`."
}
}
}
}
}
141 changes: 141 additions & 0 deletions schemas/src/config/document.metadata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
# yaml-language-server: $schema=https://json-schema.org/draft/2020-12/schema
$schema: https://json-schema.org/draft/2020-12/schema
$id: <HOST>/<PREFIX>/<VERSION>/config/document.metadata.yaml

title: Configuration metadata
description: >-
Defines a set of key-value pairs for the configuration. Except for the `Microsoft.DSC`
property, this metadata isn't validated. You can pass any data into this property of a
configuration document.
type: object
properties:
Microsoft.DSC:
type: object
title: DSC metadata
description: >-
The `Microsoft.DSC` metadata property contains directives and information that DSC itself
uses when processing a configuration document. Unlike other metadata key-value pairs, DSC
validates these properties.
markdownDescription: |
***
[_Online Documentation_][01]
***
The `Microsoft.DSC` metadata property contains directives and information that DSC itself
uses when processing a configuration document. Unlike other metadata key-value pairs, DSC
validates these properties.
[01]: <DOCS_BASE_URL>/reference/schemas/config/metadata?<DOCS_VERSION_PIN>#microsoft.dsc
unevaluatedProperties: false
properties:
requiredSecurityContext:
type: string
enum:
- Current
- Elevated
- Restricted
default: Current
title: Required security context
description: >-
This property defines the security context a configuration requires. If you invoke a DSC
operation against the configuration document in a security context that conflicts with
this metadata, DSC raises an error when it validates the configuration document.
The default security context is `Current`.
markdownDescription: |
***
[_Online Documentation_][01]
***
This property defines the security context a configuration requires. If you invoke a DSC
operation against the configuration document in a security context that conflicts with
this metadata, DSC raises an error when it validates the configuration document.
The default security context is `Current`.
[01]: <DOCS_BASE_URL>/reference/schemas/config/metadata?<DOCS_VERSION_PIN>#microsoft.dsc
markdownEnumDescriptions:
- | # Current
<!-- force a line break -->
> ### Current security context
>
> Indicates that the configuration document is usable under any security context. You
> can invoke DSC operations against the document when elevated as root or an
> administrator and as a normal user or account.
- | # Elevated
<!-- force a line break -->
> ### Elevated security context
>
> Indicates that the configuration document is usable only in an elevated security
> context. You can invoke DSC operations against the document when elevated as root or
> an administrator. When you invoke DSC operations against the document as a
> non-elevated user or account, DSC raises an error when it validates the configuration
> document.
- | # Restricted
<!-- force a line break -->
> ### Restricted security context
>
> Indicates that the configuration document is usable only in a non-elevated security
> context. You can invoke DSC operations against the document as a non-elevated user or
> account. When you invoke DSC operations against the document as root or an
> administrator, DSC raises an error when it validates the configuration document.
# VS Code only
markdownDescription: |
***
[_Online Documentation_][01]
***
Defines a set of key-value pairs for the configuration. Except for the `Microsoft.DSC`
property, this metadata isn't validated. You can pass any data into this property of a
configuration document.
The `Microsoft.DSC` metadata property contains metadata directives and information that DSC
itself uses when processing the configuration document. For more information, see
[Microsoft.DSC][02]
[01]: <DOCS_BASE_URL>/reference/schemas/config/metadata?<DOCS_VERSION_PIN>
[02]: <DOCS_BASE_URL>/reference/schemas/config/metadata?<DOCS_VERSION_PIN>#microsoft.dsc
defaultSnippets:
- label: ' New metadata property'
markdownDescription: |-
Defines a key-value pair for the metadata:
```yaml
metadataName: value
```
body:
${1:metadataName}: ${2:value}

- label: ' New metadata property (object)'
markdownDescription: |-
Defines a new key-value pair for the metadata where the value is an object.
```yaml
metadataName:
key: value
```
body:
${1:metadataName}:
${2:key}: ${3:value}

- label: ' New metadata property (array)'
markdownDescription: |-
Defines a new key-value pair for the metadata where the value is an array.
```yaml
metadataName:
- firstValue
- secondValue
```
body:
${1:metadataName}:
- ${2:firstValue}
- ${3:secondValue}
51 changes: 1 addition & 50 deletions schemas/src/config/document.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -335,53 +335,4 @@ properties:
[01]: <DOCS_BASE_URL>/reference/schemas/config/document?<DOCS_VERSION_PIN>#resources
metadata:
title: Configuration metadata
description: >-
Defines a set of key-value pairs for the configuration. This metadata
isn't validated.
type: object
# VS Code only
markdownDescription: |
***
[_Online Documentation_][01]
***
Defines a set of key-value pairs for the configuration. This metadata isn't validated.
[01]: <DOCS_BASE_URL>/reference/schemas/config/document?<DOCS_VERSION_PIN>#metadata-1
defaultSnippets:
- label: ' New metadata property'
markdownDescription: |-
Defines a key-value pair for the metadata:
```yaml
metadataName: value
```
body:
${1:metadataName}: ${2:value}

- label: ' New metadata property (object)'
markdownDescription: |-
Defines a new key-value pair for the metadata where the value is an object.
```yaml
metadataName:
key: value
```
body:
${1:metadataName}:
${2:key}: ${3:value}

- label: ' New metadata property (array)'
markdownDescription: |-
Defines a new key-value pair for the metadata where the value is an array.
```yaml
metadataName:
- firstValue
- secondValue
```
body:
${1:metadataName}:
- ${2:firstValue}
- ${3:secondValue}
$ref: /<PREFIX>/<VERSION>/config/document.metadata.yaml

0 comments on commit 333fa8c

Please sign in to comment.