Skip to content

Commit 543e5fc

Browse files
authored
Log exceptions that occurs in Initialize-AzModule (#20528)
* Log exceptions that occurs in Initialize-AzModule * Bump up version, add generated files
1 parent ee86531 commit 543e5fc

File tree

10 files changed

+43
-19
lines changed

10 files changed

+43
-19
lines changed

Tasks/AzurePowerShellV5/CoreAz.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,16 @@ Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs
2828
$endpointObject = ConvertFrom-Json $endpoint
2929
Import-Module "$PSScriptRoot\ps_modules\VstsAzureHelpers_"
3030
$encryptedToken = ConvertTo-SecureString $vstsAccessToken -AsPlainText -Force
31-
Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM `
31+
32+
try {
33+
Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM `
3234
-azVersion $targetAzurePs -isPSCore $isPSCore -encryptedToken $encryptedToken
35+
}
36+
catch {
37+
Write-Host "An error occurred in Initialize-AzModule"
38+
Resolve-Error $_ | ConvertTo-Json -Depth 5 | Write-Host
39+
throw
40+
}
3341

3442
if ($vstsAccessToken) {
3543
$env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = $connectedServiceNameARM

Tasks/AzurePowerShellV5/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 5,
2020
"Minor": 247,
21-
"Patch": 0
21+
"Patch": 2
2222
},
2323
"releaseNotes": "Added support for Az Module and cross platform agents.",
2424
"groups": [

Tasks/AzurePowerShellV5/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 5,
2020
"Minor": 247,
21-
"Patch": 0
21+
"Patch": 2
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"groups": [
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|5.247.0
2-
Node20_229_2|5.247.1
1+
Default|5.247.2
2+
Node20_229_2|5.247.3

_generated/AzurePowerShellV5/CoreAz.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,16 @@ Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs
2828
$endpointObject = ConvertFrom-Json $endpoint
2929
Import-Module "$PSScriptRoot\ps_modules\VstsAzureHelpers_"
3030
$encryptedToken = ConvertTo-SecureString $vstsAccessToken -AsPlainText -Force
31-
Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM `
31+
32+
try {
33+
Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM `
3234
-azVersion $targetAzurePs -isPSCore $isPSCore -encryptedToken $encryptedToken
35+
}
36+
catch {
37+
Write-Host "An error occurred in Initialize-AzModule"
38+
Resolve-Error $_ | ConvertTo-Json -Depth 5 | Write-Host
39+
throw
40+
}
3341

3442
if ($vstsAccessToken) {
3543
$env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = $connectedServiceNameARM

_generated/AzurePowerShellV5/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 5,
2020
"Minor": 247,
21-
"Patch": 0
21+
"Patch": 2
2222
},
2323
"releaseNotes": "Added support for Az Module and cross platform agents.",
2424
"groups": [
@@ -204,7 +204,7 @@
204204
"PS_ExitCode": "PowerShell exited with code '{0}'."
205205
},
206206
"_buildConfigMapping": {
207-
"Default": "5.247.0",
208-
"Node20_229_2": "5.247.1"
207+
"Default": "5.247.2",
208+
"Node20_229_2": "5.247.3"
209209
}
210210
}

_generated/AzurePowerShellV5/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 5,
2020
"Minor": 247,
21-
"Patch": 0
21+
"Patch": 2
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"groups": [
@@ -204,7 +204,7 @@
204204
"PS_ExitCode": "ms-resource:loc.messages.PS_ExitCode"
205205
},
206206
"_buildConfigMapping": {
207-
"Default": "5.247.0",
208-
"Node20_229_2": "5.247.1"
207+
"Default": "5.247.2",
208+
"Node20_229_2": "5.247.3"
209209
}
210210
}

_generated/AzurePowerShellV5_Node20/CoreAz.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,16 @@ Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs
2828
$endpointObject = ConvertFrom-Json $endpoint
2929
Import-Module "$PSScriptRoot\ps_modules\VstsAzureHelpers_"
3030
$encryptedToken = ConvertTo-SecureString $vstsAccessToken -AsPlainText -Force
31-
Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM `
31+
32+
try {
33+
Initialize-AzModule -Endpoint $endpointObject -connectedServiceNameARM $connectedServiceNameARM `
3234
-azVersion $targetAzurePs -isPSCore $isPSCore -encryptedToken $encryptedToken
35+
}
36+
catch {
37+
Write-Host "An error occurred in Initialize-AzModule"
38+
Resolve-Error $_ | ConvertTo-Json -Depth 5 | Write-Host
39+
throw
40+
}
3341

3442
if ($vstsAccessToken) {
3543
$env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = $connectedServiceNameARM

_generated/AzurePowerShellV5_Node20/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 5,
2020
"Minor": 247,
21-
"Patch": 1
21+
"Patch": 3
2222
},
2323
"releaseNotes": "Added support for Az Module and cross platform agents.",
2424
"groups": [
@@ -208,7 +208,7 @@
208208
"PS_ExitCode": "PowerShell exited with code '{0}'."
209209
},
210210
"_buildConfigMapping": {
211-
"Default": "5.247.0",
212-
"Node20_229_2": "5.247.1"
211+
"Default": "5.247.2",
212+
"Node20_229_2": "5.247.3"
213213
}
214214
}

_generated/AzurePowerShellV5_Node20/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 5,
2020
"Minor": 247,
21-
"Patch": 1
21+
"Patch": 3
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"groups": [
@@ -208,7 +208,7 @@
208208
"PS_ExitCode": "ms-resource:loc.messages.PS_ExitCode"
209209
},
210210
"_buildConfigMapping": {
211-
"Default": "5.247.0",
212-
"Node20_229_2": "5.247.1"
211+
"Default": "5.247.2",
212+
"Node20_229_2": "5.247.3"
213213
}
214214
}

0 commit comments

Comments
 (0)