Skip to content
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

feat(object store): support azblob workload identity #15940

Merged
merged 12 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev =
futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" }
# patch: unlimit 4MB message size for grpc client
etcd-client = { git = "https://github.com/risingwavelabs/etcd-client.git", rev = "4e84d40" }
reqsign = { git = "https://github.com/wcy-fdu/reqsign.git", rev = "7ca1d72" }

[workspace.metadata.dylint]
libraries = [{ path = "./lints" }]
4 changes: 4 additions & 0 deletions src/object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ thiserror-ext = { workspace = true }
tokio = { version = "0.2", package = "madsim-tokio", features = ["fs"] }
tokio-retry = "0.3"
tracing = "0.1"

[patch.crates-io]
reqsign = { git = "https://github.com/wcy-fdu/reqsign.git", rev = "f6ff677" }
wcy-fdu marked this conversation as resolved.
Show resolved Hide resolved

# This crate is excluded from hakari (see hakari.toml) after hdfs is introduced...## [target.'cfg(not(madsim))'.dependencies]
# workspace-hack = { path = "../workspace-hack" }
#
Expand Down
12 changes: 6 additions & 6 deletions src/object_store/src/object/opendal_engine/azblob.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ impl OpendalObjectStore {

let endpoint = std::env::var("AZBLOB_ENDPOINT")
.unwrap_or_else(|_| panic!("AZBLOB_ENDPOINT not found from environment variables"));
let account_name = std::env::var("AZBLOB_ACCOUNT_NAME")
.unwrap_or_else(|_| panic!("AZBLOB_ACCOUNT_NAME not found from environment variables"));
let account_key = std::env::var("AZBLOB_ACCOUNT_KEY")
.unwrap_or_else(|_| panic!("AZBLOB_ACCOUNT_KEY not found from environment variables"));
// let account_name = std::env::var("AZBLOB_ACCOUNT_NAME")
// .unwrap_or_else(|_| panic!("AZBLOB_ACCOUNT_NAME not found from environment variables"));
// let account_key = std::env::var("AZBLOB_ACCOUNT_KEY")
// .unwrap_or_else(|_| panic!("AZBLOB_ACCOUNT_KEY not found from environment variables"));

builder.endpoint(&endpoint);
builder.account_name(&account_name);
builder.account_key(&account_key);
// builder.account_name(&account_name);
// builder.account_key(&account_key);
wcy-fdu marked this conversation as resolved.
Show resolved Hide resolved
let op: Operator = Operator::new(builder)?
.layer(LoggingLayer::default())
.layer(RetryLayer::default())
Expand Down
Loading