-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added additional logs to identify script errors in AzurePowerShellV4 #12167
Merged
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
97a6183
Added additional logs to identify script errors
aksm-ms d1c3491
Added review comments
Akshaya1509 49d40dc
Added troubleshoot fwd link
Akshaya1509 052a13a
Added additional logs to debug in azurepowershell.ts
Akshaya1509 05a6586
Added review comments
Akshaya1509 2bd1d51
Added review comments
aksm-ms 75381a9
Merge branch 'master' into users/aksm/addErrorLogsV4
aksm-ms File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ $customTargetAzurePs = Get-VstsInput -Name CustomTargetAzurePs | |
$input_pwsh = Get-VstsInput -Name pwsh -AsBool | ||
$input_workingDirectory = Get-VstsInput -Name workingDirectory -Require | ||
|
||
Write-Host "## Validating Inputs" | ||
# Validate the script path and args do not contains new-lines. Otherwise, it will | ||
# break invoking the script via Invoke-Expression. | ||
if ($scriptType -eq "FilePath") { | ||
|
@@ -45,20 +46,34 @@ if ($targetAzurePs -eq $latestVersion) { | |
} elseif (-not($regex.IsMatch($targetAzurePs))) { | ||
throw (Get-VstsLocString -Key InvalidAzurePsVersion -ArgumentList $targetAzurePs) | ||
} | ||
Write-Host "## Validating Inputs Complete" | ||
|
||
Write-Host "## Initializing Azure" | ||
. "$PSScriptRoot\Utility.ps1" | ||
|
||
$serviceName = Get-VstsInput -Name ConnectedServiceNameARM -Require | ||
$endpoint = Get-VstsEndpoint -Name $serviceName -Require | ||
CleanUp-PSModulePathForHostedAgent | ||
Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs | ||
|
||
# troubleshoot link | ||
$troubleshoot = "https://aka.ms/azurepowershelltroubleshooting" | ||
try | ||
{ | ||
# Initialize Azure. | ||
Import-Module $PSScriptRoot\ps_modules\VstsAzureHelpers_ | ||
Initialize-AzModule -Endpoint $endpoint -azVersion $targetAzurePs | ||
|
||
Write-Host "## Initializing Azure Complete" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "Az module initialization completed" |
||
$success = $true | ||
} | ||
finally { | ||
if (!$success) { | ||
Write-VstsTaskError "Initialize Azure failed: For troubleshooting, refer: $troubleshoot" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "Initializing Az module failed. For troubleshooting, refer: $troubleshoot" |
||
} | ||
} | ||
|
||
Write-Host "## Beginning Script Execution" | ||
try { | ||
if ($input_pwsh) | ||
{ | ||
# Generate the script contents. | ||
|
@@ -247,4 +262,5 @@ finally { | |
Import-Module $PSScriptRoot\ps_modules\VstsAzureHelpers_ | ||
Remove-EndpointSecrets | ||
Disconnect-AzureAndClearContext -ErrorAction SilentlyContinue | ||
} | ||
} | ||
Write-Host "## Script Execution Complete" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Write "Initializing Az module"