Skip to content

Commit ddec540

Browse files
authored
Refactor object lock config, retention, tags (#140)
* refactor make-bucket, bucket_exists, remove_bucket * refactor disable-object-legal-hold, enable-object-legal-hold, is-object-legal-hold-enabled
1 parent d2afb4d commit ddec540

File tree

83 files changed

+3451
-1617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3451
-1617
lines changed

.rustfmt.toml

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ max_width = 100
77
array_width = 60 # default is 60
88
attr_fn_like_width = 70 # default is 70
99
chain_width = 60 # default is 60
10+
11+
reorder_imports = true

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ tokio-stream = "0.1.17"
5353
tokio-util = { version = "0.7.13", features = ["io"] }
5454
urlencoding = "2.1.3"
5555
xmltree = "0.11.0"
56+
futures = "0.3.31"
5657

5758
[dev-dependencies]
5859
async-std = { version = "1.13.0", features = ["attributes", "tokio1"] }

examples/common.rs

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use minio::s3::args::{BucketExistsArgs, MakeBucketArgs};
21
use minio::s3::creds::StaticProvider;
32
use minio::s3::http::BaseUrl;
3+
use minio::s3::response::BucketExistsResponse;
4+
use minio::s3::types::S3Api;
45
use minio::s3::{Client, ClientBuilder};
56

67
#[allow(dead_code)]
@@ -25,16 +26,11 @@ pub async fn create_bucket_if_not_exists(
2526
client: &Client,
2627
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
2728
// Check 'bucket_name' bucket exist or not.
28-
let exists: bool = client
29-
.bucket_exists(&BucketExistsArgs::new(bucket_name).unwrap())
30-
.await?;
29+
let resp: BucketExistsResponse = client.bucket_exists(bucket_name).send().await?;
3130

3231
// Make 'bucket_name' bucket if not exist.
33-
if !exists {
34-
client
35-
.make_bucket(&MakeBucketArgs::new(bucket_name).unwrap())
36-
.await
37-
.unwrap();
32+
if !resp.exists {
33+
client.make_bucket(bucket_name).send().await.unwrap();
3834
};
3935
Ok(())
4036
}

examples/put_object.rs

+7-17
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,12 @@
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
1515

16-
use std::path::PathBuf;
17-
1816
use clap::Parser;
1917
use log::info;
20-
use minio::s3::{
21-
args::{BucketExistsArgs, MakeBucketArgs},
22-
builders::ObjectContent,
23-
client::ClientBuilder,
24-
creds::StaticProvider,
25-
};
18+
use minio::s3::response::BucketExistsResponse;
19+
use minio::s3::types::S3Api;
20+
use minio::s3::{builders::ObjectContent, client::ClientBuilder, creds::StaticProvider};
21+
use std::path::PathBuf;
2622

2723
/// Upload a file to the given bucket and object path on the MinIO Play server.
2824
#[derive(Parser)]
@@ -49,16 +45,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
4945
.provider(Some(Box::new(static_provider)))
5046
.build()?;
5147

52-
let exists: bool = client
53-
.bucket_exists(&BucketExistsArgs::new(&args.bucket).unwrap())
54-
.await
55-
.unwrap();
48+
let resp: BucketExistsResponse = client.bucket_exists(&args.bucket).send().await.unwrap();
5649

57-
if !exists {
58-
client
59-
.make_bucket(&MakeBucketArgs::new(&args.bucket).unwrap())
60-
.await
61-
.unwrap();
50+
if !resp.exists {
51+
client.make_bucket(&args.bucket).send().await.unwrap();
6252
}
6353

6454
let content = ObjectContent::from(args.file.as_path());

0 commit comments

Comments
 (0)