Fixed current tenant

This commit is contained in:
Alexander (Sasha) Nosov
2025-05-20 15:39:06 -07:00
parent 587071e2ec
commit a5685d60a3
2 changed files with 6 additions and 3 deletions
@@ -0,0 +1,2 @@
"TenantID","SubID","ResourceName","ResourceType","Status","OriginalLicenseType","ResourceGroup","Location"
"72f988bf-86f1-41af-91ab-2d7cd011db47","fa58cf66-caaf-4ba9-875d-f310d3694845","SQL2012EEArc","WindowsAgent.SqlServer","Connected","Paid","ajayj","westus2"
1 TenantID SubID ResourceName ResourceType Status OriginalLicenseType ResourceGroup Location
2 72f988bf-86f1-41af-91ab-2d7cd011db47 fa58cf66-caaf-4ba9-875d-f310d3694845 SQL2012EEArc WindowsAgent.SqlServer Connected Paid ajayj westus2
@@ -140,7 +140,7 @@ if($null -ne $ExclusionTags){
}
if (-not $TenantId) {
$TenantId = $context.Tenant.Id
$TenantId = (Get-AzContext).Tenant.Id
Write-Output "No TenantId provided. Using current context TenantId: $TenantId"
} else {
Write-Output "Using provided TenantId: $TenantId"
@@ -177,9 +177,10 @@ $modifiedResources = @()
if ($SubId -like "*.csv") {
$subscriptions = Import-Csv $SubId
}elseif($SubId -ne "") {
$subscriptions = Get-AzSubscription -SubscriptionId $SubId
$subscriptions = Get-AzSubscription -SubscriptionId $SubId | Sort-Object TenantId
}else {
$subscriptions = Get-AzSubscription | Where-Object { $_.TenantId -eq $tenantId }
$subscriptions = Get-AzSubscription | Where-Object { $_.TenantId -eq $tenantId }
}
# Handle MachineName input (single or CSV)