Skip to content

Commit 31f7e17

Browse files
authored
Merge pull request #325 from michaeltlombardi/docs/main/yaml-manifests
(DOCS) Document resource manifests as YAML
2 parents 07c646e + 4bc6f10 commit 31f7e17

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ changes since the last release, see the [diff on GitHub][unreleased].
2424
<!-- Unreleased comparison link -->
2525
[unreleased]: https://github.com/PowerShell/DSC/compare/v3.0.0-alpha.4...main
2626

27+
<!-- Add entries between releases under the appropriate section heading here -->
28+
2729
### Changed
2830

2931
- Updated the options for the `dsc` root command:
@@ -62,7 +64,16 @@ changes since the last release, see the [diff on GitHub][unreleased].
6264

6365
</details>
6466

65-
<!-- Add entries between releases under the appropriate section heading here -->
67+
- Added support for authoring DSC Resource manifests in YAML. DSC now recognizes resource manifests
68+
that use the `.dsc.resource.yml` or `.dsc.resource.yaml` file extension instead of only
69+
`.dsc.resource.json`.
70+
71+
<details><summary>Related work Items</summary>
72+
73+
- Issues: [#129][#129]
74+
- PRs: [#311][#311]
75+
76+
</details>
6677

6778
## [v3.0.0-alpha.4][release-v3.0.0-alpha.4] - 2023-11-14
6879

@@ -523,6 +534,7 @@ For the full list of changes in this release, see the [diff on GitHub][compare-v
523534
[#107]: https://github.com/PowerShell/DSC/issues/107
524535
[#121]: https://github.com/PowerShell/DSC/issues/121
525536
[#127]: https://github.com/PowerShell/DSC/issues/127
537+
[#129]: https://github.com/PowerShell/DSC/issues/129
526538
[#130]: https://github.com/PowerShell/DSC/issues/130
527539
[#133]: https://github.com/PowerShell/DSC/issues/133
528540
[#150]: https://github.com/PowerShell/DSC/issues/150
@@ -561,6 +573,7 @@ For the full list of changes in this release, see the [diff on GitHub][compare-v
561573
[#291]: https://github.com/PowerShell/DSC/issues/291
562574
[#294]: https://github.com/PowerShell/DSC/issues/294
563575
[#299]: https://github.com/PowerShell/DSC/issues/299
576+
[#311]: https://github.com/PowerShell/DSC/issues/311
564577
[#45]: https://github.com/PowerShell/DSC/issues/45
565578
[#49]: https://github.com/PowerShell/DSC/issues/49
566579
[#57]: https://github.com/PowerShell/DSC/issues/57

docs/reference/cli/resource/list.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dsc resource list [Options] <RESOURCE_NAME>
2121

2222
The `list` subcommand searches for available DSC Resources and returns their information. DSC
2323
discovers resources by first searching the `PATH` or `DSC_RESOURCE_PATH` environment variable for
24-
`.dsc.resource.json` files. For more information about the environment variables DSC uses, see
25-
[Environment variables][01]
24+
`.dsc.resource.json`, `.dsc.resource.yml`, and `dsc.resource.yaml` files. For more information
25+
about the environment variables DSC uses, see [Environment variables][01]
2626

2727
If any of the discovered resources are resource providers, DSC then calls the providers to list
2828
their resources, too.

docs/reference/schemas/config/document.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ A configuration document can be defined as either YAML or JSON. For ease of auth
2929
recommends drafting configuration documents in YAML.
3030
3131
For DSC's authoring tools to recognize a file as a DSC Configuration document, the filename must
32-
end with `.dsc.config.json` or `.dsc.config.yaml`.
32+
end with `.dsc.config.json`, `.dsc.config.yml`, or `.dsc.config.yaml`.
3333

3434
You can use configuration document functions to dynamically determine values in the document at
3535
runtime. For more information, see [DSC Configuration document functions reference][01]

docs/reference/schemas/resource/manifest/root.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ title: Command-based DSC Resource manifest schema reference
99

1010
## Synopsis
1111

12-
The JSON file that defines a command-based DSC Resource.
12+
The data file that defines a command-based DSC Resource.
1313

1414
## Metadata
1515

@@ -24,7 +24,9 @@ Type: object
2424
Every command-based DSC Resource must have a manifest. The manifest file must:
2525
2626
1. Be discoverable in the `PATH` environment variable.
27-
1. Follow the naming convention `<name>.dsc.resource.json`.
27+
1. Be formatted as either JSON or YAML.
28+
1. Follow the naming convention `<name>.dsc.resource.<extension>`. Valid extensions include `json`,
29+
`yml`, and `yaml`.
2830
1. Be valid for the schema described in this document.
2931

3032
The rest of this document describes the manifest's schema.

0 commit comments

Comments
 (0)