add string formatting for replacemap

JohnDuprey · JohnDuprey · commit 5a3a5122ab14 · 2025-03-07T10:21:52.000-05:00
diff --git a/Modules/CIPPCore/Public/Set-CIPPIntunePolicy.ps1 b/Modules/CIPPCore/Public/Set-CIPPIntunePolicy.ps1
@@ -17,7 +17,8 @@ function Set-CIPPIntunePolicy {
     $ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$tenantFilter'"
     if ($ReplaceMap) {
         foreach ($Replace in $ReplaceMap) {
-            $RawJSON = $RawJSON -replace $Replace.RowKey, $Replace.Value
+            $String = '%{0}%' -f $Replace.RowKey
+            $RawJSON = $RawJSON -replace $String, $Replace.Value
         }
     }
     #default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ function Set-CIPPIntunePolicy {`
`17`	`17`	`$ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$tenantFilter'"`
`18`	`18`	`if ($ReplaceMap) {`
`19`	`19`	`foreach ($Replace in $ReplaceMap) {`
`20`		`- $RawJSON = $RawJSON -replace $Replace.RowKey, $Replace.Value`
	`20`	`+ $String = '%{0}%' -f $Replace.RowKey`
	`21`	`+ $RawJSON = $RawJSON -replace $String, $Replace.Value`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`#default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName`