Skip to content

Cmdlets should respect SwitchParameter values not presence alone #1925

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
anamnavi wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −12
Open

Cmdlets should respect SwitchParameter values not presence alone #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/code/InstallHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ private List<PSResourceInfo> ProcessRepositories(
allPkgsInstalled.AddRange(installedPkgs);
}

if (!_cmdletPassedIn.MyInvocation.BoundParameters.ContainsKey("WhatIf") && _pkgNamesToInstall.Count > 0)
if ((!_cmdletPassedIn.MyInvocation.BoundParameters.ContainsKey("WhatIf") || (SwitchParameter)_cmdletPassedIn.MyInvocation.BoundParameters["WhatIf"] == false) && _pkgNamesToInstall.Count > 0)
{
string repositoryWording = repositoryNamesToSearch.Count > 1 ? "registered repositories" : "repository";
_cmdletPassedIn.WriteError(new ErrorRecord(
Expand Down Expand Up @@ -624,7 +624,7 @@ private List<PSResourceInfo> InstallPackages(
}

// If -WhatIf is passed in, early out.
if (_cmdletPassedIn.MyInvocation.BoundParameters.ContainsKey("WhatIf"))
if (_cmdletPassedIn.MyInvocation.BoundParameters.ContainsKey("WhatIf") && (SwitchParameter)_cmdletPassedIn.MyInvocation.BoundParameters["WhatIf"] == true)
{
return pkgsSuccessfullyInstalled;
}
Expand Down
23 changes: 13 additions & 10 deletions src/code/RegisterPSResourceRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,20 @@ protected override void ProcessRecord()
break;

case PSGalleryParameterSet:
try
{
items.Add(PSGalleryParameterSetHelper(Priority, Trusted));
}
catch (Exception e)
if (PSGallery)
{
ThrowTerminatingError(new ErrorRecord(
new PSInvalidOperationException(e.Message),
"ErrorInPSGalleryParameterSet",
ErrorCategory.InvalidArgument,
this));
try
{
items.Add(PSGalleryParameterSetHelper(Priority, Trusted));
}
catch (Exception e)
{
ThrowTerminatingError(new ErrorRecord(
new PSInvalidOperationException(e.Message),
"ErrorInPSGalleryParameterSet",
ErrorCategory.InvalidArgument,
this));
}
}
break;

Expand Down
8 changes: 8 additions & 0 deletions test/InstallPSResourceTests/InstallPSResourceRepositorySearching.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,12 @@ Describe 'Test Install-PSResource for searching and looping through repositories
$err | Should -HaveCount 0
$warningVar | Should -Not -BeNullOrEmpty
}

It "install resources from repository should respect WhatIf value of false" {
# Package "test_module" exists in the following repositories (in this order): localRepo, PSGallery, NuGetGallery
$res = Install-PSResource -Name $testModuleName -Repository $PSGalleryName -TrustRepository -SkipDependencyCheck -PassThru -WhatIf:$false
$res | Should -Not -BeNullOrEmpty
$res.Name | Should -Be $testModuleName
$res.Repository | Should -Be $PSGalleryName
}
}
6 changes: 6 additions & 0 deletions test/ResourceRepositoryTests/RegisterPSResourceRepository.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ Describe "Test Register-PSResourceRepository" -tags 'CI' {
$res.Priority | Should -Be 50
}

It "register repository with PSGallery switch parameter value of false (PSGalleryParameterSet)" {
Unregister-PSResourceRepository -Name $PSGalleryName
$res = Register-PSResourceRepository -PSGallery:$false -PassThru
$res | Should -BeNullOrEmpty
}

It "register repository with PSGallery, Trusted parameters (PSGalleryParameterSet)" {
Unregister-PSResourceRepository -Name $PSGalleryName
$res = Register-PSResourceRepository -PSGallery -Trusted -PassThru
Expand Down