refactor(services/azblob): use OsEnv instead of StaticEnv hack#7589
Merged
Conversation
This file contains hidden or 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
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.
Which issue does this PR close?
Rationale for this change
azblob's builder was injecting user-suppliedaccount_name/account_key/sas_tokeninto reqsign by translating them into fake env vars stuffed into aStaticEnv. The same values were also pushed into the credential chain viaStaticCredentialProvider::new_shared_key/new_sas_token(see lines 393-406 in the old code), so the fake-env path was redundant — onlypush_frontactually fired, because it has higher priority in the chain.The
StaticEnvhack also previously masked OS env vars (see #7224 root cause for azdls); the same anti-pattern in azblob has no functional benefit.What changes are included in this PR?
Switch to the s3 pattern:
.with_env(StaticEnv { ... })->.with_env(OsEnv).envs.insert("AZBLOB_ACCOUNT_NAME", ...)/AZBLOB_ACCOUNT_KEY/AZURE_STORAGE_SAS_TOKENtranslation block.StaticCredentialProvider::new_shared_key/new_sas_tokenpush_front chain (already the correct API).account_key.reqsign_core::Env/StaticEnvimports.Are there any user-facing changes?
No behavior change for users who set credentials via opendal config