fix: resolve clippy type_complexity and rustfmt formatting

dervoeti · dervoeti · commit dd8606e7a917 · 2026-04-16T10:41:46.000+02:00
diff --git a/rust/operator-binary/src/authentication/oidc.rs b/rust/operator-binary/src/authentication/oidc.rs
@@ -71,7 +71,8 @@ fn add_authenticator_config(
 
     // Serialize the enum to get the snake_case string representation
     let method_string =
-        serde_json::to_value(oidc.product_specific_fields.client_authentication_method).expect("serializing ClientAuthenticationMethod to string");
+        serde_json::to_value(oidc.product_specific_fields.client_authentication_method)
+            .expect("serializing ClientAuthenticationMethod to string");
     let method_string = method_string
         .as_str()
         .expect("ClientAuthenticationMethod should serialize to a string");
@@ -207,7 +208,8 @@ mod tests {
             client_credentials_secret_ref: "nifi-keycloak-client".to_owned(),
             extra_scopes: vec![],
             product_specific_fields: oidc::v1alpha1::ClientAuthenticationMethodOption {
-                client_authentication_method: oidc::v1alpha1::ClientAuthenticationMethod::ClientSecretPost,
+                client_authentication_method:
+                    oidc::v1alpha1::ClientAuthenticationMethod::ClientSecretPost,
             },
         };
 
diff --git a/rust/operator-binary/src/crd/authentication.rs b/rust/operator-binary/src/crd/authentication.rs
@@ -94,16 +94,20 @@ impl AuthenticationClassesResolved {
         cluster_config: &DruidClusterConfig,
         client: &Client,
     ) -> Result<AuthenticationClassesResolved> {
-        let resolve_auth_class = |auth_details: core::v1alpha1::ClientAuthenticationDetails<oidc::v1alpha1::ClientAuthenticationMethodOption>| async move {
-            auth_details.resolve_class(client).await
-        };
+        let resolve_auth_class = |auth_details: core::v1alpha1::ClientAuthenticationDetails<
+            oidc::v1alpha1::ClientAuthenticationMethodOption,
+        >| async move { auth_details.resolve_class(client).await };
         AuthenticationClassesResolved::resolve(cluster_config, resolve_auth_class).await
     }
 
     /// Retrieves all provided `AuthenticationClass` references and checks if the configuration (TLS settings, secret class, OIDC config, etc.) is valid.
     pub async fn resolve<R>(
         cluster_config: &DruidClusterConfig,
-        resolve_auth_class: impl Fn(core::v1alpha1::ClientAuthenticationDetails<oidc::v1alpha1::ClientAuthenticationMethodOption>) -> R,
+        resolve_auth_class: impl Fn(
+            core::v1alpha1::ClientAuthenticationDetails<
+                oidc::v1alpha1::ClientAuthenticationMethodOption,
+            >,
+        ) -> R,
     ) -> Result<AuthenticationClassesResolved>
     where
         R: Future<
@@ -192,7 +196,9 @@ impl AuthenticationClassesResolved {
     fn from_oidc(
         auth_class_name: &str,
         provider: &oidc::v1alpha1::AuthenticationProvider,
-        auth_details: &core::v1alpha1::ClientAuthenticationDetails<oidc::v1alpha1::ClientAuthenticationMethodOption>,
+        auth_details: &core::v1alpha1::ClientAuthenticationDetails<
+            oidc::v1alpha1::ClientAuthenticationMethodOption,
+        >,
     ) -> Result<AuthenticationClassResolved> {
         let oidc_provider = match &provider.provider_hint {
             None => {
@@ -676,10 +682,13 @@ zookeeperConfigMapName: zk-config-map
     /// Use this function in the tests to replace
     /// `stackable_operator::commons::authentication::ClientAuthenticationDetails`
     /// which requires a Kubernetes client.
+    #[allow(clippy::type_complexity)]
     fn create_auth_class_resolver(
         auth_classes: Vec<core::v1alpha1::AuthenticationClass>,
     ) -> impl Fn(
-        core::v1alpha1::ClientAuthenticationDetails<oidc::v1alpha1::ClientAuthenticationMethodOption>,
+        core::v1alpha1::ClientAuthenticationDetails<
+            oidc::v1alpha1::ClientAuthenticationMethodOption,
+        >,
     ) -> Pin<
         Box<
             dyn Future<
@@ -690,7 +699,9 @@ zookeeperConfigMapName: zk-config-map
             >,
         >,
     > {
-        move |auth_details: core::v1alpha1::ClientAuthenticationDetails<oidc::v1alpha1::ClientAuthenticationMethodOption>| {
+        move |auth_details: core::v1alpha1::ClientAuthenticationDetails<
+            oidc::v1alpha1::ClientAuthenticationMethodOption,
+        >| {
             let auth_classes = auth_classes.clone();
             Box::pin(async move {
                 auth_classes
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -19,7 +19,10 @@ use stackable_operator::{
         merge::Merge,
     },
     config_overrides::{KeyValueConfigOverrides, KeyValueOverridesProvider},
-    crd::{authentication::{core, oidc}, s3},
+    crd::{
+        authentication::{core, oidc},
+        s3,
+    },
     deep_merger::ObjectOverrides,
     k8s_openapi::api::core::v1::{PodTemplateSpec, Volume},
     kube::{CustomResource, ResourceExt},
@@ -281,19 +284,36 @@ pub mod versioned {
         pub image: ProductImage,
 
         // no doc - docs provided by the struct.
-        pub brokers: Role<BrokerConfigFragment, DruidConfigOverrides, DruidRoleConfig, JavaCommonConfig>,
+        pub brokers:
+            Role<BrokerConfigFragment, DruidConfigOverrides, DruidRoleConfig, JavaCommonConfig>,
 
         // no doc - docs provided by the struct.
-        pub coordinators: Role<CoordinatorConfigFragment, DruidConfigOverrides, DruidRoleConfig, JavaCommonConfig>,
+        pub coordinators: Role<
+            CoordinatorConfigFragment,
+            DruidConfigOverrides,
+            DruidRoleConfig,
+            JavaCommonConfig,
+        >,
 
         // no doc - docs provided by the struct.
-        pub historicals: Role<HistoricalConfigFragment, DruidConfigOverrides, GenericRoleConfig, JavaCommonConfig>,
+        pub historicals: Role<
+            HistoricalConfigFragment,
+            DruidConfigOverrides,
+            GenericRoleConfig,
+            JavaCommonConfig,
+        >,
 
         // no doc - docs provided by the struct.
-        pub middle_managers: Role<MiddleManagerConfigFragment, DruidConfigOverrides, GenericRoleConfig, JavaCommonConfig>,
+        pub middle_managers: Role<
+            MiddleManagerConfigFragment,
+            DruidConfigOverrides,
+            GenericRoleConfig,
+            JavaCommonConfig,
+        >,
 
         // no doc - docs provided by the struct.
-        pub routers: Role<RouterConfigFragment, DruidConfigOverrides, DruidRoleConfig, JavaCommonConfig>,
+        pub routers:
+            Role<RouterConfigFragment, DruidConfigOverrides, DruidRoleConfig, JavaCommonConfig>,
 
         // no doc - docs provided by the struct.
         #[serde(default)]
@@ -322,7 +342,11 @@ pub mod versioned {
         /// For TLS: Please note that the SecretClass used to authenticate users needs to be the same
         /// as the SecretClass used for internal communication.
         #[serde(default)]
-        pub authentication: Vec<core::v1alpha1::ClientAuthenticationDetails<oidc::v1alpha1::ClientAuthenticationMethodOption>>,
+        pub authentication: Vec<
+            core::v1alpha1::ClientAuthenticationDetails<
+                oidc::v1alpha1::ClientAuthenticationMethodOption,
+            >,
+        >,
 
         /// Authorization settings for Druid like OPA
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -851,11 +875,14 @@ pub struct MergedConfig {
     /// Merged configuration of the broker role
     pub brokers: HashMap<String, RoleGroup<BrokerConfig, JavaCommonConfig, DruidConfigOverrides>>,
     /// Merged configuration of the coordinator role
-    pub coordinators: HashMap<String, RoleGroup<CoordinatorConfig, JavaCommonConfig, DruidConfigOverrides>>,
+    pub coordinators:
+        HashMap<String, RoleGroup<CoordinatorConfig, JavaCommonConfig, DruidConfigOverrides>>,
     /// Merged configuration of the historical role
-    pub historicals: HashMap<String, RoleGroup<HistoricalConfig, JavaCommonConfig, DruidConfigOverrides>>,
+    pub historicals:
+        HashMap<String, RoleGroup<HistoricalConfig, JavaCommonConfig, DruidConfigOverrides>>,
     /// Merged configuration of the middle manager role
-    pub middle_managers: HashMap<String, RoleGroup<MiddleManagerConfig, JavaCommonConfig, DruidConfigOverrides>>,
+    pub middle_managers:
+        HashMap<String, RoleGroup<MiddleManagerConfig, JavaCommonConfig, DruidConfigOverrides>>,
     /// Merged configuration of the router role
     pub routers: HashMap<String, RoleGroup<RouterConfig, JavaCommonConfig, DruidConfigOverrides>>,
 }
diff --git a/rust/operator-binary/src/crd/security.rs b/rust/operator-binary/src/crd/security.rs
@@ -214,8 +214,10 @@ impl DruidTlsSecurity {
         // `ResolvedAuthenticationClasses::validate` already checked that the tls AuthenticationClass
         // uses the same SecretClass as the Druid server itself.
         if let Some(secret_class) = &self.server_and_internal_secret_class {
-            let mut secret_volume_source_builder =
-                SecretOperatorVolumeSourceBuilder::new(secret_class, SecretClassVolumeProvisionParts::PublicPrivate);
+            let mut secret_volume_source_builder = SecretOperatorVolumeSourceBuilder::new(
+                secret_class,
+                SecretClassVolumeProvisionParts::PublicPrivate,
+            );
 
             secret_volume_source_builder
                 .with_pod_scope()
diff --git a/rust/operator-binary/src/extensions.rs b/rust/operator-binary/src/extensions.rs
@@ -119,9 +119,11 @@ mod tests {
                             oidc: crate::authentication::oidc::DruidClientAuthenticationOptions {
                                 client_credentials_secret_ref: "".to_string(),
                                 extra_scopes: vec![],
-                                product_specific_fields: oidc::v1alpha1::ClientAuthenticationMethodOption {
-                                    client_authentication_method: oidc::v1alpha1::ClientAuthenticationMethod::default(),
-                                },
+                                product_specific_fields:
+                                    oidc::v1alpha1::ClientAuthenticationMethodOption {
+                                        client_authentication_method:
+                                            oidc::v1alpha1::ClientAuthenticationMethod::default(),
+                                    },
                             }
                         }]
                     })
