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

* 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

---------

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

rust/crd/src/affinity.rs

@@ -41,9 +41,9 @@ fn get_affinity_for_role(cluster_name: &str, role: &str) -> StackableAffinityFra
 #[cfg(test)]
 mod tests {
 
-    use rstest::rstest;
     use std::collections::BTreeMap;
 
+    use rstest::rstest;
     use stackable_operator::{
         commons::affinity::StackableAffinity,
         k8s_openapi::{

rust/crd/src/authentication.rs

@@ -1,4 +1,4 @@
-use std::{future::Future, mem};
+use std::{collections::BTreeSet, future::Future, mem};
 
 use serde::{Deserialize, Serialize};
 use snafu::{ensure, ResultExt, Snafu};
@@ -11,7 +11,6 @@ use stackable_operator::{
     },
     schemars::{self, JsonSchema},
 };
-use std::collections::BTreeSet;
 use tracing::info;
 
 const SUPPORTED_AUTHENTICATION_CLASS_PROVIDERS: [&str; 2] = ["LDAP", "OIDC"];
@@ -319,11 +318,16 @@ mod tests {
     use std::pin::Pin;
 
     use indoc::indoc;
-    use stackable_operator::commons::networking::HostName;
-    use stackable_operator::commons::tls_verification::{
-        CaCert, Tls, TlsClientDetails, TlsServerVerification, TlsVerification,
+    use stackable_operator::{
+        commons::{
+            authentication::oidc,
+            networking::HostName,
+            tls_verification::{
+                CaCert, Tls, TlsClientDetails, TlsServerVerification, TlsVerification,
+            },
+        },
+        kube,
     };
-    use stackable_operator::{commons::authentication::oidc, kube};
 
     use super::*;
 

rust/crd/src/git_sync.rs

@@ -1,9 +1,10 @@
+use std::collections::BTreeMap;
+
 use serde::{Deserialize, Serialize};
 use stackable_operator::{
     schemars::{self, JsonSchema},
     utils::COMMON_BASH_TRAP_FUNCTIONS,
 };
-use std::collections::BTreeMap;
 
 use crate::{GIT_LINK, GIT_ROOT, GIT_SAFE_DIR, GIT_SYNC_DEPTH, GIT_SYNC_PERIOD_SECONDS};
 
@@ -96,9 +97,10 @@ impl GitSync {
 
 #[cfg(test)]
 mod tests {
-    use crate::AirflowCluster;
     use rstest::rstest;
 
+    use crate::AirflowCluster;
+
     #[test]
     fn test_git_sync() {
         let cluster = "

rust/crd/src/lib.rs

@@ -824,9 +824,10 @@ pub fn build_recommended_labels<'a, T>(
 
 #[cfg(test)]
 mod tests {
-    use crate::AirflowCluster;
     use stackable_operator::commons::product_image_selection::ResolvedProductImage;
 
+    use crate::AirflowCluster;
+
     #[test]
     fn test_cluster_config() {
         let cluster = "

rust/operator-binary/src/airflow_controller.rs

@@ -14,10 +14,11 @@ use product_config::{
 };
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_airflow_crd::{
-    authentication::AirflowAuthenticationClassResolved, git_sync::GitSync,
-};
-use stackable_airflow_crd::{
-    authentication::AirflowClientAuthenticationDetailsResolved, build_recommended_labels,
+    authentication::{
+        AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
+    },
+    build_recommended_labels,
+    git_sync::GitSync,
     AirflowCluster, AirflowClusterStatus, AirflowConfig, AirflowConfigOptions, AirflowExecutor,
     AirflowRole, Container, ExecutorConfig, ExecutorConfigFragment, AIRFLOW_CONFIG_FILENAME,
     AIRFLOW_UID, APP_NAME, CONFIG_PATH, GIT_CONTENT, GIT_ROOT, GIT_SYNC_NAME, LOG_CONFIG_DIR,
@@ -80,7 +81,6 @@ use stackable_operator::{
     time::Duration,
     utils::COMMON_BASH_TRAP_FUNCTIONS,
 };
-
 use strum::{EnumDiscriminants, IntoEnumIterator, IntoStaticStr};
 
 use crate::{

rust/operator-binary/src/config.rs

@@ -1,3 +1,5 @@
+use std::collections::BTreeMap;
+
 use indoc::formatdoc;
 use snafu::{ResultExt, Snafu};
 use stackable_airflow_crd::{
@@ -7,9 +9,10 @@ use stackable_airflow_crd::{
     },
     AirflowConfigOptions,
 };
-use stackable_operator::commons::authentication::{ldap::AuthenticationProvider, oidc};
-use stackable_operator::commons::tls_verification::TlsVerification;
-use std::collections::BTreeMap;
+use stackable_operator::commons::{
+    authentication::{ldap::AuthenticationProvider, oidc},
+    tls_verification::TlsVerification,
+};
 
 pub const PYTHON_IMPORTS: &[&str] = &[
     "import os",
@@ -273,15 +276,17 @@ fn append_oidc_config(
 
 #[cfg(test)]
 mod tests {
-    use crate::config::add_airflow_config;
+    use std::collections::BTreeMap;
+
     use indoc::formatdoc;
     use rstest::rstest;
     use stackable_airflow_crd::authentication::{
         default_sync_roles_at, default_user_registration, AirflowAuthenticationClassResolved,
         AirflowClientAuthenticationDetailsResolved, FlaskRolesSyncMoment,
     };
     use stackable_operator::commons::authentication::{ldap, oidc};
-    use std::collections::BTreeMap;
+
+    use crate::config::add_airflow_config;
 
     #[test]
     fn test_auth_db_config() {

rust/operator-binary/src/env_vars.rs

@@ -1,19 +1,20 @@
-use crate::util::env_var_from_secret;
+use std::collections::{BTreeMap, BTreeSet, HashMap};
+
 use product_config::types::PropertyNameKind;
-use stackable_airflow_crd::authentication::{
-    AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
-};
-use stackable_airflow_crd::git_sync::GitSync;
 use stackable_airflow_crd::{
-    AirflowCluster, AirflowConfig, AirflowExecutor, AirflowRole, ExecutorConfig, LOG_CONFIG_DIR,
-    STACKABLE_LOG_DIR,
+    authentication::{
+        AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
+    },
+    git_sync::GitSync,
+    AirflowCluster, AirflowConfig, AirflowExecutor, AirflowRole, ExecutorConfig, GIT_LINK,
+    GIT_SYNC_DIR, LOG_CONFIG_DIR, STACKABLE_LOG_DIR, TEMPLATE_LOCATION, TEMPLATE_NAME,
 };
-use stackable_airflow_crd::{GIT_LINK, GIT_SYNC_DIR, TEMPLATE_LOCATION, TEMPLATE_NAME};
-use stackable_operator::commons::authentication::oidc;
-use stackable_operator::k8s_openapi::api::core::v1::EnvVar;
-use stackable_operator::kube::ResourceExt;
-use stackable_operator::product_logging::framework::create_vector_shutdown_file_command;
-use std::collections::{BTreeMap, BTreeSet, HashMap};
+use stackable_operator::{
+    commons::authentication::oidc, k8s_openapi::api::core::v1::EnvVar, kube::ResourceExt,
+    product_logging::framework::create_vector_shutdown_file_command,
+};
+
+use crate::util::env_var_from_secret;
 
 const AIRFLOW__LOGGING__LOGGING_CONFIG_CLASS: &str = "AIRFLOW__LOGGING__LOGGING_CONFIG_CLASS";
 const AIRFLOW__METRICS__STATSD_ON: &str = "AIRFLOW__METRICS__STATSD_ON";