7 Commits

Author SHA1 Message Date
0c73e3af05 Merge pull request 'Update Rust crate tokio to 1.46.1' (#217) from renovate/tokio-1.x into master
All checks were successful
continuous-integration/drone/push Build is passing
2025-07-05 00:45:59 +00:00
56823c0338 Update Rust crate tokio to 1.46.1
Some checks failed
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is failing
2025-07-05 00:09:18 +00:00
297aa8b658 Update Rust crate tokio to 1.46.0
All checks were successful
continuous-integration/drone/push Build is passing
2025-07-04 00:50:01 +00:00
cf3e9349e0 Update Rust crate reqwest to 0.12.22
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2025-07-04 00:09:10 +00:00
7c69feb25e Fix bad identation in Drone configuration
All checks were successful
continuous-integration/drone/push Build is passing
2025-07-03 08:09:13 +02:00
3d7db5a1be Attempt to fix drone configuration
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2025-07-03 08:07:51 +02:00
76e7bc8c46 Fix cargo clippy issues
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2025-07-03 08:05:56 +02:00
4 changed files with 54 additions and 15 deletions

View File

@ -4,17 +4,39 @@ type: docker
name: default
steps:
- name: cargo_check
- name: fetch_dependencies
image: rust
volumes:
- name: rust_registry
path: /usr/local/cargo/registry
commands:
- cargo fetch
- name: code_quality
image: rust
volumes:
- name: rust_registry
path: /usr/local/cargo/registry
depends_on:
- fetch_dependencies
commands:
- rustup component add clippy
- cargo clippy -- -D warnings
- name: test
image: rust
depends_on:
- code_quality
volumes:
- name: rust_registry
path: /usr/local/cargo/registry
commands:
- wget -O /usr/bin/minio https://dl.min.io/server/minio/release/linux-amd64/minio
- wget -O /usr/bin/mc https://dl.min.io/client/mc/release/linux-amd64/mc
- chmod +x /usr/bin/minio /usr/bin/mc
- rustup component add clippy
- cargo clippy -- -D warnings
- cargo test
- name: doc
- name: build_doc
image: python
environment:
AWS_ACCESS_KEY_ID:
@ -39,3 +61,7 @@ steps:
- aws configure set default.s3.signature_version s3v4
# Upload to bucket
- cd public && aws --endpoint-url https://s3.communiquons.org s3 sync . s3://miniok8sbucketsoperator-website
volumes:
- name: rust_registry
temp: {}

21
Cargo.lock generated
View File

@ -1024,6 +1024,17 @@ dependencies = [
"hashbrown",
]
[[package]]
name = "io-uring"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
dependencies = [
"bitflags",
"cfg-if",
"libc",
]
[[package]]
name = "ipnet"
version = "2.11.0"
@ -1692,9 +1703,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
version = "0.12.20"
version = "0.12.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
dependencies = [
"base64",
"bytes",
@ -2203,17 +2214,19 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.45.1"
version = "1.46.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
dependencies = [
"backtrace",
"bytes",
"io-uring",
"libc",
"mio",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"slab",
"socket2",
"tokio-macros",
"windows-sys 0.52.0",

View File

@ -11,12 +11,12 @@ env_logger = "0.11.8"
anyhow = "1.0.98"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
schemars = "1.0.1"
tokio = { version = "1.45.1", features = ["full"] }
schemars = "0.8.22"
tokio = { version = "1.46.1", features = ["full"] }
kube = { version = "1.1.0", features = ["runtime", "derive"] }
k8s-openapi = { version = "0.25.0", features = ["v1_31"] }
futures = "0.3.31"
thiserror = "2.0.12"
rand = "0.9.1"
mktemp = "0.5.1"
reqwest = "0.12.20"
reqwest = "0.12.22"

View File

@ -164,7 +164,7 @@ impl MinioService {
/// Get bucket name prefixed by mc alias name
fn absolute_bucket_name(&self, name: &str) -> String {
format!("{}/{name}", MC_ALIAS_NAME)
format!("{MC_ALIAS_NAME}/{name}")
}
/// Execute a minio mc command
@ -172,7 +172,7 @@ impl MinioService {
where
A: DeserializeOwned,
{
log::debug!("exec_mc_cmd with args {:?}", args);
log::debug!("exec_mc_cmd with args {args:?}");
let conf_dir = temp::create_temp_dir()?;
let global_flags = ["--config-dir", conf_dir.to_str().unwrap(), "--json"];
@ -354,7 +354,7 @@ impl MinioService {
let bucket_name = self.absolute_bucket_name(bucket);
let res = if let Some(quota) = &quota {
let quota = format!("{}B", quota);
let quota = format!("{quota}B");
self.exec_mc_cmd::<BasicMinioResult>(&[
"quota",
"set",
@ -447,7 +447,7 @@ impl MinioService {
"governance" => RetentionType::Governance,
"compliance" => RetentionType::Compliance,
o => {
log::error!("Unknown retention type: {}", o);
log::error!("Unknown retention type: {o}");
return Ok(None);
}
},