chore: Update templated files (9001281) (#704)

* chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@9001281

Reference-to: stackabletech/operator-templating@9001281 (Fix pre-commit hook)

* chore: Apply formatting

* chore: Bump openssl to 0.10.70 to fix RUSTSEC-2025-0004

---------

Co-authored-by: Techassi <[email protected]>

Author: stackable-bot

.github/workflows/pr_pre-commit.yaml

@@ -6,7 +6,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_TOOLCHAIN_VERSION: "1.82.0"
+  RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
   HADOLINT_VERSION: "v2.12.0"
   PYTHON_VERSION: "3.12"
 

.pre-commit-config.yaml

@@ -17,10 +17,6 @@ repos:
   - repo: https://github.com/doublify/pre-commit-rust
     rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
     hooks:
-      - id: fmt
-        # Pinning to a specific rustc version, so that we get consistent formatting
-        entry: RUSTUP_TOOLCHAIN=nightly-2025-01-15 cargo fmt
-        args: ["--all", "--", "--check"]
       - id: clippy
         args: ["--all-targets", "--", "-D", "warnings"]
 
@@ -78,3 +74,10 @@ repos:
         entry: cargo test
         stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false
+
+      - id: cargo-rustfmt
+        name: cargo-rustfmt
+        language: system
+        entry: cargo +nightly-2025-01-15 fmt --all -- --check
+        stages: [pre-commit]
+        pass_filenames: false

Cargo.lock

@@ -85,12 +85,9 @@ pub fn get_affinity(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use rstest::rstest;
     use std::collections::BTreeMap;
 
-    use crate::TrinoCluster;
+    use rstest::rstest;
     use stackable_operator::{
         commons::affinity::StackableAffinity,
         k8s_openapi::{
@@ -101,6 +98,9 @@ mod tests {
         },
     };
 
+    use super::*;
+    use crate::TrinoCluster;
+
     #[rstest]
     #[case(TrinoRole::Coordinator)]
     #[case(TrinoRole::Worker)]

rust/crd/src/affinity.rs

@@ -1,10 +1,11 @@
-use super::commons::{HdfsConnection, MetastoreConnection};
 use serde::{Deserialize, Serialize};
 use stackable_operator::{
     commons::s3::S3ConnectionInlineOrReference,
     schemars::{self, JsonSchema},
 };
 
+use super::commons::{HdfsConnection, MetastoreConnection};
+
 // This struct is similar to [`super::hive::HiveConnector`], but we do not `#[serde(flatten)]` it here, to avoid changing
 // stuff there and missing that these settings don't apply to other connectors (such as Iceberg or Delta Lake).
 #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]

rust/crd/src/catalog/delta_lake.rs

@@ -38,7 +38,6 @@ pub enum Property {
 #[cfg(test)]
 mod tests {
     use super::*;
-
     use crate::catalog::{TrinoCatalog, TrinoCatalogConnector};
 
     #[test]

rust/crd/src/catalog/generic.rs

@@ -1,10 +1,11 @@
-use super::commons::{HdfsConnection, MetastoreConnection};
 use serde::{Deserialize, Serialize};
 use stackable_operator::{
     commons::s3::S3ConnectionInlineOrReference,
     schemars::{self, JsonSchema},
 };
 
+use super::commons::{HdfsConnection, MetastoreConnection};
+
 #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct HiveConnector {

rust/crd/src/catalog/hive.rs

@@ -1,10 +1,11 @@
-use super::commons::{HdfsConnection, MetastoreConnection};
 use serde::{Deserialize, Serialize};
 use stackable_operator::{
     commons::s3::S3ConnectionInlineOrReference,
     schemars::{self, JsonSchema},
 };
 
+use super::commons::{HdfsConnection, MetastoreConnection};
+
 // This struct is similar to [`super::hive::HiveConnector`], but we do not `#[serde(flatten)]` it here, to avoid changing
 // stuff there and missing that these settings don't apply to other connectors (such as Iceberg or Delta Lake).
 #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]

rust/crd/src/catalog/iceberg.rs

@@ -8,18 +8,18 @@ pub mod iceberg;
 pub mod tpcds;
 pub mod tpch;
 
-use serde::{Deserialize, Serialize};
-use stackable_operator::{
-    kube::CustomResource,
-    schemars::{self, JsonSchema},
-};
 use std::collections::HashMap;
 
 use black_hole::BlackHoleConnector;
 use generic::GenericConnector;
 use google_sheet::GoogleSheetConnector;
 use hive::HiveConnector;
 use iceberg::IcebergConnector;
+use serde::{Deserialize, Serialize};
+use stackable_operator::{
+    kube::CustomResource,
+    schemars::{self, JsonSchema},
+};
 use tpcds::TpcdsConnector;
 use tpch::TpchConnector;
 

rust/crd/src/catalog/mod.rs

@@ -3,7 +3,7 @@ pub mod authentication;
 pub mod catalog;
 pub mod discovery;
 
-use crate::discovery::TrinoPodRef;
+use std::{collections::BTreeMap, str::FromStr};
 
 use affinity::get_affinity;
 use catalog::TrinoCatalog;
@@ -35,9 +35,10 @@ use stackable_operator::{
     time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
 };
-use std::{collections::BTreeMap, str::FromStr};
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
 
+use crate::discovery::TrinoPodRef;
+
 pub const APP_NAME: &str = "trino";
 // ports
 pub const HTTP_PORT: u16 = 8080;