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.

Sign up for GitHub

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

Jump to bottom

feat(obs): support loading credential from env #2767

Merged
merged 1 commit into from
Aug 3, 2023
Merged

feat(obs): support loading credential from env #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ redis = { version = "0.23", features = [
"tokio-comp",
"connection-manager",
], optional = true }
reqsign = { version = "0.14.0", default-features = false, optional = true }
reqsign = { version = "0.14.1", default-features = false, optional = true }
reqwest = { version = "0.11.18", features = [
"stream",
], default-features = false }
Expand Down
20 changes: 13 additions & 7 deletions core/src/services/obs/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,19 @@ impl Builder for ObsBuilder {
})?
};

let config = HuaweicloudObsConfig {
access_key_id: self.access_key_id.take(),
secret_access_key: self.secret_access_key.take(),
security_token: None,
};
let mut cfg = HuaweicloudObsConfig::default();
// Load cfg from env first.
cfg = cfg.from_env();

if let Some(v) = self.access_key_id.take() {
cfg.access_key_id = Some(v);
}

if let Some(v) = self.secret_access_key.take() {
cfg.secret_access_key = Some(v);
}

let cred_loader = HuaweicloudObsCredentialLoader::new(config);
let loader = HuaweicloudObsCredentialLoader::new(cfg);

// Set the bucket name in CanonicalizedResource.
// 1. If the bucket is bound to a user domain name, use the user domain name as the bucket name,
Expand Down Expand Up @@ -307,7 +313,7 @@ impl Builder for ObsBuilder {
root,
endpoint: format!("{}://{}", &scheme, &endpoint),
signer,
loader: cred_loader,
loader,
client,
write_min_size,
}),
Expand Down