fix tenant cleanup

JohnDuprey · JohnDuprey · commit cf2536d69036 · 2025-06-09T15:36:13.000-04:00
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1
@@ -67,7 +67,7 @@ function Get-Tenants {
                 relationshipEnd = $Relationship.endDateTime
             }
         }
-        $CurrentTenants = Get-CIPPAzDataTableEntity @TenantsTable -Filter "PartitionKey eq 'Tenants' and Excluded eq false"
+        $CurrentTenants = Get-CIPPAzDataTableEntity @TenantsTable -Filter "PartitionKey eq 'Tenants' and Excluded eq false and delegatedPrivilegeStatus ne 'directTenant'"
         $CurrentTenants | Where-Object { $_.customerId -notin $GDAPList.customerId -and $_.customerId -ne $env:TenantID } | ForEach-Object {
             Remove-AzDataTableEntity -Force @TenantsTable -Entity $_
         }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ function Get-Tenants {`
`67`	`67`	`relationshipEnd = $Relationship.endDateTime`
`68`	`68`	`}`
`69`	`69`	`}`
`70`		`- $CurrentTenants = Get-CIPPAzDataTableEntity @TenantsTable -Filter "PartitionKey eq 'Tenants' and Excluded eq false"`
	`70`	`+ $CurrentTenants = Get-CIPPAzDataTableEntity @TenantsTable -Filter "PartitionKey eq 'Tenants' and Excluded eq false and delegatedPrivilegeStatus ne 'directTenant'"`
`71`	`71`	`$CurrentTenants \| Where-Object { $_.customerId -notin $GDAPList.customerId -and $_.customerId -ne $env:TenantID } \| ForEach-Object {`
`72`	`72`	`Remove-AzDataTableEntity -Force @TenantsTable -Entity $_`
`73`	`73`	`}`