sanitised the parameters

added a silent continue when a rg no longer exists for Foundry resources

Author: Mike Swantek

infra/main.bicepparam

@@ -10,7 +10,7 @@ param dagaTags = [
   'foundry'
 ]
 param dagaConnectM365 = true
-param dagaM365UserPrincipalName = 'admin@MngEnv282784.onmicrosoft.com'
+param dagaM365UserPrincipalName = ''
 param dagaM365AppId = ''
 param dagaM365Organization = ''
 param dagaM365CertificateThumbprint = ''

scripts/defender/defenderForAI/07-Enable-Diagnostics.ps1

@@ -61,7 +61,11 @@ $workspaceResourceId = Resolve-WorkspaceResourceId -workspaceId $law -specObj $s
 
 foreach($r in $spec.foundry.resources){
   if(!$r.diagnostics){ continue }
-  $res = Get-AzResource -ResourceId $r.resourceId -ErrorAction Stop
+  $res = Get-AzResource -ResourceId $r.resourceId -ErrorAction SilentlyContinue
+  if(-not $res){
+    Write-Warning "Resource not found, skipping: $($r.resourceId)"
+    continue
+  }
   $diagResourceId = Get-DiagnosticScopeId -resourceId $r.resourceId
   $scopeName = if($diagResourceId -eq $r.resourceId){ $res.Name } else { (Split-Path -Path $diagResourceId -Leaf) }
   $name = "$scopeName-diag"

scripts/governance/dspmPurview/25-Tag-ResourcesFromSpec.ps1

@@ -15,8 +15,8 @@ if ($spec.foundry -and $spec.foundry.resources) {
       else{ foreach($prop in $r.tags.PSObject.Properties){ $desiredTags[$prop.Name] = $prop.Value } }
     }
     if($desiredTags.Count -eq 0){ Write-Host "No spec tags defined for $($r.name); skipping" -ForegroundColor DarkGray; continue }
-
-    $res = Get-AzResource -ResourceId $r.resourceId -ErrorAction Stop
+    $res = Get-AzResource -ResourceId $r.resourceId -ErrorAction SilentlyContinue
+    if(-not $res){ Write-Warning "Resource not found, skipping tag update: $($r.resourceId)"; continue }
     if($res.ResourceType -and $res.ResourceType -match '/projects'){ Write-Host "Skipping tag update for project-level resource $($res.ResourceId); Azure tags only apply to the parent account." -ForegroundColor Yellow; continue }
     $merged = @{}
     if($res.Tags -is [Collections.IDictionary]){ $merged += $res.Tags }

scripts/governance/dspmPurview/30-Foundry-RegisterResources.ps1

@@ -9,7 +9,11 @@ Ensure-AzContext -TenantId $spec.tenantId -SubscriptionId $spec.subscriptionId
 if(-not $spec.foundry -or -not $spec.foundry.resources){ Write-Host "No foundry.resources"; exit 0 }
 foreach($r in $spec.foundry.resources){
   if(-not $r.resourceId -or $r.resourceId -notmatch '/projects/'){ Write-Host "Skipping non-Foundry resource: $($r.name)" -ForegroundColor Yellow; continue }
-  $res = Get-AzResource -ResourceId $r.resourceId -ErrorAction Stop
+  $res = Get-AzResource -ResourceId $r.resourceId -ErrorAction SilentlyContinue
+  if(-not $res){
+    Write-Warning "Resource not found, skipping: $($r.resourceId)"
+    continue
+  }
   Write-Host "Found resource: $($res.ResourceId)" -ForegroundColor Cyan
   if($r.tags){
     $merged = @{}

scripts/governance/dspmPurview/31-Foundry-ConfigureContentSafety.ps1

@@ -13,7 +13,8 @@ $base = $cs.endpoint.TrimEnd('/')
 $headers = @{}
 $hasKey = $cs.apiKeySecretRef -and $cs.apiKeySecretRef.keyVaultResourceId -and $cs.apiKeySecretRef.secretName
 if($hasKey){
-  $kvRes = Get-AzResource -ResourceId $cs.apiKeySecretRef.keyVaultResourceId -ErrorAction Stop
+  $kvRes = Get-AzResource -ResourceId $cs.apiKeySecretRef.keyVaultResourceId -ErrorAction SilentlyContinue
+  if(-not $kvRes){ Write-Warning "Key Vault not found, skipping Content Safety key fetch: $($cs.apiKeySecretRef.keyVaultResourceId)"; exit 0 }
   $kvName = ($kvRes.ResourceId -split "/")[-1]
   $apiKey = (Get-AzKeyVaultSecret -VaultName $kvName -Name $cs.apiKeySecretRef.secretName -ErrorAction Stop).SecretValueText
   $headers["Ocp-Apim-Subscription-Key"] = $apiKey