Skip to content

Add manifest patterns for DSC resource discovery #1505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gijsreyn wants to merge 3 commits into
base: main
Choose a base branch
from
+45 −3
Open

Add manifest patterns for DSC resource discovery #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
741c16b
Add manifest patterns for DSC resource discovery
Gijsreyn May 1, 2026
dff58a4
Update tests
Gijsreyn May 1, 2026
a6d7093
Update version check for discovered resources to 0.1.1
Gijsreyn May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dsc/tests/dsc_extension_discover.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Describe 'Discover extension tests' {
if ($IsWindows) {
$out.Count | Should -Be 3 -Because ($out | Out-String)
$out[0].type | Should -BeExactly 'Microsoft.PowerShell/Discover'
$out[0].version | Should -BeExactly '0.1.0'
$out[0].version | Should -BeExactly '0.1.1'
$out[0].capabilities | Should -BeExactly @('discover')
$out[0].manifest | Should -Not -BeNullOrEmpty
$out[1].type | Should -BeExactly 'Microsoft.Windows.Appx/Discover'
Expand All @@ -40,7 +40,7 @@ Describe 'Discover extension tests' {
} else {
$out.Count | Should -Be 2 -Because ($out | Out-String)
$out[0].type | Should -BeExactly 'Microsoft.PowerShell/Discover'
$out[0].version | Should -BeExactly '0.1.0'
$out[0].version | Should -BeExactly '0.1.1'
$out[0].capabilities | Should -BeExactly @('discover')
$out[0].manifest | Should -Not -BeNullOrEmpty
$out[1].type | Should -BeExactly 'Test/Discover'
Expand Down
3 changes: 3 additions & 0 deletions extensions/powershell/powershell.discover.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ function Invoke-DscResourceDiscovery {
'*.dsc.adaptedresource.json'
'*.dsc.adaptedresource.yaml'
'*.dsc.adaptedresource.yml'
'*.dsc.manifests.json'
'*.dsc.manifests.yaml'
'*.dsc.manifests.yml'
Comment thread
Gijsreyn marked this conversation as resolved.
)
$enumOptions = [System.IO.EnumerationOptions]@{ IgnoreInaccessible = $true; RecurseSubdirectories = $true }
foreach ($pattern in $searchPatterns) {
Expand Down
39 changes: 39 additions & 0 deletions extensions/powershell/powershell.discover.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,39 @@ BeforeAll {
$adaptedManifestPath = Join-Path $TestDrive "fake.dsc.adaptedresource.json"
$fakeAdaptedManifest | ConvertTo-Json -Depth 10 | Set-Content -Path $adaptedManifestPath

$fakeManifestList = @{
'$schema' = "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json"
resources = @(
@{
type = "Test/FakeListedResource"
version = "0.1.0"
kind = "resource"
get = @{
executable = "fakeListedResource"
args = @(
"get",
@{
jsonInputArg = "--input"
mandatory = $true
}
)
}
}
)
adaptedResources = @(
@{
type = "Test/FakeListedAdaptedResource"
kind = "resource"
version = "0.1.0"
requireAdapter = "Microsoft.Adapter/PowerShell"
path = "FakeAdapted.psd1"
}
)
}

$manifestListPath = Join-Path $TestDrive "fake.dsc.manifests.json"
$fakeManifestList | ConvertTo-Json -Depth 10 | Set-Content -Path $manifestListPath

$fakePsd1Path = Join-Path $TestDrive "FakeAdapted.psd1"
Set-Content -Path $fakePsd1Path -Value "@{ ModuleVersion = '0.1.0' }"
$script:OldPSModulePath = $env:PSModulePath
Expand Down Expand Up @@ -162,4 +195,10 @@ Describe 'Tests for PowerShell resource discovery' {
$out = & $script:discoverScript | ConvertFrom-Json
$out.manifestPath | Should -Contain $adaptedManifestPath
}

It 'Should discover *.dsc.manifests.* manifest-list files' {
Remove-Item -Force -ErrorAction SilentlyContinue -Path $script:cacheFilePath
$out = & $script:discoverScript | ConvertFrom-Json
$out.manifestPath | Should -Contain $manifestListPath
}
}
2 changes: 1 addition & 1 deletion extensions/powershell/powershell.dsc.extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json",
"type": "Microsoft.PowerShell/Discover",
"version": "0.1.0",
"version": "0.1.1",
Comment thread
Gijsreyn marked this conversation as resolved.
"description": "Discovers DSC resources packaged in PowerShell 7 modules.",
"condition": "[not(equals(tryWhich('pwsh'), null()))]",
"discover": {
Expand Down
Loading