Refactor account_url use in WasbHook #32980
Merged
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
boring-cyborg
bot
added
area:providers
provider:microsoft-azure
ephraimbuddy
force-pushed
the
refactor-account-url
branch
from
eba4b65
to
ec02d56
Compare
|
cc: @manmeetkaur |
ferruzzi
reviewed
Jul 31, 2023
ferruzzi
reviewed
Jul 31, 2023
This PR moves the account_url setting to one place. Tested this by making connection to azure using the different methods, however, I was not able to connect using the tenant_id in the extra field. This looks like a bug because ClientSecretCredential is not among the credentials to use in BlobServiceClient. The credentials to use include AzureNamedKeyCredential,AzureSasCredential,AsyncTokenCredential. So this will need special debugging.
ephraimbuddy
force-pushed
the
refactor-account-url
branch
from
ec02d56
to
78a02f3
Compare
ephraimbuddy
force-pushed
the
refactor-account-url
branch
from
78a02f3
to
0966636
Compare
ferruzzi
approved these changes
Aug 1, 2023
| @@ -184,15 +184,19 @@ def get_conn(self) -> BlobServiceClient: | |||
| # connection_string auth takes priority | |||
| return BlobServiceClient.from_connection_string(connection_string, **extra) | |||
|
|
|||
| account_url = ( | |||
There was a problem hiding this comment.
That ended up still looking pretty gnarly, didn't it? 😞
There was a problem hiding this comment.
Yeah but quite understandable
This was referenced Aug 4, 2023
ephraimbuddy
added a commit
to astronomer/airflow
that referenced
this pull request
Aug 17, 2023
There are different ways users supply the hostname(account url) in azure, sometimes the host doesn't have a urlparse.scheme but has urlparse.path e.g name.blob.windows.net and other times, it will just be Azure ID e.g aldhjf9dads. While working on apache#32980, I assumed that if there's no scheme, then the hostname is not valid, that's incorrect since DNS can serve as the host. The fix was to check if we don't have netloc and that urlparse.path does not include a dot and if it does not, use the login/account_name to construct the account_url
ephraimbuddy
added a commit
that referenced
this pull request
Aug 17, 2023
* Fix updating account url for WasbHook There are different ways users supply the hostname(account url) in azure, sometimes the host doesn't have a urlparse.scheme but has urlparse.path e.g name.blob.windows.net and other times, it will just be Azure ID e.g aldhjf9dads. While working on #32980, I assumed that if there's no scheme, then the hostname is not valid, that's incorrect since DNS can serve as the host. The fix was to check if we don't have netloc and that urlparse.path does not include a dot and if it does not, use the login/account_name to construct the account_url * fixup! Fix updating account url for WasbHook
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.
This PR moves the account_url setting to one place.
Tested this by making connection to azure using the different methods, however, I was not able to connect using
the tenant_id in the extra field. This looks like a bug because ClientSecretCredential is not among the credentials
to use in BlobServiceClient. The credentials to use include AzureNamedKeyCredential,AzureSasCredential,AsyncTokenCredential.
So this will need special debugging.