From 59d884c0619d08c6afd51ad5d23b62b0bd2f689d Mon Sep 17 00:00:00 2001 From: Torsten Brendgen Date: Tue, 21 Apr 2026 14:03:44 +0200 Subject: [PATCH] Rename Function to Merge-DSCConfigurationData --- Merge-DSCConfigurationData.psd1 | 2 +- Merge-DSCConfigurationData.psm1 | 2 +- ...nfigurationData.ps1 => Merge-DSCConfigurationData.ps1} | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename Public/{Merge-ConfigurationData.ps1 => Merge-DSCConfigurationData.ps1} (90%) diff --git a/Merge-DSCConfigurationData.psd1 b/Merge-DSCConfigurationData.psd1 index 53b5a0f..1892346 100644 --- a/Merge-DSCConfigurationData.psd1 +++ b/Merge-DSCConfigurationData.psd1 @@ -7,7 +7,7 @@ Description = "Merges DSC configuration data from templates and deployment data." PowerShellVersion = "5.1" FunctionsToExport = @( - "Merge-ConfigurationData" + "Merge-DSCConfigurationData" ) CmdletsToExport = @() VariablesToExport = @() diff --git a/Merge-DSCConfigurationData.psm1 b/Merge-DSCConfigurationData.psm1 index 46660ff..6b916e2 100644 --- a/Merge-DSCConfigurationData.psm1 +++ b/Merge-DSCConfigurationData.psm1 @@ -9,5 +9,5 @@ foreach($File in @($Private + $Public)){ } Export-ModuleMember -Function @( - "Merge-ConfigurationData" + "Merge-DSCConfigurationData" ) diff --git a/Public/Merge-ConfigurationData.ps1 b/Public/Merge-DSCConfigurationData.ps1 similarity index 90% rename from Public/Merge-ConfigurationData.ps1 rename to Public/Merge-DSCConfigurationData.ps1 index 38afef3..0a7d1c6 100644 --- a/Public/Merge-ConfigurationData.ps1 +++ b/Public/Merge-DSCConfigurationData.ps1 @@ -1,4 +1,4 @@ -function Merge-ConfigurationData { +function Merge-DSCConfigurationData { [CmdletBinding()] Param( [Parameter(Mandatory=$true)] @@ -21,7 +21,7 @@ function Merge-ConfigurationData { Write-Verbose "Key [$($Property.Name)] is a Hashtable" if($null -ne $Deployment.$($Property.Name)){ Write-Verbose "Key [$($Property.Name)] is present in Deployment Data" - $Output.($Property.Name) = Merge-ConfigurationData -Template $Template.$($Property.Name) -Deployment $Deployment.$($Property.Name) -Output $Output.$($Property.Name) + $Output.($Property.Name) = Merge-DSCConfigurationData -Template $Template.$($Property.Name) -Deployment $Deployment.$($Property.Name) -Output $Output.$($Property.Name) }else{ Write-Verbose "Key [$($Property.Name)] is not present in Deployment Data" $Output.Add($($Property.Name),(Copy-ConfigurationDataValue -Value $Template.$($Property.Name))) @@ -30,7 +30,7 @@ function Merge-ConfigurationData { Write-Verbose "Key [$($Property.Name)] is a Ordered Dictionary" if($null -ne $Deployment.$($Property.Name)){ Write-Verbose "Key [$($Property.Name)] is present in Deployment Data" - $Output.($Property.Name) = Merge-ConfigurationData -Template $Template.$($Property.Name) -Deployment $Deployment.$($Property.Name) -Output $Output.$($Property.Name) + $Output.($Property.Name) = Merge-DSCConfigurationData -Template $Template.$($Property.Name) -Deployment $Deployment.$($Property.Name) -Output $Output.$($Property.Name) }else{ Write-Verbose "Key [$($Property.Name)] is not present in Deployment Data" $Output.Add($($Property.Name),(Copy-ConfigurationDataValue -Value $Template.$($Property.Name))) @@ -71,7 +71,7 @@ function Merge-ConfigurationData { if($MatchingDeploymentItems.Count -gt 0){ foreach($DeploymentItem in $MatchingDeploymentItems){ $OutputItem = @($Output.$($Property.Name) | Where-Object { Test-ConfigurationDataItemKeyMatch -Left $_ -Right $DeploymentItem -KeyNames $SearchKeyNames })[0] - Merge-ConfigurationData -Template $TemplateItem.Value -Deployment $DeploymentItem -Output $OutputItem | Out-Null + Merge-DSCConfigurationData -Template $TemplateItem.Value -Deployment $DeploymentItem -Output $OutputItem | Out-Null } }else{ if($TemplateItem.IsWildcard){