Skip to content

Reintroduce deep copy fix #264

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
joseartrivera wants to merge 5 commits into
base: v2
Choose a base branch
from
Open

Reintroduce deep copy fix #264

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7213b4c
Revert "Follow-up fixes for 257 (#260)"
joseartrivera Jun 12, 2024
e7fa20b
Fix version
joseartrivera Jun 12, 2024
ecd52ad
Merge branch 'v2' of https://github.com/joseartrivera/StoreBroker int…
joseartrivera Jun 12, 2024
79b7d49
Reintroduce deep copy
joseartrivera Jun 13, 2024
d7e7449
clean up
joseartrivera Jun 13, 2024
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
36 changes: 22 additions & 14 deletions StoreBroker/Helpers.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,31 +691,39 @@ function Copy-InputObjectForLogging

if ($InputObject -is [hashtable])
{
$ReplacedInputObject = $InputObject.Clone() # Get a new instance, not a reference
$replacedInputObject = $InputObject.Clone() # Get a new instance, not a reference

foreach ($key in @($ReplacedInputObject.keys))
foreach ($key in @($replacedInputObject.Keys))
{
if ($key -in $script:alwaysRedactHashPropertiesForLogging)
{
$ReplacedInputObject[$key] = "<redacted>"
$replacedInputObject[$key] = "<redacted>"
}
elseif (($replacedInputObject.$key -is [PSCustomObject]) -or ($replacedInputObject.$key -is [hashtable]))
{
$replacedInputObject[$key] = Copy-InputObjectForLogging -InputObject $replacedInputObject.$key
}
}

return $ReplacedInputObject;
return $replacedInputObject;
}
elseif ($InputObject -is [PSCustomObject])
{
$ReplacedInputObject = $InputObject.PSObject.Copy() # Get a new instance, not a reference
foreach ($key in $script:alwaysRedactHashPropertiesForLogging)
$replacedInputObject = $InputObject.PSObject.Copy()

foreach ($key in $replacedInputObject.PSObject.Properties.Name)
{
if ($null -ne (Get-Member -InputObject $ReplacedInputObject -Name $key -MemberType Properties))
if ($key -in $script:alwaysRedactHashPropertiesForLogging)
{
$replacedInputObject.$key = "<redacted>"
}
elseif (($replacedInputObject.$key -is [PSCustomObject]) -or ($replacedInputObject.$key -is [hashtable]))
{
$ReplacedInputObject.$key = "<redacted>"
$replacedInputObject.$key = Copy-InputObjectForLogging -InputObject $replacedInputObject.$key
}
}

return $ReplacedInputObject;
return $replacedInputObject;
}
else
{
Expand Down Expand Up @@ -754,18 +762,18 @@ function Write-InputObject

if ($null -eq $InputObject)
{
Write-Log -Message "$($Description): $null" -Level Verbose
Write-Log -Message "$($Description): `$null" -Level Verbose
return
}

$ReplacedObject = Copy-InputObjectForLogging -InputObject $InputObject
$replacedObject = Copy-InputObjectForLogging -InputObject $InputObject

if ($null -eq $ReplacedObject)
if ($null -eq $replacedObject)
{
return;
}

$objectAsString = Get-JsonBody -InputObject $ReplacedObject
$objectAsString = Get-JsonBody -InputObject $replacedObject
Write-Log -Message "$($Description): $objectAsString" -Level Verbose
}

Expand Down