Skip to content

Commit 391cfb5

Browse files
committed
chore: adjust minio
1 parent dd38f07 commit 391cfb5

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/common/notification.rs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
use crate::command_utils::CommandOutput;
2-
use minio::s3::builders::{ObjectContent, PutObjectContent};
2+
use minio::s3::args::PutObjectArgs;
3+
use minio::s3::client::{Client, ClientBuilder};
34
use minio::s3::creds::StaticProvider;
45
use minio::s3::http::BaseUrl;
5-
use minio::s3::multimap::Multimap;
6-
use minio::s3::{Client, ClientBuilder};
6+
use minio::s3::utils::Multimap;
77
use serde::{Deserialize, Serialize};
88
use std::env;
9+
use std::io::{Cursor, Read};
910

1011
#[derive(Serialize, Deserialize, Debug)]
1112
struct Notification {
@@ -74,19 +75,15 @@ async fn save_oss(notification: &Notification) -> anyhow::Result<()> {
7475
if let Some(stderr) = &notification.stderr {
7576
text.push_str(stderr);
7677
}
77-
let content = ObjectContent::from(text);
78-
let mut put_object = PutObjectContent::new(
79-
minio_client,
80-
s3_bucket,
81-
notification.task_id.clone(),
82-
content,
83-
);
84-
put_object = put_object.content_type("text/plain".to_string());
78+
let reader: &mut dyn Read = &mut Cursor::new(text.as_bytes());
79+
let mut put_object =
80+
PutObjectArgs::new(&s3_bucket, &notification.task_id, reader, None, None)?;
81+
put_object.content_type = "text/plain";
8582
let mut user_metadata = Multimap::new();
8683
user_metadata.insert("status".to_string(), notification.status.to_string());
8784
user_metadata.insert("command".to_string(), notification.command_name.to_string());
88-
put_object = put_object.user_metadata(Some(user_metadata));
89-
put_object.send().await?;
85+
put_object.user_metadata = Some(&user_metadata);
86+
minio_client.put_object(&mut put_object).await?;
9087
}
9188
Ok(())
9289
}

0 commit comments

Comments
 (0)