Page MenuHomePhabricator
Differential D8985

[reports-service] E-mail: download links and JSON preview
ClosedPublic
Actions

Authored by bartek on Aug 28 2023, 11:04 PM.
Tags
None
Referenced Files
F6163748: D8985.diff
Tue, Apr 22, 8:52 PM
Unknown Object (File)
Fri, Apr 18, 2:23 PM
Unknown Object (File)
Fri, Apr 18, 11:31 AM
Unknown Object (File)
Fri, Apr 18, 1:32 AM
Unknown Object (File)
Thu, Apr 17, 1:10 PM
Unknown Object (File)
Tue, Apr 15, 7:40 PM
Unknown Object (File)
Mon, Apr 14, 2:09 PM
Unknown Object (File)
Wed, Mar 26, 11:15 AM
View All 97 Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
• patryk
• jon
Commits
rCOMM2011bd7f7329: [reports-service] E-mail: download links and JSON preview
Summary

It is convenient to access the report directly from an e-mail.
A report preview is added (I decided to truncate it to 100 lines to avoid sending too long e-mails)

Also added two links:

  • To view the entire report JSON
  • To download Redux Devtools import (available only for error reports)

Depends on D8984

Test Plan

Created a temporary HTTP endpoint that renders this HTML and opened it in the browser.
Screenshots of the final result in D8988

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
services/
reports/
src/
10 lines
email/
template/
53 lines

Diff 30722

View Options

services/reports/src/config.rs

use derive_more::{Display, Error, From}; use derive_more::{Display, Error, From};
use futures_core::Stream; use futures_core::Stream;
use futures_util::StreamExt; use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url; use reqwest::{
multipart::{Form, Part},
Body, Url,
};
use tracing::{debug, trace, warn}; use tracing::{debug, trace, warn};
// publicly re-export some reqwest types // publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError; pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode; pub use reqwest::StatusCode;
#[derive(From, Error, Debug, Display)] #[derive(From, Error, Debug, Display)]
pub enum BlobServiceError { pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines ) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
} }
let error = handle_http_error(response.status()); let error = handle_http_error(response.status());
if let Ok(message) = response.text().await { if let Ok(message) = response.text().await {
trace!("Error response message: {}", message); trace!("Error response message: {}", message);
} }
Err(error) Err(error)
} }
/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
/// already exists.
///
/// # Example
/// ```rust
/// use std::io::{Error, ErrorKind};
///
/// let client =
/// BlobServiceClient::new("http://localhost:50053".parse()?);
///
/// let stream = async_stream::stream! {
/// yield Ok(vec![1, 2, 3]);
/// yield Ok(vec![4, 5, 6]);
/// yield Err(Error::new(ErrorKind::Other, "Oops"));
/// };
/// client.upload_blob(&blob_hash, stream).await?;
/// ```
pub async fn upload_blob<H, S>(
&self,
blob_hash: H,
data_stream: S,
) -> BlobResult<()>
where
H: Into<String>,
S: futures_core::stream::TryStream + Send + Sync + 'static,
S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
Vec<u8>: From<S::Ok>,
bartekAuthorUnsubmitted
Done
Inline Actions

Requirements of the reqwest body stream:
A stream of Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>

bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
{
debug!("Revoke holder request");
michalUnsubmitted
Not Done
Inline Actions

Wrong message?

michal: Wrong message?
let url = self.get_blob_url(None)?;
let stream = data_stream.map_ok(Vec::from);
let streaming_body = Body::wrap_stream(stream);
let form = Form::new()
.text("blob_hash", blob_hash.into())
.part("blob_data", Part::stream(streaming_body));
let response = self.http_client.put(url).multipart(form).send().await?;
debug!("Response status: {}", response.status());
if response.status().is_success() {
trace!("Blob upload successful");
return Ok(());
}
let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);
}
Err(error)
}
} }
// private helper methods // private helper methods
impl BlobServiceClient { impl BlobServiceClient {
fn get_blob_url( fn get_blob_url(
&self, &self,
blob_hash: Option<&str>, blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> { ) -> Result<Url, BlobServiceError> {
Show All 24 Lines
View Options

services/reports/src/email/template/mod.rs

use derive_more::{Display, Error, From}; use derive_more::{Display, Error, From};
use futures_core::Stream; use futures_core::Stream;
use futures_util::StreamExt; use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url; use reqwest::{
multipart::{Form, Part},
Body, Url,
};
use tracing::{debug, trace, warn}; use tracing::{debug, trace, warn};
// publicly re-export some reqwest types // publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError; pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode; pub use reqwest::StatusCode;
#[derive(From, Error, Debug, Display)] #[derive(From, Error, Debug, Display)]
pub enum BlobServiceError { pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines ) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
} }
let error = handle_http_error(response.status()); let error = handle_http_error(response.status());
if let Ok(message) = response.text().await { if let Ok(message) = response.text().await {
trace!("Error response message: {}", message); trace!("Error response message: {}", message);
} }
Err(error) Err(error)
} }
/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
/// already exists.
///
/// # Example
/// ```rust
/// use std::io::{Error, ErrorKind};
///
/// let client =
/// BlobServiceClient::new("http://localhost:50053".parse()?);
///
/// let stream = async_stream::stream! {
/// yield Ok(vec![1, 2, 3]);
/// yield Ok(vec![4, 5, 6]);
/// yield Err(Error::new(ErrorKind::Other, "Oops"));
/// };
/// client.upload_blob(&blob_hash, stream).await?;
/// ```
pub async fn upload_blob<H, S>(
&self,
blob_hash: H,
data_stream: S,
) -> BlobResult<()>
where
H: Into<String>,
S: futures_core::stream::TryStream + Send + Sync + 'static,
S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
Vec<u8>: From<S::Ok>,
bartekAuthorUnsubmitted
Done
Inline Actions

Requirements of the reqwest body stream:
A stream of Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>

bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
{
debug!("Revoke holder request");
michalUnsubmitted
Not Done
Inline Actions

Wrong message?

michal: Wrong message?
let url = self.get_blob_url(None)?;
let stream = data_stream.map_ok(Vec::from);
let streaming_body = Body::wrap_stream(stream);
let form = Form::new()
.text("blob_hash", blob_hash.into())
.part("blob_data", Part::stream(streaming_body));
let response = self.http_client.put(url).multipart(form).send().await?;
debug!("Response status: {}", response.status());
if response.status().is_success() {
trace!("Blob upload successful");
return Ok(());
}
let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);
}
Err(error)
}
} }
// private helper methods // private helper methods
impl BlobServiceClient { impl BlobServiceClient {
fn get_blob_url( fn get_blob_url(
&self, &self,
blob_hash: Option<&str>, blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> { ) -> Result<Url, BlobServiceError> {
Show All 24 Lines