Skip to content

Add function to create VaultClient with reqwest Client #190

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

Open
collinoc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add function to create VaultClient with reqwest Client #190

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions vaultrs/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,6 @@ impl VaultClient {
http_client = http_client.identity(identity.clone());
}

// Configures middleware for endpoints to append API version and token
debug!("Using API version {}", settings.version);
let version_str = format!("v{}", settings.version);
let middle = EndpointMiddleware {
token: settings.token.clone(),
version: version_str,
wrap: None,
namespace: settings.namespace.clone(),
};

if let Some(proxy_url) = &settings.proxy {
http_client = http_client.proxy(
Proxy::all(proxy_url.as_str())
Expand All @@ -153,7 +143,27 @@ impl VaultClient {
let http_client = http_client
.build()
.map_err(|e| ClientError::RestClientBuildError { source: e })?;

Self::new_with_http_client(settings, http_client)
}

/// Creates a new [VaultClient] using a given HTTP [Client](reqwest::Client).
#[instrument(skip(settings, http_client), err)]
pub fn new_with_http_client(
settings: VaultClientSettings,
http_client: reqwest::Client,
) -> Result<Self, ClientError> {
// Configures middleware for endpoints to append API version and token
debug!("Using API version {}", settings.version);
let version_str = format!("v{}", settings.version);
let middle = EndpointMiddleware {
token: settings.token.clone(),
version: version_str,
wrap: None,
namespace: settings.namespace.clone(),
};
let http = HTTPClient::new(settings.address.as_str(), http_client);

Ok(VaultClient {
settings,
middle,
Expand Down