Skip to content

Commit

Permalink
Revert "Add fallback user id lookup for test resource deployment (Azu…
Browse files Browse the repository at this point in the history
…re#2028)"

This reverts commit 6cf1415.
  • Loading branch information
SorenHolstHansen committed Jan 29, 2025
1 parent 43a574f commit 3dcdea9
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,8 @@ try {
# Make sure the provisioner OID is set so we can pass it through to the deployment.
if (!$ProvisionerApplicationId -and !$ProvisionerApplicationOid) {
if ($context.Account.Type -eq 'User') {
# Support corp tenant and TME tenant user id lookups
# Use -Mail as the lookup works in both corp and TME tenants
$user = Get-AzADUser -Mail $context.Account.Id
if ($user -eq $null -or !$user.Id) {
$user = Get-AzADUser -UserPrincipalName $context.Account.Id
}
if ($user -eq $null -or !$user.Id) {
throw "Failed to find entra object ID for the current user"
}
$ProvisionerApplicationOid = $user.Id
} elseif ($context.Account.Type -eq 'ServicePrincipal') {
$sp = Get-AzADServicePrincipal -ApplicationId $context.Account.Id
Expand Down Expand Up @@ -397,14 +391,8 @@ try {
Write-Warning "The specified TestApplicationId '$TestApplicationId' will be ignored when -ServicePrincipalAutth is not set."
}

# Support corp tenant and TME tenant user id lookups
# Use -Mail as the lookup works in both corp and TME tenants
$userAccount = (Get-AzADUser -Mail (Get-AzContext).Account.Id)
if ($userAccount -eq $null -or !$userAccount.Id) {
$userAccount = (Get-AzADUser -UserPrincipalName (Get-AzContext).Account)
}
if ($userAccount -eq $null -or !$userAccount.Id) {
throw "Failed to find entra object ID for the current user"
}
$TestApplicationOid = $userAccount.Id
$TestApplicationId = $testApplicationOid
$userAccountName = $userAccount.UserPrincipalName
Expand Down

0 comments on commit 3dcdea9

Please sign in to comment.