Skip to content

Commit cfeb432

Browse files
committed
Refactor set_bucket_encryption and set_bucket_versioning
1 parent 7ce9ad3 commit cfeb432

17 files changed

+515
-205
lines changed

Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,33 @@ rustls-tls = ["reqwest/rustls-tls"]
2323

2424
[dependencies]
2525
async-recursion = "1.1.1"
26-
async-trait = "0.1.83"
26+
async-trait = "0.1.86"
2727
base64 = "0.22.1"
2828
byteorder = "1.5.0"
29-
bytes = "1.8.0"
29+
bytes = "1.9.0"
3030
chrono = "0.4.39"
3131
crc = "3.2.1"
3232
dashmap = "6.1.0"
3333
derivative = "2.2.0"
34-
env_logger = "0.11.5"
34+
env_logger = "0.11.6"
3535
futures-util = "0.3.31"
3636
hex = "0.4.3"
3737
hmac = "0.12.1"
3838
home = "0.5.9"
3939
http = "1.2.0"
40-
hyper = { version = "1.5.1", features = ["full"] }
40+
hyper = { version = "1.6.0", features = ["full"] }
4141
lazy_static = "1.5.0"
42-
log = "0.4.22"
42+
log = "0.4.25"
4343
md5 = "0.7.0"
4444
multimap = "0.10.0"
45-
os_info = "3.9.0"
45+
os_info = "3.9.2"
4646
percent-encoding = "2.3.1"
4747
rand = { version = "0.8.5", features = ["small_rng"] }
4848
regex = "1.11.1"
49-
serde = { version = "1.0.216", features = ["derive"] }
50-
serde_json = "1.0.133"
49+
serde = { version = "1.0.217", features = ["derive"] }
50+
serde_json = "1.0.138"
5151
sha2 = "0.10.8"
52-
tokio = { version = "1.42.0", features = ["full"] }
52+
tokio = { version = "1.43.0", features = ["full"] }
5353
tokio-stream = "0.1.17"
5454
tokio-util = { version = "0.7.13", features = ["io"] }
5555
urlencoding = "2.1.3"

examples/get_bucket_encryption.rs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
1515

16+
mod common;
17+
1618
use crate::common::{create_bucket_if_not_exists, create_client_on_play};
17-
use minio::s3::builders::GetBucketEncryption;
19+
use minio::s3::response::{GetBucketEncryptionResponse, SetBucketEncryptionResponse};
20+
use minio::s3::types::{S3Api, SseConfig};
1821
use minio::s3::Client;
1922

20-
mod common;
21-
2223
#[tokio::main]
2324
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
2425
env_logger::init(); // Note: set environment variable RUST_LOG="INFO" to log info and higher
@@ -27,9 +28,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
2728
let bucket_name: &str = "encryption-rust-bucket";
2829
create_bucket_if_not_exists(bucket_name, &client).await?;
2930

30-
let be: GetBucketEncryption = client.get_bucket_encryption(bucket_name);
31+
let resp: GetBucketEncryptionResponse =
32+
client.get_bucket_encryption(bucket_name).send().await?;
33+
log::info!("encryption before: config={:?}", resp.config,);
34+
35+
let _resp: SetBucketEncryptionResponse = client
36+
.set_bucket_encryption(bucket_name)
37+
.config(SseConfig::default())
38+
.send()
39+
.await?;
3140

32-
log::info!("{:?}", be);
41+
let resp: GetBucketEncryptionResponse =
42+
client.get_bucket_encryption(bucket_name).send().await?;
43+
log::info!("encryption after: config={:?}", resp.config,);
3344

3445
Ok(())
3546
}

examples/get_bucket_versioning.rs

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
mod common;
1717

1818
use crate::common::{create_bucket_if_not_exists, create_client_on_play};
19-
use minio::s3::builders::GetBucketVersioning;
19+
use minio::s3::response::{GetBucketVersioningResponse, SetBucketVersioningResponse};
20+
use minio::s3::types::S3Api;
2021
use minio::s3::Client;
2122

2223
#[tokio::main]
@@ -27,9 +28,29 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
2728
let bucket_name: &str = "versioning-rust-bucket";
2829
create_bucket_if_not_exists(bucket_name, &client).await?;
2930

30-
let bv: GetBucketVersioning = client.get_bucket_versioning(bucket_name);
31+
let resp: GetBucketVersioningResponse =
32+
client.get_bucket_versioning(bucket_name).send().await?;
33+
log::info!(
34+
"versioning before: status={:?}, mfa_delete={:?}",
35+
resp.status,
36+
resp.mfa_delete
37+
);
3138

32-
log::info!("{:?}", bv);
39+
let _resp: SetBucketVersioningResponse = client
40+
.set_bucket_versioning(bucket_name)
41+
.status(true)
42+
.mfa_delete(Some(true))
43+
.send()
44+
.await?;
45+
46+
let resp: GetBucketVersioningResponse =
47+
client.get_bucket_versioning(bucket_name).send().await?;
48+
49+
log::info!(
50+
"versioning after: status={:?}, mfa_delete={:?}",
51+
resp.status,
52+
resp.mfa_delete
53+
);
3354

3455
Ok(())
3556
}

src/s3/args.rs

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::s3::signer::post_presign_v4;
2020
use crate::s3::sse::{Sse, SseCustomerKey};
2121
use crate::s3::types::{
2222
Directive, LifecycleConfig, NotificationConfig, ObjectLockConfig, Part, ReplicationConfig,
23-
Retention, RetentionMode, SelectRequest, SseConfig,
23+
Retention, RetentionMode, SelectRequest,
2424
};
2525
use crate::s3::utils::{
2626
b64encode, check_bucket_name, merge, to_amz_date, to_http_header_value, to_iso8601utc,
@@ -1318,42 +1318,6 @@ impl<'a> ComposeObjectArgs<'a> {
13181318
/// Argument for [delete_bucket_encryption()](crate::s3::client::Client::delete_bucket_encryption) API
13191319
pub type DeleteBucketEncryptionArgs<'a> = BucketArgs<'a>;
13201320

1321-
#[derive(Clone, Debug)]
1322-
/// Argument for [set_bucket_encryption()](crate::s3::client::Client::set_bucket_encryption) API
1323-
pub struct SetBucketEncryptionArgs<'a> {
1324-
pub extra_headers: Option<&'a Multimap>,
1325-
pub extra_query_params: Option<&'a Multimap>,
1326-
pub region: Option<&'a str>,
1327-
pub bucket: &'a str,
1328-
pub config: &'a SseConfig,
1329-
}
1330-
1331-
impl<'a> SetBucketEncryptionArgs<'a> {
1332-
/// Returns argument for [set_bucket_encryption()](crate::s3::client::Client::set_bucket_encryption) API with given bucket name and configuration
1333-
///
1334-
/// # Examples
1335-
///
1336-
/// ```
1337-
/// use minio::s3::args::*;
1338-
/// use minio::s3::types::SseConfig;
1339-
/// let args = SetBucketEncryptionArgs::new("my-bucket", &SseConfig::s3()).unwrap();
1340-
/// ```
1341-
pub fn new(
1342-
bucket_name: &'a str,
1343-
config: &'a SseConfig,
1344-
) -> Result<SetBucketEncryptionArgs<'a>, Error> {
1345-
check_bucket_name(bucket_name, true)?;
1346-
1347-
Ok(SetBucketEncryptionArgs {
1348-
extra_headers: None,
1349-
extra_query_params: None,
1350-
region: None,
1351-
bucket: bucket_name,
1352-
config,
1353-
})
1354-
}
1355-
}
1356-
13571321
/// Argument for [enable_object_legal_hold()](crate::s3::client::Client::enable_object_legal_hold) API
13581322
pub type EnableObjectLegalHoldArgs<'a> = ObjectVersionArgs<'a>;
13591323

@@ -1659,39 +1623,6 @@ impl<'a> SetBucketTagsArgs<'a> {
16591623
}
16601624
}
16611625

1662-
/// Argument for [set_bucket_versioning()](crate::s3::client::Client::set_bucket_versioning) API
1663-
pub struct SetBucketVersioningArgs<'a> {
1664-
pub extra_headers: Option<&'a Multimap>,
1665-
pub extra_query_params: Option<&'a Multimap>,
1666-
pub region: Option<&'a str>,
1667-
pub bucket: &'a str,
1668-
pub status: bool,
1669-
pub mfa_delete: Option<bool>,
1670-
}
1671-
1672-
impl<'a> SetBucketVersioningArgs<'a> {
1673-
/// Returns argument for [set_bucket_versioning()](crate::s3::client::Client::set_bucket_versioning) API with given bucket name and status
1674-
///
1675-
/// # Examples
1676-
///
1677-
/// ```
1678-
/// use minio::s3::args::*;
1679-
/// let args = SetBucketVersioningArgs::new("my-bucket", true).unwrap();
1680-
/// ```
1681-
pub fn new(bucket_name: &'a str, status: bool) -> Result<SetBucketVersioningArgs<'a>, Error> {
1682-
check_bucket_name(bucket_name, true)?;
1683-
1684-
Ok(SetBucketVersioningArgs {
1685-
extra_headers: None,
1686-
extra_query_params: None,
1687-
region: None,
1688-
bucket: bucket_name,
1689-
status,
1690-
mfa_delete: None,
1691-
})
1692-
}
1693-
}
1694-
16951626
/// Argument for [delete_object_lock_config()](crate::s3::client::Client::delete_object_lock_config) API
16961627
pub type DeleteObjectLockConfigArgs<'a> = BucketArgs<'a>;
16971628

src/s3/builders.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ mod object_content;
2626
mod object_prompt;
2727
mod put_object;
2828
mod remove_objects;
29+
mod set_bucket_encryption;
30+
mod set_bucket_versioning;
2931

3032
pub use bucket_common::*;
3133
pub use get_bucket_encryption::*;
@@ -38,3 +40,5 @@ pub use object_content::*;
3840
pub use object_prompt::*;
3941
pub use put_object::*;
4042
pub use remove_objects::*;
43+
pub use set_bucket_encryption::*;
44+
pub use set_bucket_versioning::*;
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
// MinIO Rust Library for Amazon S3 Compatible Cloud Storage
2+
// Copyright 2025 MinIO, Inc.
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
16+
use crate::s3::builders::SegmentedBytes;
17+
use crate::s3::error::Error;
18+
use crate::s3::response::SetBucketEncryptionResponse;
19+
use crate::s3::types::{S3Api, S3Request, SseConfig, ToS3Request};
20+
use crate::s3::utils::{check_bucket_name, merge, Multimap};
21+
use crate::s3::Client;
22+
use bytes::Bytes;
23+
use http::Method;
24+
25+
/// Argument builder for [set_bucket_encryption()](Client::set_bucket_encryption) API
26+
#[derive(Clone, Debug, Default)]
27+
pub struct SetBucketEncryption {
28+
client: Option<Client>,
29+
30+
extra_headers: Option<Multimap>,
31+
extra_query_params: Option<Multimap>,
32+
region: Option<String>,
33+
bucket: String,
34+
35+
config: SseConfig,
36+
}
37+
38+
impl SetBucketEncryption {
39+
pub fn new(bucket: &str) -> Self {
40+
Self {
41+
bucket: bucket.to_owned(),
42+
..Default::default()
43+
}
44+
}
45+
46+
pub fn client(mut self, client: &Client) -> Self {
47+
self.client = Some(client.clone());
48+
self
49+
}
50+
51+
pub fn extra_headers(mut self, extra_headers: Option<Multimap>) -> Self {
52+
self.extra_headers = extra_headers;
53+
self
54+
}
55+
56+
pub fn extra_query_params(mut self, extra_query_params: Option<Multimap>) -> Self {
57+
self.extra_query_params = extra_query_params;
58+
self
59+
}
60+
61+
pub fn region(mut self, region: Option<String>) -> Self {
62+
self.region = region;
63+
self
64+
}
65+
66+
pub fn config(mut self, config: SseConfig) -> Self {
67+
self.config = config;
68+
self
69+
}
70+
}
71+
72+
impl S3Api for SetBucketEncryption {
73+
type S3Response = SetBucketEncryptionResponse;
74+
}
75+
76+
impl ToS3Request for SetBucketEncryption {
77+
fn to_s3request(&self) -> Result<S3Request, Error> {
78+
check_bucket_name(&self.bucket, true)?;
79+
let mut headers = Multimap::new();
80+
if let Some(v) = &self.extra_headers {
81+
merge(&mut headers, v);
82+
}
83+
84+
let mut query_params = Multimap::new();
85+
if let Some(v) = &self.extra_query_params {
86+
merge(&mut query_params, v);
87+
}
88+
query_params.insert(String::from("encryption"), String::new());
89+
90+
let bytes: Bytes = self.config.to_xml().into();
91+
let body: Option<SegmentedBytes> = Some(SegmentedBytes::from(bytes));
92+
93+
let req = S3Request::new(
94+
self.client.as_ref().ok_or(Error::NoClientProvided)?,
95+
Method::GET,
96+
)
97+
.region(self.region.as_deref())
98+
.bucket(Some(&self.bucket))
99+
.query_params(query_params)
100+
.headers(headers)
101+
.body(body);
102+
103+
Ok(req)
104+
}
105+
}

0 commit comments

Comments
 (0)