formatting

Author: adwk67

rust/operator-binary/src/controller/build/properties/broker_properties.rs

@@ -2,22 +2,21 @@ use std::collections::BTreeMap;
 
 use snafu::OptionExt;
 
+use super::{Error, NoKraftControllersFoundSnafu, kraft_controllers};
 use crate::{
     crd::{
         KafkaPodDescriptor,
         listener::{KafkaListenerConfig, KafkaListenerName},
         role::{
-            KAFKA_ADVERTISED_LISTENERS, KAFKA_BROKER_ID,
-            KAFKA_CONTROLLER_QUORUM_BOOTSTRAP_SERVERS, KAFKA_LISTENER_SECURITY_PROTOCOL_MAP,
-            KAFKA_LISTENERS, KAFKA_LOG_DIRS, KAFKA_NODE_ID, KAFKA_PROCESS_ROLES, KafkaRole,
+            KAFKA_ADVERTISED_LISTENERS, KAFKA_BROKER_ID, KAFKA_CONTROLLER_QUORUM_BOOTSTRAP_SERVERS,
+            KAFKA_LISTENER_SECURITY_PROTOCOL_MAP, KAFKA_LISTENERS, KAFKA_LOG_DIRS, KAFKA_NODE_ID,
+            KAFKA_PROCESS_ROLES, KafkaRole,
         },
         security::KafkaTlsSecurity,
     },
     operations::graceful_shutdown::graceful_shutdown_config_properties,
 };
 
-use super::{Error, NoKraftControllersFoundSnafu, kraft_controllers};
-
 pub fn build(
     kafka_security: &KafkaTlsSecurity,
     listener_config: &KafkaListenerConfig,

rust/operator-binary/src/controller/build/properties/controller_properties.rs

@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 
 use snafu::OptionExt;
 
+use super::{Error, NoKraftControllersFoundSnafu, kraft_controllers};
 use crate::{
     crd::{
         KafkaPodDescriptor,
@@ -15,16 +16,15 @@ use crate::{
     operations::graceful_shutdown::graceful_shutdown_config_properties,
 };
 
-use super::{Error, NoKraftControllersFoundSnafu, kraft_controllers};
-
 pub fn build(
     kafka_security: &KafkaTlsSecurity,
     listener_config: &KafkaListenerConfig,
     pod_descriptors: &[KafkaPodDescriptor],
     kraft_mode: bool,
     overrides: BTreeMap<String, String>,
 ) -> Result<BTreeMap<String, String>, Error> {
-    let kraft_controllers = kraft_controllers(pod_descriptors).context(NoKraftControllersFoundSnafu)?;
+    let kraft_controllers =
+        kraft_controllers(pod_descriptors).context(NoKraftControllersFoundSnafu)?;
 
     let mut result = BTreeMap::from([
         (

rust/operator-binary/src/resource/configmap.rs

@@ -96,21 +96,19 @@ pub fn build_rolegroup_config_map(
         .unwrap_or_default();
 
     let kafka_config = match merged_config {
-        AnyConfig::Broker(_) => {
-            crate::controller::build::properties::broker_properties::build(
-                kafka_security,
-                listener_config,
-                pod_descriptors,
-                opa_connect_string,
-                metadata_manager == MetadataManager::KRaft,
-                kafka
-                    .spec
-                    .cluster_config
-                    .broker_id_pod_config_map_name
-                    .is_some(),
-                overrides,
-            )
-        }
+        AnyConfig::Broker(_) => crate::controller::build::properties::broker_properties::build(
+            kafka_security,
+            listener_config,
+            pod_descriptors,
+            opa_connect_string,
+            metadata_manager == MetadataManager::KRaft,
+            kafka
+                .spec
+                .cluster_config
+                .broker_id_pod_config_map_name
+                .is_some(),
+            overrides,
+        ),
         AnyConfig::Controller(_) => {
             crate::controller::build::properties::controller_properties::build(
                 kafka_security,