Skip to content

chore: Bump Rust version to 1.87.0 and workflow actions #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 9, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: '0'
CARGO_PROFILE_DEV_DEBUG: '0'
RUST_TOOLCHAIN_VERSION: "1.85.0"
RUST_TOOLCHAIN_VERSION: "1.87.0"
RUSTFLAGS: "-D warnings"
RUSTDOCFLAGS: "-D warnings"
RUST_LOG: "info"
Expand All @@ -38,10 +38,10 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
with:
key: udeps
- run: cargo install --locked [email protected].55
- run: cargo install --locked [email protected].57
- run: cargo udeps --all-targets --all-features

run_cargodeny:
Expand All @@ -60,7 +60,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
- uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
with:
command: check ${{ matrix.checks }}

Expand All @@ -75,7 +75,7 @@ jobs:
with:
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
components: rustfmt
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
with:
key: doc
- run: cargo doc --document-private-items
Expand All @@ -96,7 +96,7 @@ jobs:
# for our cases.
# See: https://github.com/dtolnay/trybuild/issues/236#issuecomment-1620950759
components: rust-src
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
- uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
with:
key: test
- run: cargo test --no-default-features --workspace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
with:
persist-credentials: false
fetch-depth: 0
- uses: stackabletech/actions/run-pre-commit@4bfd3b65f22af597fe784599c077dc34bf5894a7 # v0.8.0
- uses: stackabletech/actions/run-pre-commit@4483641a7e24057bd2ba51cb4c3f2f0010ad21b7 # v0.8.4
with:
rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
# rust-src is required for trybuild stderr output comparison to work
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- crates/**

env:
RUST_TOOLCHAIN_VERSION: "1.85.0"
RUST_TOOLCHAIN_VERSION: "1.87.0"

permissions: {}

Expand All @@ -37,7 +37,7 @@ jobs:
run: echo '<meta http-equiv="refresh" content="0;url=stackable_operator/index.html">' > target/doc/index.html

- name: Upload Documentation Artifacts
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa #v3.0.1
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
with:
path: target/doc

Expand Down
70 changes: 49 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions crates/stackable-certs/src/ca/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ where
{
#[snafu(display("failed to retrieve secret \"{secret_ref}\""))]
GetSecret {
source: kube::Error,
#[snafu(source(from(kube::Error, Box::new)))]
source: Box<kube::Error>,
secret_ref: SecretReference,
},

Expand All @@ -146,15 +147,19 @@ where

#[snafu(display("failed to read PEM-encoded certificate chain from secret {secret:?}"))]
ReadChain {
source: x509_cert::der::Error,
#[snafu(source(from(x509_cert::der::Error, Box::new)))]
source: Box<x509_cert::der::Error>,
secret: ObjectRef<Secret>,
},

#[snafu(display("failed to parse UTF-8 encoded byte string"))]
DecodeUtf8String { source: std::str::Utf8Error },

#[snafu(display("failed to deserialize private key from PEM"))]
DeserializeKeyFromPem { source: E },
DeserializeKeyFromPem {
#[snafu(source(from(E, Box::new)))]
source: Box<E>,
},
}

/// A certificate authority (CA) which is used to generate and sign
Expand Down
20 changes: 16 additions & 4 deletions crates/stackable-operator/src/cluster_resources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ pub enum Error {
MissingObjectKey { key: &'static str },

#[snafu(display("failed to list cluster resources with label selector"))]
ListClusterResources { source: crate::client::Error },
ListClusterResources {
#[snafu(source(from(crate::client::Error, Box::new)))]
source: Box<crate::client::Error>,
},

#[snafu(display("label {label:?} is missing"))]
MissingLabel { label: &'static str },
Expand All @@ -68,13 +71,22 @@ pub enum Error {
},

#[snafu(display("failed to get resource"))]
GetResource { source: crate::client::Error },
GetResource {
#[snafu(source(from(crate::client::Error, Box::new)))]
source: Box<crate::client::Error>,
},

#[snafu(display("failed to apply patch"))]
ApplyPatch { source: crate::client::Error },
ApplyPatch {
#[snafu(source(from(crate::client::Error, Box::new)))]
source: Box<crate::client::Error>,
},

#[snafu(display("failed to delete orphaned resource"))]
DeleteOrphanedResource { source: crate::client::Error },
DeleteOrphanedResource {
#[snafu(source(from(crate::client::Error, Box::new)))]
source: Box<crate::client::Error>,
},
}

/// A cluster resource handled by [`ClusterResources`].
Expand Down
11 changes: 8 additions & 3 deletions crates/stackable-operator/src/crd/s3/connection/v1alpha1_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ use crate::{
pub enum ConnectionError {
#[snafu(display("failed to retrieve S3 connection '{s3_connection}'"))]
RetrieveS3Connection {
source: crate::client::Error,
#[snafu(source(from(crate::client::Error, Box::new)))]
source: Box<crate::client::Error>,
s3_connection: String,
},

Expand All @@ -37,11 +38,15 @@ pub enum ConnectionError {
AddS3TlsClientDetailsVolumes { source: TlsClientDetailsError },

#[snafu(display("failed to add required volumes"))]
AddVolumes { source: crate::builder::pod::Error },
AddVolumes {
#[snafu(source(from(crate::builder::pod::Error, Box::new)))]
source: Box<crate::builder::pod::Error>,
},

#[snafu(display("failed to add required volumeMounts"))]
AddVolumeMounts {
source: crate::builder::pod::container::Error,
#[snafu(source(from(crate::builder::pod::container::Error, Box::new)))]
source: Box<crate::builder::pod::container::Error>,
},
}

Expand Down
4 changes: 4 additions & 0 deletions crates/stackable-operator/src/product_config_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ pub fn config_for_role_and_group<'a>(
Ok(result)
}

#[allow(clippy::doc_overindented_list_items)]
/// Given the configuration parameters of all `roles` partition them by `PropertyNameKind` and
/// merge them with the role groups configuration parameters.
///
Expand Down Expand Up @@ -197,6 +198,7 @@ where
Ok(result)
}

#[allow(clippy::doc_overindented_list_items)]
/// Validates a product configuration for all roles and role_groups. Requires a valid product config
/// and [`RoleConfigByPropertyKind`] which can be obtained via `transform_all_roles_to_config`.
///
Expand Down Expand Up @@ -239,6 +241,7 @@ pub fn validate_all_roles_and_groups_config(
Ok(result)
}

#[allow(clippy::doc_overindented_list_items)]
/// Calculates and validates a product configuration for a role and group. Requires a valid
/// product config and existing [`RoleConfigByPropertyKind`] that can be obtained via
/// `transform_all_roles_to_config`.
Expand Down Expand Up @@ -283,6 +286,7 @@ fn validate_role_and_group_config(
Ok(result)
}

#[allow(clippy::doc_overindented_list_items)]
/// This transforms the [`product_config::PropertyValidationResult`] back into a pure BTreeMap which can be used
/// to set properties for config files, cli or environmental variables.
/// Default values are ignored, Recommended and Valid values are used as is. For Warning and
Expand Down
Loading