Cleaning up powershell names

Author: EMaher

tests/integration/all-resource-types/Deploy-SourceApim.ps1

@@ -72,7 +72,7 @@ $apiopsLogLevel = Get-ApiopsLogLevelLocal -ScriptLogLevel $LogLevel
 # Destroy path
 # ---------------------------------------------------------------------------
 if ($Destroy) {
-    Write-Host "🗑️  Deleting resource group '$(Protect-Identifier -Value $ResourceGroupName)'..." -ForegroundColor Yellow
+    Write-Host "🗑️  Deleting resource group '$(Protect-ResourceGroupName -Value $ResourceGroupName)'..." -ForegroundColor Yellow
     az group delete --name $ResourceGroupName --yes --no-wait
     Write-Host "✅ Deletion initiated (async). Resource group will be removed shortly." -ForegroundColor Green
     exit 0
@@ -141,7 +141,7 @@ if (-not $allRegistered) {
 Write-Host "   ✅ Resource providers ready" -ForegroundColor Green
 
 # Create resource group if needed
-Write-Host "📦 Ensuring resource group '$(Protect-Identifier -Value $ResourceGroupName)' exists in '$Location'..." -ForegroundColor Cyan
+Write-Host "📦 Ensuring resource group '$(Protect-ResourceGroupName -Value $ResourceGroupName)' exists in '$Location'..." -ForegroundColor Cyan
 az group create --name $ResourceGroupName --location $Location --output none
 
 # Deploy Bicep template
@@ -161,7 +161,7 @@ switch ($LogLevel) {
 
 $azReplacements = @{
     $subscriptionId    = Protect-SubscriptionId -Value $subscriptionId
-    $ResourceGroupName = Protect-Identifier   -Value $ResourceGroupName
+    $ResourceGroupName = Protect-ResourceGroupName   -Value $ResourceGroupName
 }
 
 $raw = Invoke-MaskedAzCommand -Replacements $azReplacements -Command {
@@ -192,7 +192,7 @@ Write-Host "APIOps CLI extract command:" -ForegroundColor Cyan
 Write-Host ""
 Write-Host "  npx apiops extract \"
 Write-Host "    --subscription-id $(Protect-SubscriptionId -Value $outputs.subscriptionId.value) \"
-Write-Host "    --resource-group  $(Protect-Identifier -Value $outputs.resourceGroupName.value) \"
+Write-Host "    --resource-group  $(Protect-ResourceGroupName -Value $outputs.resourceGroupName.value) \"
 Write-Host "    --service-name    $($outputs.apimServiceName.value) \"
 Write-Host "    --output-dir      ./extracted \"
 Write-Host "    --log-level       $apiopsLogLevel"

tests/integration/all-resource-types/Deploy-TargetApim.ps1

@@ -56,7 +56,7 @@ $subscriptionId = $account.id
 
 Write-Host "Starting target APIM deployment..."
 Write-Host "Subscription:   $($account.name) ($(Protect-SubscriptionId -Value $subscriptionId))"
-Write-Host "Resource Group: $(Protect-Identifier -Value $ResourceGroupName)"
+Write-Host "Resource Group: $(Protect-ResourceGroupName -Value $ResourceGroupName)"
 Write-Host "SKU:            $SkuName"
 Write-Host "Location:       $Location"
 Write-Host "Log Level:      $LogLevel"
@@ -76,7 +76,7 @@ switch ($LogLevel) {
 
 $azReplacements = @{
     $subscriptionId    = Protect-SubscriptionId -Value $subscriptionId
-    $ResourceGroupName = Protect-Identifier   -Value $ResourceGroupName
+    $ResourceGroupName = Protect-ResourceGroupName   -Value $ResourceGroupName
 }
 
 $raw = Invoke-MaskedAzCommand -Replacements $azReplacements -Command {

tests/integration/all-resource-types/MaskingHelpers.psm1

@@ -33,7 +33,15 @@ function Protect-Identifier {
 
 function Protect-SubscriptionId {
     param([string]$Value)
-    return Protect-Identifier -Value $Value -Prefix 8 -Suffix 4
+    return Protect-Identifier -Value $Value -Prefix 3 -Suffix 0
+}
+
+# Resource group names follow the convention `bvt-<timestamp>-<rand>-(src|tgt)-rg`.
+# Reveal the last 7 characters so the role suffix (`-src-rg` / `-tgt-rg`) is
+# visible in logs while the unique id stays masked.
+function Protect-ResourceGroupName {
+    param([string]$Value)
+    return Protect-Identifier -Value $Value -Prefix 3 -Suffix 7
 }
 
 function Protect-LogLine {
@@ -100,6 +108,7 @@ function Invoke-MaskedAzCommand {
 Export-ModuleMember -Function `
     Protect-Identifier, `
     Protect-SubscriptionId, `
+    Protect-ResourceGroupName, `
     Protect-LogLine, `
     Invoke-MaskedApiopsCommand, `
     Invoke-MaskedAzCommand

tests/integration/all-resource-types/run-roundtrip-test.ps1

@@ -99,8 +99,8 @@ if (-not $TargetResourceGroup) {
     $TargetResourceGroup = "bvt-$UniqueId-tgt-rg"
 }
 
-Write-Host "   Source RG: $(Protect-Identifier -Value $SourceResourceGroup)"
-Write-Host "   Target RG: $(Protect-Identifier -Value $TargetResourceGroup)"
+Write-Host "   Source RG: $(Protect-ResourceGroupName -Value $SourceResourceGroup)"
+Write-Host "   Target RG: $(Protect-ResourceGroupName -Value $TargetResourceGroup)"
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -159,9 +159,9 @@ function Invoke-Teardown {
         }
     }
 
-    Write-Host "   Deleting $(Protect-Identifier -Value $SourceResourceGroup)..."
+    Write-Host "   Deleting $(Protect-ResourceGroupName -Value $SourceResourceGroup)..."
     az group delete --name $SourceResourceGroup --yes --no-wait 2>$null
-    Write-Host "   Deleting $(Protect-Identifier -Value $TargetResourceGroup)..."
+    Write-Host "   Deleting $(Protect-ResourceGroupName -Value $TargetResourceGroup)..."
     az group delete --name $TargetResourceGroup --yes --no-wait 2>$null
 
     if ($HardDelete) {
@@ -432,7 +432,7 @@ try {
         # Query APIM instance from resource group
         $apimName = az apim list --resource-group $SourceResourceGroup --query "[0].name" -o tsv 2>$null
         if (-not $apimName) {
-            Write-Host "❌ No APIM instance found in resource group $(Protect-Identifier -Value $SourceResourceGroup)"
+            Write-Host "❌ No APIM instance found in resource group $(Protect-ResourceGroupName -Value $SourceResourceGroup)"
             exit 2
         }
         $apimName
@@ -445,7 +445,7 @@ try {
         # Query APIM instance from resource group
         $apimName = az apim list --resource-group $TargetResourceGroup --query "[0].name" -o tsv 2>$null
         if (-not $apimName) {
-            Write-Host "❌ No APIM instance found in resource group $(Protect-Identifier -Value $TargetResourceGroup)"
+            Write-Host "❌ No APIM instance found in resource group $(Protect-ResourceGroupName -Value $TargetResourceGroup)"
             exit 2
         }
         $apimName
@@ -463,14 +463,14 @@ try {
         Write-Host "   Cleaned previous extract output"
     }
 
-    Write-Host "   Source: $sourceName (sub: $(Protect-SubscriptionId -Value $sourceSubId), rg: $(Protect-Identifier -Value $sourceRg))"
+    Write-Host "   Source: $sourceName (sub: $(Protect-SubscriptionId -Value $sourceSubId), rg: $(Protect-ResourceGroupName -Value $sourceRg))"
     Write-Host "   Output: $ExtractOutputDir"
 
         $apiopsLogLevel = Get-ApiopsLogLevel -ScriptLogLevel $LogLevel
 
     $extractExitCode = Invoke-MaskedApiopsCommand -Replacements @{
         $sourceSubId = Protect-SubscriptionId -Value $sourceSubId
-        $sourceRg    = Protect-Identifier -Value $sourceRg
+        $sourceRg    = Protect-ResourceGroupName -Value $sourceRg
     } -Command {
         npx apiops extract `
             --subscription-id $sourceSubId `
@@ -600,12 +600,12 @@ loggers:
     Write-Phase "📤" "PHASE 3 — Publish to target APIM"
     $publishTimer = [System.Diagnostics.Stopwatch]::StartNew()
 
-    Write-Host "   Target: $targetName (sub: $(Protect-SubscriptionId -Value $targetSubId), rg: $(Protect-Identifier -Value $targetRg))"
+    Write-Host "   Target: $targetName (sub: $(Protect-SubscriptionId -Value $targetSubId), rg: $(Protect-ResourceGroupName -Value $targetRg))"
     Write-Host "   Input:  $ExtractOutputDir"
 
     $publishExitCode = Invoke-MaskedApiopsCommand -Replacements @{
         $targetSubId = Protect-SubscriptionId -Value $targetSubId
-        $targetRg    = Protect-Identifier -Value $targetRg
+        $targetRg    = Protect-ResourceGroupName -Value $targetRg
     } -Command {
         npx apiops publish `
             --subscription-id $targetSubId `