Skip to content

Fix the clean block for generated proxy function #16827

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
adityapatwardhan merged 3 commits into from
Feb 3, 2022
Merged

Fix the clean block for generated proxy function #16827

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
9a38852
Fix the clean block for generated proxy function
daxian-dbw Feb 1, 2022
6023ce8
Add test
daxian-dbw Feb 2, 2022
a3c6205
Add comments
daxian-dbw Feb 2, 2022
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: 3 additions & 1 deletion src/System.Management.Automation/engine/CommandMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,9 @@ internal string GetCleanBlock()
// 1. the 'Clean' block doesn't propagate up any exception (terminating error);
// 2. only one expression in the script, so nothing else needs to be stopped when invoking the method fails.
return @"
$steppablePipeline.Clean()
if ($null -ne $steppablePipeline) {
$steppablePipeline.Clean()
}
";
}

Expand Down
13 changes: 13 additions & 0 deletions test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,19 @@ Describe 'Function Pipeline Behaviour' -Tag 'CI' {
## Dispose the steppable pipeline.
$step.Dispose()
}

It "Clean block runs fine in a proxy function when a dynamic parameter fails to bind" {
$function:TestProxyGci = [scriptblock]::Create(
[Management.Automation.ProxyCommand]::Create(
(Get-Command Get-ChildItem)))

## The proxy function 'TestProxyGci' contains the 'dynamicparam' block, which will
## run during parameter binding. However, the parameter binding failed, and thus
## the 'begin', 'process', and 'end' blocks will not run, so '$steppablePipeline'
## in the proxy function is null (never created). The 'clean' block will run anyway,
## but it should skip calling '$steppablePipeline.Clean()' in this case.
{ TestProxyGci -Attributes } | Should -Throw -ErrorId 'MissingArgument,TestProxyGci'
}
}

Context "'exit' statement in command" {
Expand Down