Skip to content

Commit ac18bd9

Browse files
committed
Simply tests
1 parent 4c84aea commit ac18bd9

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

crates/stackable-certs/src/cert_builder.rs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,10 @@ mod tests {
233233

234234
#[test]
235235
fn minimal_certificate() {
236-
let ca = get_ecdsa_ca();
236+
let ca = CertificateAuthorityBuilder::<ecdsa::SigningKey>::builder()
237+
.build()
238+
.expect("failed to build CA");
239+
237240
let certificate = CertificateBuilder::builder()
238241
.subject("CN=trino-coordinator-default-0")
239242
.signed_by(&ca)
@@ -251,11 +254,15 @@ mod tests {
251254

252255
#[test]
253256
fn customized_certificate() {
254-
let ca = get_rsa_ca();
257+
let ca = CertificateAuthorityBuilder::builder()
258+
.build()
259+
.expect("failed to build CA");
260+
255261
let sans = [
256262
"trino-coordinator-default-0.trino-coordinator-default.default.svc.cluster-local",
257263
"trino-coordinator-default.default.svc.cluster-local",
258264
];
265+
259266
let certificate = CertificateBuilder::builder()
260267
.subject("CN=trino-coordinator-default-0")
261268
.subject_alterative_dns_names(&sans)
@@ -320,16 +327,4 @@ mod tests {
320327
assert_ne!(certificate.serial_number, SerialNumber::from(0_u64))
321328
}
322329
}
323-
324-
fn get_ecdsa_ca() -> CertificateAuthority<ecdsa::SigningKey> {
325-
CertificateAuthorityBuilder::builder()
326-
.build()
327-
.expect("failed to build CA")
328-
}
329-
330-
fn get_rsa_ca() -> CertificateAuthority<rsa::SigningKey> {
331-
CertificateAuthorityBuilder::builder()
332-
.build()
333-
.expect("failed to build CA")
334-
}
335330
}

crates/stackable-webhook/src/tls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl TlsServer {
109109
// blocked.
110110
// See https://docs.rs/tokio/latest/tokio/task/fn.spawn_blocking.html
111111
let task = tokio::task::spawn_blocking(move || {
112-
let ca: CertificateAuthority<ecdsa::SigningKey> = CertificateAuthority::builder()
112+
let ca = CertificateAuthority::<ecdsa::SigningKey>::builder()
113113
.build()
114114
.context(CreateCertificateAuthoritySnafu)?;
115115

0 commit comments

Comments
 (0)