Skip to content

Set the Content-Type header for binary content #24

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

Merged
merged 1 commit into from
Jan 13, 2024
Merged

Set the Content-Type header for binary content #24

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 34 additions & 53 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use ::prost::Message;
use prost::Message;
use reqwest;
use reqwest::header::CONTENT_TYPE;
use reqwest::Client;
use std::default::Default;

use crate::error::VssError;
use crate::types::{
Expand All @@ -9,6 +11,8 @@ use crate::types::{
};
use crate::util::retry::{retry, RetryPolicy};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

/// Thin-client to access a hosted instance of Versioned Storage Service (VSS).
/// The provided [`VssClient`] API is minimalistic and is congruent to the VSS server-side API.
#[derive(Clone)]
Expand Down Expand Up @@ -45,25 +49,15 @@ impl<R: RetryPolicy<E = VssError>> VssClient<R> {
retry(
|| async {
let url = format!("{}/getObject", self.base_url);

let request_body = request.encode_to_vec();
let raw_response = self.client.post(url).body(request_body).send().await?;
let status = raw_response.status();
let payload = raw_response.bytes().await?;

if status.is_success() {
let response = GetObjectResponse::decode(&payload[..])?;

self.post_request(request, &url).await.and_then(|response: GetObjectResponse| {
if response.value.is_none() {
return Err(VssError::InternalServerError(
Err(VssError::InternalServerError(
"VSS Server API Violation, expected value in GetObjectResponse but found none".to_string(),
));
))
} else {
Ok(response)
}

Ok(response)
} else {
Err(VssError::new(status, payload))
}
})
},
&self.retry_policy,
)
Expand All @@ -78,18 +72,7 @@ impl<R: RetryPolicy<E = VssError>> VssClient<R> {
retry(
|| async {
let url = format!("{}/putObjects", self.base_url);

let request_body = request.encode_to_vec();
let response_raw = self.client.post(&url).body(request_body).send().await?;
let status = response_raw.status();
let payload = response_raw.bytes().await?;

if status.is_success() {
let response = PutObjectResponse::decode(&payload[..])?;
Ok(response)
} else {
Err(VssError::new(status, payload))
}
self.post_request(request, &url).await
},
&self.retry_policy,
)
Expand All @@ -103,18 +86,7 @@ impl<R: RetryPolicy<E = VssError>> VssClient<R> {
retry(
|| async {
let url = format!("{}/deleteObject", self.base_url);

let request_body = request.encode_to_vec();
let response_raw = self.client.post(url).body(request_body).send().await?;
let status = response_raw.status();
let payload = response_raw.bytes().await?;

if status.is_success() {
let response = DeleteObjectResponse::decode(&payload[..])?;
Ok(response)
} else {
Err(VssError::new(status, payload))
}
self.post_request(request, &url).await
},
&self.retry_policy,
)
Expand All @@ -130,21 +102,30 @@ impl<R: RetryPolicy<E = VssError>> VssClient<R> {
retry(
|| async {
let url = format!("{}/listKeyVersions", self.base_url);

let request_body = request.encode_to_vec();
let response_raw = self.client.post(url).body(request_body).send().await?;
let status = response_raw.status();
let payload = response_raw.bytes().await?;

if status.is_success() {
let response = ListKeyVersionsResponse::decode(&payload[..])?;
Ok(response)
} else {
Err(VssError::new(status, payload))
}
self.post_request(request, &url).await
},
&self.retry_policy,
)
.await
}

async fn post_request<Rq: Message, Rs: Message + Default>(&self, request: &Rq, url: &str) -> Result<Rs, VssError> {
let request_body = request.encode_to_vec();
let response_raw = self
.client
.post(url)
.header(CONTENT_TYPE, APPLICATION_OCTET_STREAM)
.body(request_body)
.send()
.await?;
let status = response_raw.status();
let payload = response_raw.bytes().await?;

if status.is_success() {
let response = Rs::decode(&payload[..])?;
Ok(response)
} else {
Err(VssError::new(status, payload))
}
}
}
7 changes: 7 additions & 0 deletions tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
mod tests {
use mockito::{self, Matcher};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use std::time::Duration;
use vss_client::client::VssClient;
use vss_client::error::VssError;
Expand All @@ -12,6 +13,8 @@ mod tests {
};
use vss_client::util::retry::{ExponentialBackoffRetryPolicy, RetryPolicy};

const APPLICATION_OCTET_STREAM: &'static str = "application/octet-stream";

const GET_OBJECT_ENDPOINT: &'static str = "/getObject";
const PUT_OBJECT_ENDPOINT: &'static str = "/putObjects";
const DELETE_OBJECT_ENDPOINT: &'static str = "/deleteObject";
Expand All @@ -31,6 +34,7 @@ mod tests {

// Register the mock endpoint with the mockito server.
let mock_server = mockito::mock("POST", GET_OBJECT_ENDPOINT)
.match_header(CONTENT_TYPE.as_str(), APPLICATION_OCTET_STREAM)
.match_body(get_request.encode_to_vec())
.with_status(200)
.with_body(mock_response.encode_to_vec())
Expand Down Expand Up @@ -64,6 +68,7 @@ mod tests {

// Register the mock endpoint with the mockito server.
let mock_server = mockito::mock("POST", PUT_OBJECT_ENDPOINT)
.match_header(CONTENT_TYPE.as_str(), APPLICATION_OCTET_STREAM)
.match_body(request.encode_to_vec())
.with_status(200)
.with_body(mock_response.encode_to_vec())
Expand Down Expand Up @@ -94,6 +99,7 @@ mod tests {

// Register the mock endpoint with the mockito server.
let mock_server = mockito::mock("POST", DELETE_OBJECT_ENDPOINT)
.match_header(CONTENT_TYPE.as_str(), APPLICATION_OCTET_STREAM)
.match_body(request.encode_to_vec())
.with_status(200)
.with_body(mock_response.encode_to_vec())
Expand Down Expand Up @@ -134,6 +140,7 @@ mod tests {

// Register the mock endpoint with the mockito server.
let mock_server = mockito::mock("POST", LIST_KEY_VERSIONS_ENDPOINT)
.match_header(CONTENT_TYPE.as_str(), APPLICATION_OCTET_STREAM)
.match_body(request.encode_to_vec())
.with_status(200)
.with_body(mock_response.encode_to_vec())
Expand Down