chore: migrate to object_store

Move to the more modern and maintained object_store
library to access generic buckets.

We should be able also to do streaming of files now,
and proceed by implementing paginated results for listings
if we want.

Fixes #1.

Cargo.lock

@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.20"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -73,22 +73,22 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -97,17 +97,6 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.6"
@@ -127,7 +116,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -138,7 +127,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -290,9 +279,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.2"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 
 [[package]]
 name = "byteorder"
@@ -308,9 +297,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.32"
+version = "1.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
+checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
 dependencies = [
  "shlex",
 ]
@@ -335,10 +324,8 @@ checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
- "js-sys",
  "num-traits",
  "serde",
- "wasm-bindgen",
  "windows-link",
 ]
 
@@ -416,21 +403,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crc"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -495,7 +467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -519,7 +491,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -530,21 +502,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.104",
+ "syn",
-]
-
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
 ]
 
 [[package]]
@@ -555,7 +513,7 @@ checksum = "6178a82cf56c836a3ba61a7935cdb1c49bfaa6fa4327cd5bf554a503087de26b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -568,17 +526,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.20"
@@ -587,7 +534,7 @@ checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -626,7 +573,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -637,7 +584,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -648,7 +594,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -711,7 +657,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
- "regex",
 ]
 
 [[package]]
@@ -723,7 +668,6 @@ dependencies = [
  "anstream",
  "anstyle",
  "env_filter",
- "jiff",
  "log",
 ]
 
@@ -891,7 +835,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -1055,9 +999,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.12"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1080,15 +1024,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 
 [[package]]
 name = "hermit-abi"
@@ -1102,15 +1040,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
 [[package]]
 name = "home"
 version = "0.5.11"
@@ -1254,7 +1183,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.12",
+ "h2 0.4.11",
  "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
@@ -1526,7 +1455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
  "serde",
 ]
 
@@ -1615,30 +1544,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
-[[package]]
-name = "jiff"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.77"
@@ -1775,7 +1680,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -1797,12 +1702,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
 [[package]]
 name = "memchr"
 version = "2.7.5"
@@ -1815,46 +1714,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "minio"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3824101357fa899d01c729e4a245776e20a03f2f6645979e86b9d3d5d9c42741"
-dependencies = [
- "async-recursion",
- "async-trait",
- "base64 0.22.1",
- "byteorder",
- "bytes",
- "chrono",
- "crc",
- "dashmap",
- "derivative",
- "env_logger",
- "futures",
- "futures-util",
- "hex",
- "hmac",
- "http 1.3.1",
- "hyper 1.6.0",
- "lazy_static",
- "log",
- "md5",
- "multimap",
- "percent-encoding",
- "rand 0.8.5",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "urlencoding",
- "xmltree",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1906,15 +1765,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "multimap"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.14"
@@ -2081,7 +1931,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2153,7 +2003,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.8.5",
  "structmeta",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2185,7 +2035,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2225,7 +2075,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2278,7 +2128,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2308,21 +2158,6 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
-[[package]]
-name = "portable-atomic"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
 [[package]]
 name = "potential_utf"
 version = "0.1.2"
@@ -2379,16 +2214,16 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "version_check",
  "yansi",
 ]
 
 [[package]]
 name = "quick-xml"
-version = "0.38.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9845d9dccf565065824e69f9f235fafba1587031eda353c1f1561cd6a6be78f4"
+checksum = "8927b0664f5c5a98265138b7e3f90aa19a6b21353182469ace36d4ac527b7b1b"
 dependencies = [
  "memchr",
  "serde",
@@ -2558,7 +2393,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2622,7 +2457,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.12",
+ "h2 0.4.11",
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
@@ -2721,7 +2556,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rocket_http",
- "syn 2.0.104",
+ "syn",
  "unicode-xid",
  "version_check",
 ]
@@ -2791,7 +2626,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.104",
+ "syn",
  "unicode-ident",
 ]
 
@@ -2852,7 +2687,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.3.0",
+ "security-framework 3.2.0",
 ]
 
 [[package]]
@@ -2887,9 +2722,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "ryu"
@@ -2981,9 +2816,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "3.3.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
  "bitflags 2.9.1",
  "core-foundation 0.10.1",
@@ -3044,7 +2879,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3067,7 +2902,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3120,7 +2955,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3135,7 +2970,6 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "minio",
  "object_store",
  "regex",
  "reqwest",
@@ -3188,9 +3022,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.6"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -3203,9 +3037,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.11"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "slug"
@@ -3313,7 +3147,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3324,7 +3158,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3333,17 +3167,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.104"
@@ -3372,7 +3195,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3461,7 +3284,7 @@ checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3519,7 +3342,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3598,7 +3421,6 @@ dependencies = [
  "io-uring",
  "libc",
  "mio 1.0.4",
- "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "slab",
@@ -3615,7 +3437,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3782,7 +3604,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3947,12 +3769,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -4045,7 +3861,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -4080,7 +3896,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4188,7 +4004,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4199,7 +4015,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4493,21 +4309,6 @@ dependencies = [
  "rustix",
 ]
 
-[[package]]
-name = "xml-rs"
-version = "0.8.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7"
-
-[[package]]
-name = "xmltree"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b619f8c85654798007fb10afa5125590b43b088c225a25fc2fec100a9fad0fc6"
-dependencies = [
- "xml-rs",
-]
-
 [[package]]
 name = "yansi"
 version = "1.0.1"
@@ -4537,7 +4338,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "synstructure",
 ]
 
@@ -4558,7 +4359,7 @@ checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4578,7 +4379,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "synstructure",
 ]
 
@@ -4601,9 +4402,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.4"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -4618,5 +4419,5 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]

Cargo.toml

@@ -36,7 +36,6 @@ tempfile = "3.20"
 delegate = "0.13"
 futures = "0.3"
 libc = "0.2"
-minio = "0.3"
 regex = "1.11"
 reqwest = "0.12"
 rstest = "0.26"
@@ -44,4 +43,4 @@ scraper = "0.23"
 test-log = "0.2"
 testcontainers = "0.24"
 testcontainers-modules = { version = "0.12", features = ["minio"] }
-tokio = { version = "1", features = ["process", "rt-multi-thread"] }
+tokio = { version = "1", features = ["process"] }

README.md

@@ -111,8 +111,7 @@ serves3
 
 ## 1.2.0
 
-* Migrate to [object_store](https://crates.io/crates/object_store). This should
+* Migrate to [object_store](https://crates.io/crates/object_store)
-  allow streaming of bigger files.
 * Bump dependencies
 
 ## 1.1.2

deny.toml

@@ -77,7 +77,6 @@ ignore = [
     #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
     #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish
     #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" },
-    { id = "RUSTSEC-2024-0388", reason = "derivative is used indirectly through minio, which is used only for testing" },
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.

src/main.rs

@@ -9,7 +9,7 @@ use {
     bytes::Bytes,
     futures::{StreamExt, stream::BoxStream},
     lazy_static::lazy_static,
-    object_store::path::Path as ObjectStorePath,
+    object_store::path::Path,
     rocket::{
         Request, State,
         fairing::AdHoc,
@@ -17,8 +17,8 @@ use {
             Profile,
             providers::{Env, Format as _, Toml},
         },
-        http::ContentType,
+        http::uri::Origin,
-        response::{self, Responder, stream::ByteStream},
+        response::{self, Redirect, Responder, stream::ByteStream},
         serde::Serialize,
     },
     rocket_dyn_templates::{Template, context},
@@ -29,16 +29,15 @@ use {
 enum FileView {
     Folder(Template),
     File(ByteStream<BoxStream<'static, Bytes>>),
+    Redirect(Redirect),
 }
 
 impl<'r> Responder<'r, 'r> for FileView {
     fn respond_to(self, req: &'r Request<'_>) -> response::Result<'r> {
         match self {
-            Self::Folder(template) => template.respond_to(req).map(|mut r| {
+            Self::Folder(template) => template.respond_to(req),
-                r.set_header(ContentType::HTML);
-                r
-            }),
             Self::File(stream) => stream.respond_to(req),
+            Self::Redirect(redirect) => redirect.respond_to(req),
         }
     }
 }
@@ -56,33 +55,20 @@ enum Error {
     #[response(status = 404)]
     NotFound(String),
 
-    #[response(status = 400)]
-    InvalidRequest(String),
-
     #[response(status = 500)]
     UnknownError(String),
 }
 
-#[rocket::get("/")]
-async fn index_root(state: &State<Settings>) -> Result<FileView, Error> {
-    index(None, state).await
-}
-
 #[rocket::get("/<path..>")]
-async fn index(path: Option<PathBuf>, state: &State<Settings>) -> Result<FileView, Error> {
+async fn index(
-    let object_path = if let Some(url_path) = path.as_ref() {
+    path: PathBuf,
-        let s = url_path.to_str().ok_or(Error::InvalidRequest(
+    uri: &Origin<'_>,
-            "Path cannot be converted to UTF-8".into(),
+    state: &State<Settings>,
-        ))?;
+) -> Result<FileView, Error> {
-
-        Some(ObjectStorePath::from(s))
-    } else {
-        None
-    };
-
     /*
        The way things work in S3, the following holds for us:
        - we need to use a slash as separator
+       - folders need to be queried ending with a slash
        - getting the bucket address (empty prefix) will
          return an XML file with all properties; we don't
          want that.
@@ -90,51 +76,54 @@ async fn index(path: Option<PathBuf>, state: &State<Settings>) -> Result<FileVie
        We try first to retrieve list an object as a file. If we fail,
        we fallback to retrieving the equivalent folder.
     */
-
+    if let Ok(result) = s3_serve_file(path.clone(), &state).await {
-    if let Some(path) = &object_path
+        Ok(result)
-        && object_exists(path, &state).await?
-    {
-        serve_object(&path, &state).await
     } else {
-        let objects = file_view(object_path, &state).await?;
+        // We need to redirect to a path ending with a slash as
+        // per comment above if we know this is not a file.
+        let mut uri = uri.to_string();
+        if !uri.ends_with('/') {
+            uri.push('/');
+            return Ok(FileView::Redirect(Redirect::permanent(uri)));
+        }
 
+        let objects = s3_fileview(&path, &state).await?;
         let rendered = Template::render(
             "index",
             context! {
-                path: format!("{}/", path.unwrap_or("".into()).display()),
+                path: format!("{}/", path.display()),
                 objects
             },
         );
-
         Ok(FileView::Folder(rendered))
     }
 }
 
-async fn object_exists(s3_path: &ObjectStorePath, settings: &Settings) -> Result<bool, Error> {
+async fn s3_serve_file(path: PathBuf, settings: &Settings) -> Result<FileView, Error> {
-    match settings.s3_bucket.head(s3_path).await {
+    let is_root_prefix = path.as_os_str().is_empty();
-        Ok(_metadata) => Ok(true),
+    if is_root_prefix {
-        Err(object_store::Error::NotFound { path: _, source: _ }) => Ok(false),
+        return Err(Error::UnknownError("root prefix is not a file".into()));
-        Err(e) => Err(Error::UnknownError(e.to_string())),
-    }
     }
 
-async fn serve_object(s3_path: &ObjectStorePath, settings: &Settings) -> Result<FileView, Error> {
+    let s3_path = object_store::path::Path::from(path.to_str().unwrap());
+
     let object_stream = settings
         .s3_bucket
         .get(&s3_path)
         .await
         .map_err(|e| match e {
-            object_store::Error::NotFound { path: _, source: _ } => Error::NotFound(e.to_string()),
+            object_store::Error::NotFound { path: _, source: _ } => {
+                Error::UnknownError(e.to_string())
+            }
             _ => Error::UnknownError(e.to_string()),
         })?
         .into_stream();
 
-    let s3_path = s3_path.clone();
     let stream = object_stream
         .map(move |chunk| match chunk {
             Ok(bytes) => bytes,
             Err(err) => {
-                log::error!("connection error while reading {}: {}", s3_path, err);
+                log::error!("connection error while reading {}: {}", path.display(), err);
                 Bytes::new() // Forces end of stream
             }
         })
@@ -147,26 +136,19 @@ async fn serve_object(s3_path: &ObjectStorePath, settings: &Settings) -> Result<
     Ok(FileView::File(ByteStream::from(stream)))
 }
 
-async fn file_view(
+async fn s3_fileview(path: &PathBuf, settings: &Settings) -> Result<Vec<FileViewItem>, Error> {
-    s3_folder_path: Option<ObjectStorePath>,
-    settings: &Settings,
-) -> Result<Vec<FileViewItem>, Error> {
     /*
         if listing a folder:
         - folders will be under 'common_prefixes'
         - files will be under the 'contents' property
     */
 
+    let s3_folder_path = path.to_str().map(|p| Path::from(p));
     let s3_objects = settings
         .s3_bucket
         .list_with_delimiter(s3_folder_path.as_ref())
         .await
-        .map_err(|err| match err {
+        .map_err(|_| Error::NotFound("object not found".into()))?;
-            object_store::Error::NotFound { path: _, source: _ } => {
-                Error::NotFound("object not found".into())
-            }
-            err => Error::UnknownError(err.to_string()),
-        })?;
 
     let folders = s3_objects.common_prefixes.into_iter().map(|dir| {
         let dirname = dir.parts().last().unwrap();
@@ -203,7 +185,7 @@ fn rocket() -> _ {
         .select(Profile::from_env_or("SERVES3_PROFILE", "default"));
 
     rocket::custom(config_figment)
-        .mount("/", rocket::routes![index_root, index])
+        .mount("/", rocket::routes![index])
         .attach(AdHoc::config::<Settings>())
         .attach(Template::custom(|engines| {
             engines

src/settings.rs

@@ -47,7 +47,6 @@ impl TryInto<Box<dyn ObjectStore>> for S3Config {
             .with_access_key_id(self.access_key_id)
             .with_secret_access_key(self.secret_access_key)
             .with_virtual_hosted_style_request(!self.path_style)
-            .with_allow_http(true)
             .build()?;
 
         log::info!(

templates/index.html.tera

@@ -5,7 +5,6 @@
 -->
 <html>
     <head>
-    <link rel="icon" href="data:image/png;base64,iVBORw0KGgo=">
     <style>
         body {
             font-family: monospace;

tests/common/minio.rs

@@ -11,7 +11,7 @@ use {
     testcontainers_modules::minio,
 };
 
-const MINIO_IMAGE_TAG: &'static str = "RELEASE.2025-07-23T15-54-02Z";
+const MINIO_IMAGE_TAG: &'static str = "RELEASE.2025-06-13T11-33-47Z";
 
 pub struct MinIO {
     inner: minio::MinIO,

tests/common/mod.rs

@@ -4,11 +4,8 @@
 mod minio;
 
 use {
-    ::minio::s3::{
-        client::Client as MinIOClient, creds::StaticProvider, http::BaseUrl, types::S3Api,
-    },
     anyhow::{Result, anyhow},
-    object_store::{ObjectStore, aws::AmazonS3Builder},
+    object_store::ObjectStore,
     reqwest::Url,
     std::{ptr::null_mut, str::FromStr},
     testcontainers::{ContainerAsync, runners::AsyncRunner},
@@ -45,22 +42,24 @@ impl Test {
             port = container.get_host_port_ipv4(9000).await?
         );
 
-        // We need to create the bucket
+        let credentials = s3::creds::Credentials::new(
-        let minio_client = MinIOClient::new(
+            Some(&ACCESS_KEY),
-            BaseUrl::from_str(&endpoint).unwrap(),
+            Some(&SECRET_KEY),
-            Some(Box::new(StaticProvider::new(ACCESS_KEY, SECRET_KEY, None))),
             None,
             None,
+            Some("test"),
         )?;
-        minio_client.create_bucket(BUCKET_NAME).send().await?;
+        let bucket = s3::Bucket::create_with_path_style(
-
+            &BUCKET_NAME,
-        let bucket = AmazonS3Builder::new()
+            s3::Region::Custom {
-            .with_endpoint(&endpoint)
+                region: REGION.into(),
-            .with_access_key_id(ACCESS_KEY)
+                endpoint: endpoint.clone(),
-            .with_secret_access_key(SECRET_KEY)
+            },
-            .with_bucket_name(BUCKET_NAME)
+            credentials,
-            .with_allow_http(true)
+            s3::BucketConfiguration::private(),
-            .build()?;
+        )
+        .await?
+        .bucket;
 
         let bin = std::env!("CARGO_BIN_EXE_serves3");
         let mut child = tokio::process::Command::new(bin)
@@ -106,7 +105,7 @@ impl Test {
 
         Ok(Self {
             base_url,
-            bucket: Box::new(bucket),
+            bucket,
             serves3: child,
             _minio: container,
         })

tests/integration.rs

@@ -3,27 +3,17 @@
 
 mod common;
 
-use {
+use scraper::{Html, Selector};
-    object_store::{PutPayload, path::Path as ObjectStorePath},
-    scraper::{Html, Selector},
-};
 
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[test_log::test(tokio::test)]
 async fn serves_files() -> anyhow::Result<()> {
     let test = common::Test::new().await?;
 
     test.bucket
-        .put(
+        .put_object("file.txt", "I am a file".as_bytes())
-            &ObjectStorePath::from("file.txt"),
-            PutPayload::from_static("I am a file".as_bytes()),
-        )
         .await?;
-
     test.bucket
-        .put(
+        .put_object("folder/file.txt", "I am a file in a folder".as_bytes())
-            &ObjectStorePath::from("folder/file.txt"),
-            PutPayload::from_static("I am a file in a folder".as_bytes()),
-        )
         .await?;
 
     let resp = reqwest::get(test.base_url.join("file.txt")?).await?;
@@ -35,21 +25,15 @@ async fn serves_files() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[test_log::test(tokio::test)]
 async fn serves_top_level_folder() -> anyhow::Result<()> {
     let test = common::Test::new().await?;
 
     test.bucket
-        .put(
+        .put_object("file.txt", "I am a file".as_bytes())
-            &ObjectStorePath::from("file.txt"),
-            PutPayload::from_static("I am a file".as_bytes()),
-        )
         .await?;
     test.bucket
-        .put(
+        .put_object("folder/file.txt", "I am a file in a folder".as_bytes())
-            &ObjectStorePath::from("folder/file.txt"),
-            PutPayload::from_static("I am a file in a folder".as_bytes()),
-        )
         .await?;
 
     // Check that a file in the toplevel is listed:
@@ -59,7 +43,6 @@ async fn serves_top_level_folder() -> anyhow::Result<()> {
         "Request failed with {}",
         resp.status()
     );
-
     let text = resp.text().await?;
     println!("{}", &text);
     let document = Html::parse_document(&text);
@@ -72,8 +55,8 @@ async fn serves_top_level_folder() -> anyhow::Result<()> {
     let selector =
         Selector::parse(r#"table > tbody > tr:nth-child(1) > td:first-child > a"#).unwrap();
     for item in document.select(&selector) {
-        assert_eq!(item.attr("href"), Some("folder"));
+        assert_eq!(item.attr("href"), Some("folder/"));
-        assert_eq!(item.text().next(), Some("folder"));
+        assert_eq!(item.text().next(), Some("folder/"));
     }
 
     let selector =
@@ -86,22 +69,15 @@ async fn serves_top_level_folder() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[test_log::test(tokio::test)]
 async fn serves_second_level_folder() -> anyhow::Result<()> {
     let test = common::Test::new().await?;
 
     test.bucket
-        .put(
+        .put_object("file.txt", "I am a file".as_bytes())
-            &ObjectStorePath::from("file.txt"),
-            PutPayload::from_static("I am a file".as_bytes()),
-        )
         .await?;
-
     test.bucket
-        .put(
+        .put_object("folder/file.txt", "I am a file in a folder".as_bytes())
-            &ObjectStorePath::from("folder/file.txt"),
-            PutPayload::from_static("I am a file in a folder".as_bytes()),
-        )
         .await?;
 
     // Check that a file in the second level is listed:
@@ -137,21 +113,15 @@ async fn serves_second_level_folder() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[test_log::test(tokio::test)]
 async fn serves_second_level_folder_without_ending_slash() -> anyhow::Result<()> {
     let test = common::Test::new().await?;
 
     test.bucket
-        .put(
+        .put_object("file.txt", "I am a file".as_bytes())
-            &ObjectStorePath::from("file.txt"),
-            PutPayload::from_static("I am a file".as_bytes()),
-        )
         .await?;
     test.bucket
-        .put(
+        .put_object("folder/file.txt", "I am a file in a folder".as_bytes())
-            &ObjectStorePath::from("folder/file.txt"),
-            PutPayload::from_static("I am a file in a folder".as_bytes()),
-        )
         .await?;
 
     // Check that a file in the second level is listed even without an ending slash: