Merge pull request #106 from Yamini-Microsoft/psl-minor-fix

fix: Use purviewCollectionName parameter for Purview collection setup

Author: aniaroramsft

scripts/automationScripts/FabricPurviewAutomation/create_purview_collection.ps1

@@ -66,7 +66,9 @@ $collectionName = $null
 $purviewAccountName = Get-AzdEnvValue -key 'purviewAccountName'
 $purviewSubscriptionId = Get-AzdEnvValue -key 'purviewSubscriptionId'
 $purviewResourceGroup = Get-AzdEnvValue -key 'purviewResourceGroup'
-$collectionName = Get-AzdEnvValue -key 'desiredFabricDomainName'
+# First try purviewCollectionName, then fall back to desiredFabricDomainName for backwards compatibility
+$collectionName = Get-AzdEnvValue -key 'purviewCollectionName'
+if (-not $collectionName) { $collectionName = Get-AzdEnvValue -key 'desiredFabricDomainName' }
 $purviewAccountResourceId = Get-AzdEnvValue -key 'purviewAccountResourceId'
 
 if (-not $purviewAccountResourceId) { $purviewAccountResourceId = $env:PURVIEW_ACCOUNT_RESOURCE_ID }
@@ -83,7 +85,7 @@ if ($purviewAccountResourceId) {
 # Skip gracefully when Purview integration is not configured for this environment.
 $missingValues = @()
 if (-not $purviewAccountName) { $missingValues += 'purviewAccountName' }
-if (-not $collectionName) { $missingValues += 'desiredFabricDomainName' }
+if (-not $collectionName) { $missingValues += 'purviewCollectionName or desiredFabricDomainName' }
 if (-not $purviewSubscriptionId) { $missingValues += 'purviewSubscriptionId' }
 if (-not $purviewResourceGroup) { $missingValues += 'purviewResourceGroup' }
 if ($missingValues.Count -gt 0) {

scripts/automationScripts/FabricWorkspace/CreateWorkspace/register_fabric_datasource.ps1

@@ -89,7 +89,9 @@ function Resolve-PurviewFromResourceId([string]$resourceId) {
 
 # Resolve Purview account and collection name from azd (if present)
 $purviewAccountName = Get-AzdEnvValue -key 'purviewAccountName'
-$collectionName = Get-AzdEnvValue -key 'desiredFabricDomainName'
+# First try purviewCollectionName, then fall back to desiredFabricDomainName for backwards compatibility
+$collectionName = Get-AzdEnvValue -key 'purviewCollectionName'
+if (-not $collectionName) { $collectionName = Get-AzdEnvValue -key 'desiredFabricDomainName' }
 $purviewAccountResourceId = Get-AzdEnvValue -key 'purviewAccountResourceId'
 $purviewSubscriptionId = Get-AzdEnvValue -key 'purviewSubscriptionId'
 $purviewResourceGroup = Get-AzdEnvValue -key 'purviewResourceGroup'
@@ -106,7 +108,7 @@ if ($purviewAccountResourceId) {
 if (-not $purviewAccountName -or -not $collectionName) {
   $missing = @()
   if (-not $purviewAccountName) { $missing += 'purviewAccountName' }
-  if (-not $collectionName) { $missing += 'desiredFabricDomainName' }
+  if (-not $collectionName) { $missing += 'purviewCollectionName or desiredFabricDomainName' }
   Warn "Skipping Purview datasource registration; missing env values: $($missing -join ', ')"
   Clear-SensitiveVariables -VariableNames @('purviewToken')
   exit 0
@@ -256,7 +258,7 @@ if ($fabricDatasourceName) {
     $anyPbi = $existing.value | Where-Object { $_.kind -eq 'PowerBI' } | Select-Object -First 1
   }
   if ($anyPbi) {
-    Warn "Found existing PowerBI datasource '${($anyPbi.name)}' registered under a collection and no root-level Fabric datasource exists. Using that datasource and not creating a new root-level datasource."
+    Warn "Found existing PowerBI datasource '$($anyPbi.name)' registered under a collection and no root-level Fabric datasource exists. Using that datasource and not creating a new root-level datasource."
     $fabricDatasourceName = $anyPbi.name
     $collectionRef = $anyPbi.properties.collection.referenceName
     if ($collectionRef) { $collectionId = $collectionRef }