Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,10 @@ if ($null -ne $packageType) {
} else {
if ($architecture -ne 'current') {
write-verbose -verbose "Installing clippy for $architecture"
& $rustup component add clippy --target $architecture
rustup component add clippy --target $architecture
} else {
write-verbose -verbose "Installing clippy for current architecture"
& $rustup component add clippy
rustup component add clippy
}
}
if ($LASTEXITCODE -ne 0) {
Expand Down
15 changes: 15 additions & 0 deletions dsc/tests/dsc_extension_discover.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,19 @@ Describe 'Discover extension tests' {
}
$foundWideLine | Should -BeTrue
}

It 'Failed extension discovery should not fail overall discovery' -Skip:(!$IsWindows) {
try {
# exclude finding powershell.exe
$oldPath = $env:PATH
$dscFolder = Split-Path (Get-Command dsc).Source -Parent
$env:PATH = "$env:PROGRAMFILES\PowerShell\7;$dscFolder"
$out = dsc -l warn resource list 2> $TestDrive/error.log | ConvertFrom-Json
$LASTEXITCODE | Should -Be 0
$out.Count | Should -BeGreaterThan 0
(Get-Content -Path "$TestDrive/error.log" -Raw) | Should -BeLike "*WARN Extension 'Microsoft.Windows.Appx/Discover' failed to discover resources: Command: Operation program not found for executable 'powershell'*" -Because (Get-Content -Path "$TestDrive/error.log" -Raw | Out-String)
} finally {
$env:PATH = $oldPath
}
}
}
1 change: 1 addition & 0 deletions dsc_lib/locales/en-us.toml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ searchingForResources = "Searching for resources: %{resources}"
foundResourceWithVersion = "Found matching resource '%{resource}' version %{version}"
foundNonAdapterResources = "Found %{count} non-adapter resources"
resourceMissingRequireAdapter = "Resource '%{resource}' is missing 'require_adapter' field."
extensionDiscoverFailed = "Extension '%{extension}' failed to discover resources: %{error}"

[dscresources.commandResource]
invokeGet = "Invoking get for '%{resource}'"
Expand Down
8 changes: 7 additions & 1 deletion dsc_lib/src/discovery/command_discovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,13 @@ impl ResourceDiscovery for CommandDiscovery {
for extension in self.extensions.values() {
if extension.capabilities.contains(&ExtensionCapability::Discover) {
debug!("{}", t!("discovery.commandDiscovery.callingExtension", extension = extension.type_name));
let discovered_resources = extension.discover()?;
let discovered_resources = match extension.discover() {
Ok(res) => res,
Err(e) => {
warn!("{}", t!("discovery.commandDiscovery.extensionDiscoverFailed", extension = extension.type_name, error = e));
continue;
}
};
debug!("{}", t!("discovery.commandDiscovery.extensionFoundResources", extension = extension.type_name, count = discovered_resources.len()));
for resource in discovered_resources {
if regex.is_match(&resource.type_name) {
Expand Down