Rework error handling and state flow in the Azure connection #5356
Conversation
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
|
nts: we can remove AzureExitStr as well. |
* _RequestHelper no longer eats exceptions. * Delete the "no internet" error message. * Wrap exceptions coming out of Azure API in a well-known type. * Catch by type. * Extract error codes for known failures (keep polling, invalid grant). * When we get an Invalid Grant, dispose of the cached refresh token and force the user to log in again. * Catch all printable exceptions and print them. * Remove the NoConnect state completely -- just bail out when an exception hits the toplevel of the output thread. * Move 3x logic into _RefreshTokens and pop exceptions out of it. * Begin abstracting into AzureClient
Switch to 2020 tenant API; use defaultDomain; put defaultDomain into the display name. Consider: not showing the tenant GUID at all?
DHowett-MSFT
force-pushed
the
dev/duhowett/azure-3
branch
from
89b9de6 to
2417105
Compare
|
Confirmed this actually fixes #4803, doesn’t just improve diagnostics. |
zadjii-msft
approved these changes
Apr 15, 2020
| { | ||
| try | ||
| { | ||
| throw; |
There was a problem hiding this comment.
what the heck
does this just get the current exception if you're already in a catch block?
There was a problem hiding this comment.
YES it’s great
zadjii-msft
added
Area-AzureShell
|
Yeah def |
|
Alright, got to this: default domain if available, ID otherwise, and this supports loading up old version credentials |
Instead of passing around four loose variables, create a Tenant class and use that for packing/unpacking into/out of json (and the windows credential store, where we "cleverly" used json for the tenant info there too). When displaying a tenant, use its display name if there is one, the unknown resource string if there isn't, and the default domain if there is one and the ID if there isn't. Fixes #5325.
DHowett-MSFT
force-pushed
the
dev/duhowett/azure-3
branch
from
2417105 to
38429b5
Compare
carlos-zamora
approved these changes
Apr 16, 2020
|
🎉 Handy links: |
This was referenced Apr 22, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
38429b5 - az: rework tenant/tenant storage and fix display names
Instead of passing around four loose variables, create a Tenant class
and use that for packing/unpacking into/out of json (and the windows
credential store, where we "cleverly" used json for the tenant info
there too).
When displaying a tenant, use its display name if there is one, the
unknown resource string if there isn't, and the default domain if there
is one and the ID if there isn't.
Fixes #5325.
9f6ebcb - az: use {fmt} for formatting request bodies
8a54e09 - az: remove dead strings
8985c38 - az: rework Request/HeaderHelper to Send(Authenticated?)ReqReturningJson
7ad9e88 - az: rewrite polling to use std::chrono
69b59cb - az: remove HR returns from state machine
2fe5f66 - az: rename state handlers from _XHelper to _RunXState
a1de8c3 - az: cleanup, prefix user input with >, remove namespaces
b5e16c2 - az: show more tenant info
Switch to 2020 tenant API; use defaultDomain; put defaultDomain into the
display name.
Consider: not showing the tenant GUID at all?
61f06e7 - az: rework error handling
Summary of the Pull Request
This is a tidying-up of the azure connection. It improves error logging (like: it actually emits error logs...) and retry logic and the state machine and it audits the exit points of the state machine for exceptions and removes the HRESULT returns (so they either succeed and transition to a new state or throw an exception or are going down anyway).
There's also a change in here that changes how we display tenants. It adds the "default domain" to the name, so that instead of seeing this:
you see this
References
Fixes #5325 (by addressing its chief complaint).
Fixes #4803.
Adds diagnosability for #4575.
PR Checklist
Detailed Description of the Pull Request / Additional comments
As above.
Validation Steps Performed
Logged in, out, around a good number of times.