From e32ea57cdfa376e8fa32f27a2a75d9ab90377bbf Mon Sep 17 00:00:00 2001 From: Ondrej Netocny Date: Wed, 9 Oct 2024 09:09:42 +0200 Subject: [PATCH 1/2] Log exceptions that occurs in Initialize-AzModule --- Tasks/AzurePowerShellV5/CoreAz.ps1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Tasks/AzurePowerShellV5/CoreAz.ps1 b/Tasks/AzurePowerShellV5/CoreAz.ps1 index d992a09e1269..b02661c6e4f5 100644 --- a/Tasks/AzurePowerShellV5/CoreAz.ps1 +++ b/Tasks/AzurePowerShellV5/CoreAz.ps1 @@ -28,8 +28,16 @@ Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs $endpointObject = ConvertFrom-Json $endpoint Import-Module "$PSScriptRoot\ps_modules\VstsAzureHelpers_" $encryptedToken = ConvertTo-SecureString $vstsAccessToken -AsPlainText -Force -Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM ` + +try { + Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM ` -azVersion $targetAzurePs -isPSCore $isPSCore -encryptedToken $encryptedToken +} +catch { + Write-Host "An error occurred in Initialize-AzModule" + Resolve-Error $_ | ConvertTo-Json -Depth 5 | Write-Host + throw +} if ($vstsAccessToken) { $env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = $connectedServiceNameARM From 7f060e206c8323a7aaaddbf76a736481e53b5758 Mon Sep 17 00:00:00 2001 From: Ondrej Netocny Date: Wed, 9 Oct 2024 09:30:59 +0200 Subject: [PATCH 2/2] Bump up version, add generated files --- Tasks/AzurePowerShellV5/task.json | 2 +- Tasks/AzurePowerShellV5/task.loc.json | 2 +- _generated/AzurePowerShellV5.versionmap.txt | 4 ++-- _generated/AzurePowerShellV5/CoreAz.ps1 | 10 +++++++++- _generated/AzurePowerShellV5/task.json | 6 +++--- _generated/AzurePowerShellV5/task.loc.json | 6 +++--- _generated/AzurePowerShellV5_Node20/CoreAz.ps1 | 10 +++++++++- _generated/AzurePowerShellV5_Node20/task.json | 6 +++--- _generated/AzurePowerShellV5_Node20/task.loc.json | 6 +++--- 9 files changed, 34 insertions(+), 18 deletions(-) diff --git a/Tasks/AzurePowerShellV5/task.json b/Tasks/AzurePowerShellV5/task.json index 56e4c54a2994..9586467d5d6a 100644 --- a/Tasks/AzurePowerShellV5/task.json +++ b/Tasks/AzurePowerShellV5/task.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 247, - "Patch": 0 + "Patch": 2 }, "releaseNotes": "Added support for Az Module and cross platform agents.", "groups": [ diff --git a/Tasks/AzurePowerShellV5/task.loc.json b/Tasks/AzurePowerShellV5/task.loc.json index 78a7f12fe0fa..4192e540baea 100644 --- a/Tasks/AzurePowerShellV5/task.loc.json +++ b/Tasks/AzurePowerShellV5/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 247, - "Patch": 0 + "Patch": 2 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ diff --git a/_generated/AzurePowerShellV5.versionmap.txt b/_generated/AzurePowerShellV5.versionmap.txt index 63fa1e0e2211..28c855854b81 100644 --- a/_generated/AzurePowerShellV5.versionmap.txt +++ b/_generated/AzurePowerShellV5.versionmap.txt @@ -1,2 +1,2 @@ -Default|5.247.0 -Node20_229_2|5.247.1 +Default|5.247.2 +Node20_229_2|5.247.3 diff --git a/_generated/AzurePowerShellV5/CoreAz.ps1 b/_generated/AzurePowerShellV5/CoreAz.ps1 index d992a09e1269..b02661c6e4f5 100644 --- a/_generated/AzurePowerShellV5/CoreAz.ps1 +++ b/_generated/AzurePowerShellV5/CoreAz.ps1 @@ -28,8 +28,16 @@ Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs $endpointObject = ConvertFrom-Json $endpoint Import-Module "$PSScriptRoot\ps_modules\VstsAzureHelpers_" $encryptedToken = ConvertTo-SecureString $vstsAccessToken -AsPlainText -Force -Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM ` + +try { + Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM ` -azVersion $targetAzurePs -isPSCore $isPSCore -encryptedToken $encryptedToken +} +catch { + Write-Host "An error occurred in Initialize-AzModule" + Resolve-Error $_ | ConvertTo-Json -Depth 5 | Write-Host + throw +} if ($vstsAccessToken) { $env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = $connectedServiceNameARM diff --git a/_generated/AzurePowerShellV5/task.json b/_generated/AzurePowerShellV5/task.json index 87a5a67d4c32..651323340bac 100644 --- a/_generated/AzurePowerShellV5/task.json +++ b/_generated/AzurePowerShellV5/task.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 247, - "Patch": 0 + "Patch": 2 }, "releaseNotes": "Added support for Az Module and cross platform agents.", "groups": [ @@ -204,7 +204,7 @@ "PS_ExitCode": "PowerShell exited with code '{0}'." }, "_buildConfigMapping": { - "Default": "5.247.0", - "Node20_229_2": "5.247.1" + "Default": "5.247.2", + "Node20_229_2": "5.247.3" } } \ No newline at end of file diff --git a/_generated/AzurePowerShellV5/task.loc.json b/_generated/AzurePowerShellV5/task.loc.json index f5a3150339e5..9629cc468b21 100644 --- a/_generated/AzurePowerShellV5/task.loc.json +++ b/_generated/AzurePowerShellV5/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 247, - "Patch": 0 + "Patch": 2 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ @@ -204,7 +204,7 @@ "PS_ExitCode": "ms-resource:loc.messages.PS_ExitCode" }, "_buildConfigMapping": { - "Default": "5.247.0", - "Node20_229_2": "5.247.1" + "Default": "5.247.2", + "Node20_229_2": "5.247.3" } } \ No newline at end of file diff --git a/_generated/AzurePowerShellV5_Node20/CoreAz.ps1 b/_generated/AzurePowerShellV5_Node20/CoreAz.ps1 index d992a09e1269..b02661c6e4f5 100644 --- a/_generated/AzurePowerShellV5_Node20/CoreAz.ps1 +++ b/_generated/AzurePowerShellV5_Node20/CoreAz.ps1 @@ -28,8 +28,16 @@ Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs $endpointObject = ConvertFrom-Json $endpoint Import-Module "$PSScriptRoot\ps_modules\VstsAzureHelpers_" $encryptedToken = ConvertTo-SecureString $vstsAccessToken -AsPlainText -Force -Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM ` + +try { + Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM ` -azVersion $targetAzurePs -isPSCore $isPSCore -encryptedToken $encryptedToken +} +catch { + Write-Host "An error occurred in Initialize-AzModule" + Resolve-Error $_ | ConvertTo-Json -Depth 5 | Write-Host + throw +} if ($vstsAccessToken) { $env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = $connectedServiceNameARM diff --git a/_generated/AzurePowerShellV5_Node20/task.json b/_generated/AzurePowerShellV5_Node20/task.json index 32c6dda77806..b81386f6c9fe 100644 --- a/_generated/AzurePowerShellV5_Node20/task.json +++ b/_generated/AzurePowerShellV5_Node20/task.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 247, - "Patch": 1 + "Patch": 3 }, "releaseNotes": "Added support for Az Module and cross platform agents.", "groups": [ @@ -208,7 +208,7 @@ "PS_ExitCode": "PowerShell exited with code '{0}'." }, "_buildConfigMapping": { - "Default": "5.247.0", - "Node20_229_2": "5.247.1" + "Default": "5.247.2", + "Node20_229_2": "5.247.3" } } \ No newline at end of file diff --git a/_generated/AzurePowerShellV5_Node20/task.loc.json b/_generated/AzurePowerShellV5_Node20/task.loc.json index 17e7b9f56a59..93c2aa2b7d29 100644 --- a/_generated/AzurePowerShellV5_Node20/task.loc.json +++ b/_generated/AzurePowerShellV5_Node20/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 247, - "Patch": 1 + "Patch": 3 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ @@ -208,7 +208,7 @@ "PS_ExitCode": "ms-resource:loc.messages.PS_ExitCode" }, "_buildConfigMapping": { - "Default": "5.247.0", - "Node20_229_2": "5.247.1" + "Default": "5.247.2", + "Node20_229_2": "5.247.3" } } \ No newline at end of file