Skip to content

Commit 2229a31

Browse files
TechassiTechassi
committed
chore: Merge branch 'main' into spike/secret-op-volume-request-parts
2 parents 156a1ef + a000311 commit 2229a31

44 files changed

Lines changed: 530 additions & 149 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.pre-commit-config.yaml‎

Lines changed: 100 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,39 @@ repos:
5555
pass_filenames: false
5656
files: \.rs$|Cargo\.(toml|lock)
5757

58-
- id: cargo-test-no-default-features
59-
name: cargo-test-no-default-features
58+
- id: cargo-doc-no-default-features
59+
name: cargo-doc-no-default-features
6060
language: system
61-
entry: cargo test --no-default-features --workspace
61+
entry: cargo doc --no-deps --no-default-features --document-private-items
6262
stages: [pre-commit, pre-merge-commit]
6363
pass_filenames: false
6464
files: \.rs$|Cargo\.(toml|lock)
6565

66+
- id: cargo-doc-all-features
67+
name: cargo-doc-all-features
68+
language: system
69+
entry: cargo doc --no-deps --all-features --document-private-items
70+
stages: [pre-commit, pre-merge-commit]
71+
pass_filenames: false
72+
files: \.rs$|Cargo\.(toml|lock)
73+
74+
# As long as we run tests for every contained crate (to test turning off all features),
75+
# we don't need to re-run them here
76+
# - id: cargo-test
77+
# name: cargo-test
78+
# language: system
79+
# entry: cargo test --workspace
80+
# stages: [pre-commit, pre-merge-commit]
81+
# pass_filenames: false
82+
# files: \.rs$|Cargo\.(toml|lock)
83+
# - id: cargo-test-no-default-features
84+
# name: cargo-test-no-default-features
85+
# language: system
86+
# entry: cargo test --no-default-features --workspace
87+
# stages: [pre-commit, pre-merge-commit]
88+
# pass_filenames: false
89+
# files: \.rs$|Cargo\.(toml|lock)
90+
6691
- id: cargo-test-all-features
6792
name: cargo-test-all-features
6893
language: system
@@ -71,6 +96,78 @@ repos:
7196
pass_filenames: false
7297
files: \.rs$|Cargo\.(toml|lock)
7398

99+
- id: cargo-test-k8s-version-no-default-features
100+
name: cargo-test-k8s-version-no-default-features
101+
language: system
102+
entry: cargo test --no-default-features --package k8s-version
103+
stages: [pre-commit, pre-merge-commit]
104+
pass_filenames: false
105+
files: \.rs$|Cargo\.(toml|lock)
106+
107+
- id: cargo-test-stackable-certs-no-default-features
108+
name: cargo-test-stackable-certs-no-default-features
109+
language: system
110+
entry: cargo test --no-default-features --package stackable-certs
111+
stages: [pre-commit, pre-merge-commit]
112+
pass_filenames: false
113+
files: \.rs$|Cargo\.(toml|lock)
114+
115+
- id: cargo-test-stackable-operator-no-default-features
116+
name: cargo-test-stackable-operator-no-default-features
117+
language: system
118+
entry: cargo test --no-default-features --package stackable-operator
119+
stages: [pre-commit, pre-merge-commit]
120+
pass_filenames: false
121+
files: \.rs$|Cargo\.(toml|lock)
122+
123+
- id: cargo-test-stackable-operator-derive-no-default-features
124+
name: cargo-test-stackable-operator-derive-no-default-features
125+
language: system
126+
entry: cargo test --no-default-features --package stackable-operator-derive
127+
stages: [pre-commit, pre-merge-commit]
128+
pass_filenames: false
129+
files: \.rs$|Cargo\.(toml|lock)
130+
131+
- id: cargo-test-stackable-shared-no-default-features
132+
name: cargo-test-stackable-shared-no-default-features
133+
language: system
134+
entry: cargo test --no-default-features --package stackable-shared
135+
stages: [pre-commit, pre-merge-commit]
136+
pass_filenames: false
137+
files: \.rs$|Cargo\.(toml|lock)
138+
139+
- id: cargo-test-stackable-telemetry-no-default-features
140+
name: cargo-test-stackable-telemetry-no-default-features
141+
language: system
142+
entry: cargo test --no-default-features --package stackable-telemetry
143+
stages: [pre-commit, pre-merge-commit]
144+
pass_filenames: false
145+
files: \.rs$|Cargo\.(toml|lock)
146+
147+
- id: cargo-test-stackable-versioned-no-default-features
148+
name: cargo-test-stackable-versioned-no-default-features
149+
language: system
150+
entry: cargo test --no-default-features --package stackable-versioned
151+
stages: [pre-commit, pre-merge-commit]
152+
pass_filenames: false
153+
files: \.rs$|Cargo\.(toml|lock)
154+
155+
- id: cargo-test-stackable-versioned-macros-no-default-features
156+
name: cargo-test-stackable-versioned-macros-no-default-features
157+
language: system
158+
entry: cargo test --no-default-features --package stackable-versioned-macros
159+
stages: [pre-commit, pre-merge-commit]
160+
pass_filenames: false
161+
files: \.rs$|Cargo\.(toml|lock)
162+
163+
- id: cargo-test-stackable-webhook-no-default-features
164+
name: cargo-test-stackable-webhook-no-default-features
165+
language: system
166+
entry: cargo test --no-default-features --package stackable-webhook
167+
stages: [pre-commit, pre-merge-commit]
168+
pass_filenames: false
169+
files: \.rs$|Cargo\.(toml|lock)
170+
74171
- id: cargo-rustfmt
75172
name: cargo-rustfmt
76173
language: system

‎Cargo.lock‎

Lines changed: 51 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ either = "1.13.0"
2929
futures = "0.3.30"
3030
futures-util = "0.3.30"
3131
http = "1.3.1"
32+
humantime = "2.1.0"
3233
indexmap = "2.5.0"
3334
indoc = "2.0.6"
3435
jiff = "0.2.18"

‎crates/k8s-version/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//!
2424
//! ### Constructing
2525
//!
26-
//! Alternatively, they can be constructed programatically using the
26+
//! Alternatively, they can be constructed programmatically using the
2727
//! [`ApiVersion::new()`] and [`ApiVersion::try_new()`] functions.
2828
//!
2929
//! ```

‎crates/stackable-certs/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ All notable changes to this project will be documented in this file.
1414

1515
- BREAKING: The functions `generate_leaf_certificate`, `generate_rsa_leaf_certificate` and
1616
`generate_ecdsa_leaf_certificate` of `CertificateAuthority` accept an additional parameter
17-
`subject_alterative_dns_names` ([#1057]).
17+
`subject_alternative_dns_names` ([#1057]).
1818
- The passed SANs are added to the generated certificate, this is needed when the HTTPS server is
1919
accessible on multiple DNS names and/or IPs.
2020
- Pass an empty list (`[]`) to keep the existing behavior.

‎crates/stackable-certs/src/ca/mod.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ where
163163
}
164164

165165
/// A certificate authority (CA) which is used to generate and sign
166-
/// intermidiate or leaf certificates.
166+
/// intermediate or leaf certificates.
167167
#[derive(Debug)]
168168
pub struct CertificateAuthority<S>
169169
where
@@ -298,7 +298,7 @@ where
298298
key_pair: T,
299299
name: &str,
300300
scope: &str,
301-
subject_alterative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
301+
subject_alternative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
302302
validity: Duration,
303303
) -> Result<CertificatePair<T>>
304304
where
@@ -353,7 +353,7 @@ where
353353
]))
354354
.context(AddCertificateExtensionSnafu)?;
355355

356-
let sans = subject_alterative_dns_names
356+
let sans = subject_alternative_dns_names
357357
.into_iter()
358358
.map(|dns_name| {
359359
let ia5_dns_name =
@@ -385,11 +385,11 @@ where
385385
&mut self,
386386
name: &str,
387387
scope: &str,
388-
subject_alterative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
388+
subject_alternative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
389389
validity: Duration,
390390
) -> Result<CertificatePair<rsa::SigningKey>> {
391391
let key = rsa::SigningKey::new().context(GenerateRsaSigningKeySnafu)?;
392-
self.generate_leaf_certificate(key, name, scope, subject_alterative_dns_names, validity)
392+
self.generate_leaf_certificate(key, name, scope, subject_alternative_dns_names, validity)
393393
}
394394

395395
/// Generates an ECDSAasync -based leaf certificate which is signed by this CA.
@@ -401,11 +401,11 @@ where
401401
&mut self,
402402
name: &str,
403403
scope: &str,
404-
subject_alterative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
404+
subject_alternative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
405405
validity: Duration,
406406
) -> Result<CertificatePair<ecdsa::SigningKey>> {
407407
let key = ecdsa::SigningKey::new().context(GenerateEcdsaSigningKeySnafu)?;
408-
self.generate_leaf_certificate(key, name, scope, subject_alterative_dns_names, validity)
408+
self.generate_leaf_certificate(key, name, scope, subject_alternative_dns_names, validity)
409409
}
410410

411411
/// Create a [`CertificateAuthority`] from a Kubernetes [`Secret`].

‎crates/stackable-certs/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub enum CertificatePairError<E>
4343
where
4444
E: std::error::Error + 'static,
4545
{
46-
#[snafu(display("failed to seralize certificate as {key_encoding}"))]
46+
#[snafu(display("failed to serialize certificate as {key_encoding}"))]
4747
SerializeCertificate {
4848
source: x509_cert::der::Error,
4949
key_encoding: KeyEncoding,

0 commit comments

Comments
 (0)