@@ -245,20 +245,29 @@ function Get-VstsFederatedToken {
245245 $hub = Get-VstsTaskVariable - Name ' System.HostType' - Require
246246 $projectId = Get-VstsTaskVariable - Name ' System.TeamProjectId' - Require
247247
248- $tokenResponse = $taskHttpClient.CreateOidcTokenAsync (
249- $projectId ,
250- $hub ,
251- $planId ,
252- $jobId ,
253- $connectedServiceNameARM ,
254- $null
255- ).Result
256- $federatedToken = $tokenResponse.OidcToken
257- if ($null -eq $federatedToken ) {
258- Write-Verbose " Failed to create OIDC token."
259- throw (New-Object System.Exception(Get-VstsLocString - Key AZ_CouldNotGenerateOidcToken))
260- }
261- return $federatedToken
248+ $timeToWait = 4000
249+ for (($retryAttempt = 1 ), ($retryLimit = 3 ); $retryAttempt -le $retryLimit ; $retryAttempt ++ ) {
250+ $tokenResponse = $taskHttpClient.CreateOidcTokenAsync (
251+ $projectId ,
252+ $hub ,
253+ $planId ,
254+ $jobId ,
255+ $connectedServiceNameARM ,
256+ $null
257+ ).Result
258+ $federatedToken = $tokenResponse.OidcToken
259+ if ($null -ne $federatedToken ) {
260+ return $federatedToken
261+ }
262+
263+ if ($retryAttempt -lt $retryLimit ) {
264+ Write-Verbose " Failed to fetch federated token. Remaining retries count = '$ ( $retryLimit - $retryAttempt ) '"
265+ Start-Sleep - m $timeToWait * $retryAttempt
266+ }
267+ }
268+
269+ Write-Verbose " Failed to create OIDC token."
270+ throw (New-Object System.Exception(Get-VstsLocString - Key AZ_CouldNotGenerateOidcToken))
262271}
263272
264273function Set-UserAgent {
@@ -591,7 +600,7 @@ function Add-AzureStackAzureRmEnvironment {
591600 AzureKeyVaultServiceEndpointResourceId = $AzureKeyVaultServiceEndpointResourceId
592601 EnableAdfsAuthentication = $aadAuthorityEndpoint.TrimEnd (" /" " /adfs" , [System.StringComparison ]::OrdinalIgnoreCase)
593602 }
594-
603+
595604 if ($featureFlags.retireAzureRM )
596605 {
597606 $azureEnvironmentParams.StorageEndpoint = $StorageEndpointSuffix
@@ -607,7 +616,7 @@ function Add-AzureStackAzureRmEnvironment {
607616
608617 if ($null -ne $armEnv ) {
609618 Write-Verbose " Updating Az environment $name " - Verbose
610-
619+
611620 if (CmdletHasMember - cmdlet Remove-AzEnvironment - memberName Force) {
612621 Remove-AzEnvironment - Name $name - Force | Out-Null
613622 }
@@ -625,7 +634,7 @@ function Add-AzureStackAzureRmEnvironment {
625634
626635 if ($null -ne $armEnv ) {
627636 Write-Verbose " Updating AzureRm environment $name " - Verbose
628-
637+
629638 if (CmdletHasMember - cmdlet Remove-AzureRmEnvironment - memberName Force) {
630639 Remove-AzureRmEnvironment - Name $name - Force | Out-Null
631640 }
0 commit comments