Skip to content

Add missing adapted resource manifest search #1455

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

Merged
SteveL-MSFT merged 3 commits into from
Apr 3, 2026
+43 −1
Merged

Add missing adapted resource manifest search #1455

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
c8662b3
Add missing adapted resource manifest search
Gijsreyn Apr 1, 2026
4dd6735
Fix Copilot + add regression test
Gijsreyn Apr 1, 2026
16643ab
Add .psd1 file in test
Gijsreyn Apr 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
9 changes: 8 additions & 1 deletion extensions/powershell/powershell.discover.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,14 @@ function Invoke-DscResourceDiscovery {
$manifests = $cache.Manifests
} else {
$manifests = $psPaths | ForEach-Object -Parallel {
$searchPatterns = @('*.dsc.resource.json', '*.dsc.resource.yaml', '*.dsc.resource.yml')
$searchPatterns = @(
'*.dsc.resource.json'
'*.dsc.resource.yaml'
'*.dsc.resource.yml'
'*.dsc.adaptedresource.json'
'*.dsc.adaptedresource.yaml'
'*.dsc.adaptedresource.yml'
)
$enumOptions = [System.IO.EnumerationOptions]@{ IgnoreInaccessible = $true; RecurseSubdirectories = $true }
foreach ($pattern in $searchPatterns) {
try {
Expand Down
35 changes: 35 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 @@ -20,6 +20,35 @@ BeforeAll {

$manifestPath = Join-Path $TestDrive "fake.dsc.resource.json"
$fakeManifest | ConvertTo-Json -Depth 10 | Set-Content -Path $manifestPath

$fakeAdaptedManifest = @{
'$schema' = "https://aka.ms/dsc/schemas/v3/bundled/adaptedresource/manifest.json"
type = "Test/FakeAdaptedResource"
kind = "resource"
version = "0.1.0"
capabilities = @("get", "set", "test")
description = "A fake adapted resource for regression testing."
requireAdapter = "Microsoft.Adapter/PowerShell"
path = "FakeAdapted.psd1"
schema = @{
embedded = @{
'$schema' = "https://json-schema.org/draft/2020-12/schema"
title = "Test/FakeAdaptedResource"
type = "object"
required = @("Name")
additionalProperties = $false
properties = @{
Name = @{ type = "string"; title = "Name"; description = "The name." }
}
}
}
}

$adaptedManifestPath = Join-Path $TestDrive "fake.dsc.adaptedresource.json"
$fakeAdaptedManifest | ConvertTo-Json -Depth 10 | Set-Content -Path $adaptedManifestPath

$fakePsd1Path = Join-Path $TestDrive "FakeAdapted.psd1"
Set-Content -Path $fakePsd1Path -Value "@{ ModuleVersion = '0.1.0' }"
$script:OldPSModulePath = $env:PSModulePath
$env:PSModulePath += [System.IO.Path]::PathSeparator + $TestDrive

Expand Down Expand Up @@ -127,4 +156,10 @@ Describe 'Tests for PowerShell resource discovery' {
$out = & $script:discoverScript | ConvertFrom-Json
$out.manifestPath | Should -Contain $manifestPath
}

It 'Should discover adapted resource manifest files' {
Remove-Item -Force -ErrorAction SilentlyContinue -Path $script:cacheFilePath
$out = & $script:discoverScript | ConvertFrom-Json
$out.manifestPath | Should -Contain $adaptedManifestPath
}
}
Loading