Skip to content

Commit 5c19f7c

Browse files
committed
feat!: update testcontainers to 0.26
1 parent 9d24b07 commit 5c19f7c

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ rustdoc-args = ["--cfg", "docsrs"]
1717
default = []
1818
azurite = []
1919
blocking = ["testcontainers/blocking"]
20-
watchdog = ["testcontainers/watchdog"]
20+
docker-compose = ["testcontainers/docker-compose"]
2121
http_wait = ["testcontainers/http_wait"]
2222
properties-config = ["testcontainers/properties-config"]
23+
watchdog = ["testcontainers/watchdog"]
2324
json = ["serde", "serde_json"]
2425
anvil = []
2526
arrow_flightsql = []
@@ -71,13 +72,13 @@ weaviate = ["http_wait"]
7172
[dependencies]
7273
parse-display = { version = "0.10", optional = true, default-features = false, features = [
7374
] }
74-
rcgen = { version = "0.13.1", features = [
75+
rcgen = { version = "0.14.5", features = [
7576
"pem",
7677
"ring",
7778
], default-features = false, optional = true }
7879
serde = { version = "1.0.217", features = ["derive"], optional = true }
7980
serde_json = { version = "1.0.138", optional = true }
80-
testcontainers = { version = "0.25.0" }
81+
testcontainers = { version = "0.26.0" }
8182

8283

8384
[dev-dependencies]
@@ -117,7 +118,7 @@ serde_json = { version = "1.0.138" }
117118
serial_test = "3.1.1"
118119
surrealdb = { version = "2.2.1" }
119120
tar = "0.4.40"
120-
testcontainers = { version = "0.25.0", features = ["blocking"] }
121+
testcontainers = { version = "0.26.0", features = ["blocking"] }
121122
# To use Tiberius on macOS, rustls is needed instead of native-tls
122123
# https://github.com/prisma/tiberius/tree/v0.12.2#encryption-tlsssl
123124
tiberius = { version = "0.12.3", default-features = false, features = [
@@ -127,15 +128,15 @@ tiberius = { version = "0.12.3", default-features = false, features = [
127128
tokio = { version = "1", features = ["macros"] }
128129
tokio-util = { version = "0.7.10", features = ["compat"] }
129130
tokio-zookeeper = "0.4.0"
130-
kube = { version = "1.1.0", features = ["runtime"] }
131-
k8s-openapi = { version = "0.25", features = ["v1_30"] }
132-
clickhouse = { version = "0.13" }
131+
kube = { version = "2.0.1", features = ["runtime"] }
132+
k8s-openapi = { version = "0.26", features = ["v1_30"] }
133+
clickhouse = { version = "0.14" }
133134
vaultrs = "0.7.2"
134135
openssl-sys = { version = "0.9.103", features = ["vendored"] }
135136
native-tls = { version = "0.2.12", features = ["vendored"] }
136137
pulsar = "6.3"
137138
rqlite-rs = "0.6"
138-
azure_core = "0.27.0"
139+
azure_core = "0.30.1"
139140
azure_storage_blobs = "0.21.0"
140141
azure_storage = "0.21.0"
141142
base64 = "0.22.1"

examples/localstack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
2020
let creds = s3::config::Credentials::new("fake", "fake", None, None, "test");
2121

2222
let config = aws_sdk_s3::config::Builder::default()
23-
.behavior_version(BehaviorVersion::v2025_01_17())
23+
.behavior_version(BehaviorVersion::v2025_08_07())
2424
.region(Region::new("us-east-1"))
2525
.credentials_provider(creds)
2626
.endpoint_url(endpoint_url)

src/gitea/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// Self-hosted git server with https/http/ssh access, uses [Gitea](https://docs.gitea.com/).
22
use std::result::Result;
33

4-
use rcgen::{BasicConstraints, CertificateParams, IsCa, KeyPair};
4+
use rcgen::{BasicConstraints, CertificateParams, IsCa, Issuer, KeyPair};
55
use testcontainers::{
66
core::{
77
wait::HttpWaitStrategy, CmdWaitFor, ContainerPort, ContainerState, ExecCommand, WaitFor,
@@ -631,7 +631,6 @@ impl GiteaTlsCert {
631631
let ca_key = KeyPair::generate().unwrap();
632632
let mut ca_cert = CertificateParams::new(vec!["Gitea root CA".to_string()]).unwrap();
633633
ca_cert.is_ca = IsCa::Ca(BasicConstraints::Unconstrained);
634-
let ca_cert = ca_cert.self_signed(&ca_key).unwrap();
635634

636635
// prepare SANs
637636
let mut hostnames = vec![
@@ -646,11 +645,13 @@ impl GiteaTlsCert {
646645

647646
// and generate server key and cert
648647
let key = KeyPair::generate().unwrap();
648+
let issuer = Issuer::from_params(&ca_cert, &ca_key);
649649
let cert = CertificateParams::new(hostnames)
650650
.unwrap()
651-
.signed_by(&key, &ca_cert, &ca_key)
651+
.signed_by(&key, &issuer)
652652
.unwrap();
653653

654+
let ca_cert = ca_cert.self_signed(&ca_key).unwrap();
654655
Self {
655656
cert: cert.pem(),
656657
key: key.serialize_pem(),

src/localstack/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ mod tests {
7070

7171
let region_provider = RegionProviderChain::default_provider().or_else("us-east-1");
7272
let creds = sqs::config::Credentials::new("fake", "fake", None, None, "test");
73-
let config = aws_config::defaults(BehaviorVersion::v2025_01_17())
73+
let config = aws_config::defaults(BehaviorVersion::v2025_08_07())
7474
.region(region_provider)
7575
.credentials_provider(creds)
7676
.endpoint_url(format!("http://{host_ip}:{host_port}"))

0 commit comments

Comments
 (0)