Skip to content

Add ShouldProcess to New-FileCatalog and Test-FileCatalog #3074

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
TravisEz13 merged 2 commits into from
Feb 18, 2017
Merged

Add ShouldProcess to New-FileCatalog and Test-FileCatalog #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b2c4f3
Add ShouldProcess to New-FileCatalog and Test-FileCatalog
iSazonov Jan 30, 2017
b7a02e6
Fiz after code review
iSazonov Feb 16, 2017
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
23 changes: 15 additions & 8 deletions src/Microsoft.PowerShell.Security/security/CatalogCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,27 @@ protected override void ProcessRecord()
{
foreach (PathInfo tempPath in SessionState.Path.GetResolvedPSPathFromPSPath(p))
{
paths.Add(tempPath.ProviderPath);
if (ShouldProcess(tempPath.ProviderPath))
{
paths.Add(tempPath.ProviderPath);
}
}
}
}

string drive = null;

// resolve catalog destination Path
if (!SessionState.Path.IsPSAbsolute(catalogFilePath, out drive) && !System.IO.Path.IsPathRooted(catalogFilePath))
// We add 'paths.Count > 0' to support 'ShouldProcess()'
if (paths.Count > 0 )
{
catalogFilePath = SessionState.Path.GetUnresolvedProviderPathFromPSPath(catalogFilePath);
}
string drive = null;

// resolve catalog destination Path
if (!SessionState.Path.IsPSAbsolute(catalogFilePath, out drive) && !System.IO.Path.IsPathRooted(catalogFilePath))
{
catalogFilePath = SessionState.Path.GetUnresolvedProviderPathFromPSPath(catalogFilePath);
}

PerformAction(paths, catalogFilePath);
PerformAction(paths, catalogFilePath);
}
}

/// <summary>
Expand Down
21 changes: 21 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,27 @@ Describe "Test suite for NewFileCatalogAndTestFileCatalogCmdlets" -Tags "CI" {

Context "NewAndTestCatalogTests PositiveTestCases when validation Succeeds" {

It "NewFileCatalogWithSingleFile with WhatIf" {

$sourcePath = Join-Path $testDataPath '\CatalogTestFile1.mof'
# use existant Path for the directory when .cat file name is not specified
$catalogPath = $testDataPath
$catalogFile = $catalogPath + "\catalog.cat"

try
{
$null = New-FileCatalog -Path $sourcePath -CatalogFilePath $catalogPath -WhatIf
$result = Test-Path -Path $catalogFile
}
finally
{
Remove-Item $catalogFile -Force -ErrorAction SilentlyContinue
}

# Validate result properties
$result | Should Be $false
}

It "NewFileCatalogFolder" {

$sourcePath = Join-Path $testDataPath 'UserConfigProv\DSCResources\scriptdsc'
Expand Down