update rustfmt

Author: razvan

.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

@@ -77,12 +77,9 @@ pub fn get_affinity(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use rstest::rstest;
     use std::collections::BTreeMap;
 
-    use crate::HbaseCluster;
+    use rstest::rstest;
     use stackable_operator::{
         commons::affinity::StackableAffinity,
         k8s_openapi::{
@@ -93,6 +90,9 @@ mod tests {
         },
     };
 
+    use super::*;
+    use crate::HbaseCluster;
+
     #[rstest]
     #[case(HbaseRole::Master)]
     #[case(HbaseRole::RegionServer)]

rust/crd/src/lib.rs

@@ -1,10 +1,10 @@
+use std::collections::{BTreeMap, HashMap};
+
 use product_config::types::PropertyNameKind;
 use security::AuthenticationConfig;
 use serde::{Deserialize, Serialize};
 use shell_escape::escape;
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_operator::k8s_openapi::api::core::v1::PodTemplateSpec;
-use stackable_operator::schemars::{self, JsonSchema};
 use stackable_operator::{
     commons::{
         affinity::StackableAffinity,
@@ -19,20 +19,22 @@ use stackable_operator::{
         fragment::{self, Fragment, ValidationError},
         merge::{Atomic, Merge},
     },
-    k8s_openapi::{api::core::v1::EnvVar, apimachinery::pkg::api::resource::Quantity, DeepMerge},
+    k8s_openapi::{
+        api::core::v1::{EnvVar, PodTemplateSpec},
+        apimachinery::pkg::api::resource::Quantity,
+        DeepMerge,
+    },
     kube::{runtime::reflector::ObjectRef, CustomResource, ResourceExt},
     product_config_utils::Configuration,
     product_logging::{self, spec::Logging},
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroupRef},
+    schemars::{self, JsonSchema},
     status::condition::{ClusterCondition, HasStatusCondition},
     time::Duration,
 };
-use std::collections::BTreeMap;
-use std::collections::HashMap;
 use strum::{Display, EnumIter, EnumString};
 
-use crate::affinity::get_affinity;
-use crate::security::AuthorizationConfig;
+use crate::{affinity::get_affinity, security::AuthorizationConfig};
 
 pub mod affinity;
 pub mod security;
@@ -1242,19 +1244,17 @@ impl AnyServiceConfig {
 
 #[cfg(test)]
 mod tests {
-    use rstest::rstest;
-
     use std::collections::{BTreeMap, HashMap};
 
     use indoc::indoc;
+    use product_config::{types::PropertyNameKind, ProductConfigManager};
+    use rstest::rstest;
     use stackable_operator::product_config_utils::{
         transform_all_roles_to_config, validate_all_roles_and_groups_config,
     };
 
     use crate::{merged_env, AnyServiceConfig, HbaseCluster, HbaseRole, RegionMoverExtraCliOpts};
 
-    use product_config::{types::PropertyNameKind, ProductConfigManager};
-
     #[test]
     pub fn test_env_overrides() {
         let input = indoc! {r#"

rust/crd/src/security.rs

@@ -1,6 +1,8 @@
 use serde::{Deserialize, Serialize};
-use stackable_operator::commons::opa::OpaConfig;
-use stackable_operator::schemars::{self, JsonSchema};
+use stackable_operator::{
+    commons::opa::OpaConfig,
+    schemars::{self, JsonSchema},
+};
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]

rust/operator-binary/src/hbase_controller.rs

@@ -13,6 +13,11 @@ use product_config::{
     ProductConfigManager,
 };
 use snafu::{OptionExt, ResultExt, Snafu};
+use stackable_hbase_crd::{
+    merged_env, AnyServiceConfig, Container, HbaseCluster, HbaseClusterStatus, HbaseRole, APP_NAME,
+    HBASE_ENV_SH, HBASE_REST_PORT_NAME_HTTP, HBASE_REST_PORT_NAME_HTTPS, HBASE_SITE_XML,
+    JVM_SECURITY_PROPERTIES_FILE, SSL_CLIENT_XML, SSL_SERVER_XML,
+};
 use stackable_operator::{
     builder::{
         self,
@@ -62,25 +67,23 @@ use stackable_operator::{
 };
 use strum::{EnumDiscriminants, IntoStaticStr, ParseError};
 
-use crate::product_logging::{CONTAINERDEBUG_LOG_DIRECTORY, STACKABLE_LOG_DIR};
-use crate::security::opa::HbaseOpaConfig;
-use stackable_hbase_crd::{
-    merged_env, AnyServiceConfig, Container, HbaseCluster, HbaseClusterStatus, HbaseRole, APP_NAME,
-    HBASE_ENV_SH, HBASE_REST_PORT_NAME_HTTP, HBASE_REST_PORT_NAME_HTTPS, HBASE_SITE_XML,
-    JVM_SECURITY_PROPERTIES_FILE, SSL_CLIENT_XML, SSL_SERVER_XML,
-};
-
-use crate::config::jvm::construct_hbase_heapsize_env;
-use crate::config::jvm::{construct_global_jvm_args, construct_role_specific_non_heap_jvm_args};
 use crate::{
+    config::jvm::{
+        construct_global_jvm_args, construct_hbase_heapsize_env,
+        construct_role_specific_non_heap_jvm_args,
+    },
     discovery::build_discovery_configmap,
     kerberos::{
         self, add_kerberos_pod_config, kerberos_config_properties, kerberos_ssl_client_settings,
         kerberos_ssl_server_settings,
     },
     operations::{graceful_shutdown::add_graceful_shutdown_config, pdb::add_pdbs},
-    product_logging::{extend_role_group_config_map, resolve_vector_aggregator_address},
+    product_logging::{
+        extend_role_group_config_map, resolve_vector_aggregator_address,
+        CONTAINERDEBUG_LOG_DIRECTORY, STACKABLE_LOG_DIR,
+    },
     security,
+    security::opa::HbaseOpaConfig,
     zookeeper::{self, ZookeeperConnectionInformation},
     OPERATOR_NAME,
 };

rust/operator-binary/src/main.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use clap::Parser;
 use futures::StreamExt;
 use hbase_controller::FULL_HBASE_CONTROLLER_NAME;
@@ -15,7 +17,6 @@ use stackable_operator::{
     logging::controller::report_controller_reconciled,
     CustomResourceExt,
 };
-use std::sync::Arc;
 
 mod config;
 mod discovery;

rust/operator-binary/src/product_logging.rs

@@ -1,6 +1,5 @@
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_hbase_crd::{Container, HbaseCluster};
-use stackable_operator::product_logging::spec::AutomaticContainerLogConfig;
 use stackable_operator::{
     builder::configmap::ConfigMapBuilder,
     client::Client,
@@ -9,7 +8,9 @@ use stackable_operator::{
     memory::BinaryMultiple,
     product_logging::{
         self,
-        spec::{ContainerLogConfig, ContainerLogConfigChoice, Logging},
+        spec::{
+            AutomaticContainerLogConfig, ContainerLogConfig, ContainerLogConfigChoice, Logging,
+        },
     },
     role_utils::RoleGroupRef,
 };

rust/operator-binary/src/security/opa.rs

@@ -1,6 +1,5 @@
 use snafu::{ResultExt, Snafu};
-use stackable_hbase_crd::security::AuthorizationConfig;
-use stackable_hbase_crd::HbaseCluster;
+use stackable_hbase_crd::{security::AuthorizationConfig, HbaseCluster};
 use stackable_operator::{client::Client, commons::opa::OpaApiVersion};
 
 const DEFAULT_DRY_RUN: bool = false;