This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 2d004af653 chore(deps): update testcontainers to `0.25.2` and drop
ignore of `RUSTSEC-2025-0111` (#18305)
2d004af653 is described below
commit 2d004af653d9ba51c26713f17bbc4106ffe8c3b7
Author: Artem Medvedev <[email protected]>
AuthorDate: Mon Oct 27 21:24:19 2025 -0500
chore(deps): update testcontainers to `0.25.2` and drop ignore of
`RUSTSEC-2025-0111` (#18305)
## Which issue does this PR close?
Follow up to #18288
## Rationale for this change
Updates `testcontainers` in order to avoid `RUSTSEC-2025-0111` ignore
---
.github/workflows/audit.yml | 7 +-
Cargo.lock | 204 ++++++++++++++++++++++++++++++++++++--------
Cargo.toml | 4 +-
3 files changed, 171 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 3685bb2f9a..a77ca50197 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -46,9 +46,4 @@ jobs:
with:
tool: cargo-audit
- name: Run audit check
- # RUSTSEC-2025-0111: tokio-tar is by testcontainers for orchestration
- # of testing, so does not impact DataFusion's security
- # See https://github.com/apache/datafusion/issues/18288
- # NOTE: can remove this once testcontainers releases a version that
includes
- # https://github.com/testcontainers/testcontainers-rs/pull/852
- run: cargo audit --ignore RUSTSEC-2025-0111
+ run: cargo audit
diff --git a/Cargo.lock b/Cargo.lock
index c6e2855576..120dc29db2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -502,6 +502,22 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "astral-tokio-tar"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ec179a06c1769b1e42e1e2cbe74c7dcdb3d6383c838454d063eaac5bbb7ebbe5"
+dependencies = [
+ "filetime",
+ "futures-core",
+ "libc",
+ "portable-atomic",
+ "rustc-hash",
+ "tokio",
+ "tokio-stream",
+ "xattr",
+]
+
[[package]]
name = "async-compression"
version = "0.4.19"
@@ -539,6 +555,28 @@ dependencies = [
"syn 2.0.108",
]
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
[[package]]
name = "async-trait"
version = "0.1.89"
@@ -1077,13 +1115,17 @@ dependencies = [
[[package]]
name = "bollard"
-version = "0.18.1"
+version = "0.19.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "97ccca1260af6a459d75994ad5acc1651bcabcbdbc41467cc9786519ab854c30"
+checksum = "ec7646ee90964aa59e9f832a67182791396a19a5b1d76eb17599a8310a7e2e09"
dependencies = [
+ "async-stream",
"base64 0.22.1",
+ "bitflags 2.9.4",
+ "bollard-buildkit-proto",
"bollard-stubs",
"bytes",
+ "chrono",
"futures-core",
"futures-util",
"hex",
@@ -1096,7 +1138,9 @@ dependencies = [
"hyper-util",
"hyperlocal",
"log",
+ "num",
"pin-project-lite",
+ "rand 0.9.2",
"rustls",
"rustls-native-certs",
"rustls-pemfile",
@@ -1108,19 +1152,40 @@ dependencies = [
"serde_urlencoded",
"thiserror",
"tokio",
+ "tokio-stream",
"tokio-util",
+ "tonic",
"tower-service",
"url",
"winapi",
]
+[[package]]
+name = "bollard-buildkit-proto"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "85a885520bf6249ab931a764ffdb87b0ceef48e6e7d807cfdb21b751e086e1ad"
+dependencies = [
+ "prost",
+ "prost-types",
+ "tonic",
+ "tonic-prost",
+ "ureq",
+]
+
[[package]]
name = "bollard-stubs"
-version = "1.47.1-rc.27.3.1"
+version = "1.49.1-rc.28.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3f179cfbddb6e77a5472703d4b30436bff32929c0aa8a9008ecf23d1d3cdd0da"
+checksum = "5731fe885755e92beff1950774068e0cae67ea6ec7587381536fca84f1779623"
dependencies = [
+ "base64 0.22.1",
+ "bollard-buildkit-proto",
+ "bytes",
+ "chrono",
+ "prost",
"serde",
+ "serde_json",
"serde_repr",
"serde_with",
]
@@ -3977,7 +4042,7 @@ checksum =
"416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
dependencies = [
"bitflags 2.9.4",
"libc",
- "redox_syscall 0.5.17",
+ "redox_syscall",
]
[[package]]
@@ -4193,6 +4258,20 @@ dependencies = [
"windows-sys 0.52.0",
]
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
[[package]]
name = "num-bigint"
version = "0.4.6"
@@ -4228,6 +4307,28 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
[[package]]
name = "num-traits"
version = "0.2.19"
@@ -4363,7 +4464,7 @@ checksum =
"bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.17",
+ "redox_syscall",
"smallvec",
"windows-targets 0.52.6",
]
@@ -5111,15 +5212,6 @@ dependencies = [
"syn 2.0.108",
]
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
[[package]]
name = "redox_syscall"
version = "0.5.17"
@@ -5407,6 +5499,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
dependencies = [
"aws-lc-rs",
+ "log",
"once_cell",
"ring",
"rustls-pki-types",
@@ -6172,13 +6265,13 @@ dependencies = [
[[package]]
name = "testcontainers"
-version = "0.24.0"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "23bb7577dca13ad86a78e8271ef5d322f37229ec83b8d98da6d996c588a1ddb1"
+checksum = "3f3ac71069f20ecfa60c396316c283fbf35e6833a53dff551a31b5458da05edc"
dependencies = [
+ "astral-tokio-tar",
"async-trait",
"bollard",
- "bollard-stubs",
"bytes",
"docker_credential",
"either",
@@ -6194,16 +6287,16 @@ dependencies = [
"thiserror",
"tokio",
"tokio-stream",
- "tokio-tar",
"tokio-util",
+ "ulid",
"url",
]
[[package]]
name = "testcontainers-modules"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "eac95cde96549fc19c6bf19ef34cc42bd56e264c1cb97e700e21555be0ecf9e2"
+checksum = "1966329d5bb3f89d33602d2db2da971fb839f9297dad16527abf4564e2ae0a6d"
dependencies = [
"testcontainers",
]
@@ -6407,21 +6500,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "tokio-tar"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75"
-dependencies = [
- "filetime",
- "futures-core",
- "libc",
- "redox_syscall 0.3.5",
- "tokio",
- "tokio-stream",
- "xattr",
-]
-
[[package]]
name = "tokio-util"
version = "0.7.16"
@@ -6703,6 +6781,16 @@ dependencies = [
"typify-impl",
]
+[[package]]
+name = "ulid"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "470dbf6591da1b39d43c14523b2b469c86879a53e8b758c8e090a470fe7b1fbe"
+dependencies = [
+ "rand 0.9.2",
+ "web-time",
+]
+
[[package]]
name = "unicode-bidi"
version = "0.3.18"
@@ -6772,6 +6860,35 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+[[package]]
+name = "ureq"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "99ba1025f18a4a3fc3e9b48c868e9beb4f24f4b4b1a325bada26bd4119f46537"
+dependencies = [
+ "base64 0.22.1",
+ "log",
+ "percent-encoding",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "ureq-proto",
+ "utf-8",
+ "webpki-roots",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "60b4531c118335662134346048ddb0e54cc86bd7e81866757873055f0e38f5d2"
+dependencies = [
+ "base64 0.22.1",
+ "http 1.3.1",
+ "httparse",
+ "log",
+]
+
[[package]]
name = "url"
version = "2.5.7"
@@ -6790,6 +6907,12 @@ version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
[[package]]
name = "utf8_iter"
version = "1.0.4"
@@ -7001,6 +7124,15 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "webpki-roots"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8"
+dependencies = [
+ "rustls-pki-types",
+]
+
[[package]]
name = "whoami"
version = "1.6.1"
diff --git a/Cargo.toml b/Cargo.toml
index e48afb19ff..bf0f3fa051 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -178,8 +178,8 @@ rstest = "0.25.0"
serde_json = "1"
sqlparser = { version = "0.59.0", default-features = false, features = ["std",
"visitor"] }
tempfile = "3"
-testcontainers = { version = "0.24", features = ["default"] }
-testcontainers-modules = { version = "0.12" }
+testcontainers = { version = "0.25.2", features = ["default"] }
+testcontainers-modules = { version = "0.13" }
tokio = { version = "1.48", features = ["macros", "rt", "sync"] }
url = "2.5.7"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
