fix: change paramter order & fmt

Author: maltesander

rust/operator-binary/src/controller/build/config_map.rs

@@ -58,12 +58,12 @@ pub enum Error {
 type Result<T, E = Error> = std::result::Result<T, E>;
 
 pub fn build_rolegroup_config_map(
-    // `hbase` is retained only for the ConfigMap ObjectMeta / owner reference; the rendered
-    // content comes entirely from `cluster`. To be decoupled in a follow-up.
-    hbase: &v1alpha1::HbaseCluster,
     cluster: &ValidatedCluster,
     role: &HbaseRole,
     rolegroup_ref: &RoleGroupRef<v1alpha1::HbaseCluster>,
+    // `owner` is retained only for the ConfigMap ObjectMeta / owner reference; the rendered
+    // content comes entirely from `cluster`. To be decoupled in a follow-up.
+    owner_ref: &v1alpha1::HbaseCluster,
 ) -> Result<ConfigMap> {
     tracing::info!("Setting up ConfigMap for {:?}", rolegroup_ref);
 
@@ -108,18 +108,20 @@ pub fn build_rolegroup_config_map(
         overrides.ssl_client_xml.clone(),
     );
 
-    let security_properties = security_properties::build(role, overrides.security_properties.clone())
-        .with_context(|_| JvmSecurityPropertiesSnafu {
-            role_group: rolegroup_ref.role_group.clone(),
-        })?;
+    let security_properties =
+        security_properties::build(role, overrides.security_properties.clone()).with_context(
+            |_| JvmSecurityPropertiesSnafu {
+                role_group: rolegroup_ref.role_group.clone(),
+            },
+        )?;
 
     let cm_metadata = ObjectMetaBuilder::new()
-        .name_and_namespace(hbase)
+        .name_and_namespace(owner_ref)
         .name(rolegroup_ref.object_name())
-        .ownerreference_from_resource(hbase, None, Some(true))
+        .ownerreference_from_resource(owner_ref, None, Some(true))
         .context(ObjectMissingMetadataForOwnerRefSnafu)?
         .with_recommended_labels(&build_recommended_labels(
-            hbase,
+            owner_ref,
             &cluster.image.app_version_label_value,
             &rolegroup_ref.role,
             &rolegroup_ref.role_group,
@@ -143,10 +145,11 @@ pub fn build_rolegroup_config_map(
         builder.add_data(ConfigFileName::SslClient.to_string(), ssl_client_xml);
     }
 
-    extend_role_group_config_map(rolegroup_ref, rg.merged_config.logging(), &mut builder)
-        .context(InvalidLoggingConfigSnafu {
+    extend_role_group_config_map(rolegroup_ref, rg.merged_config.logging(), &mut builder).context(
+        InvalidLoggingConfigSnafu {
             cm_name: rolegroup_ref.object_name(),
-        })?;
+        },
+    )?;
 
     builder.build().with_context(|_| AssembleSnafu {
         role: rolegroup_ref.role.clone(),

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

@@ -123,9 +123,6 @@ mod tests {
             config_overrides(&[("CUSTOM_VAR", "custom_value")]),
         )
         .unwrap();
-        assert!(
-            env.contains("export CUSTOM_VAR=\"custom_value\""),
-            "{env}"
-        );
+        assert!(env.contains("export CUSTOM_VAR=\"custom_value\""), "{env}");
     }
 }

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

@@ -183,9 +183,7 @@ mod tests {
             config_overrides(&[]),
         );
         assert!(
-            xml.contains(
-                "<name>hbase.regionserver.ipc.address</name>\n    <value>0.0.0.0</value>"
-            ),
+            xml.contains("<name>hbase.regionserver.ipc.address</name>\n    <value>0.0.0.0</value>"),
             "{xml}"
         );
         assert!(

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

@@ -29,10 +29,7 @@ mod tests {
     #[test]
     fn settings_appear_in_xml() {
         let xml = build(
-            BTreeMap::from([(
-                "ssl.server.keystore.type".to_string(),
-                "pkcs12".to_string(),
-            )]),
+            BTreeMap::from([("ssl.server.keystore.type".to_string(), "pkcs12".to_string())]),
             config_overrides(&[]),
         );
         assert!(

rust/operator-binary/src/controller/validate.rs

@@ -20,7 +20,8 @@ use crate::{
         ValidatedRoleGroupConfig,
     },
     kerberos::{
-        self, kerberos_config_properties, kerberos_ssl_client_settings, kerberos_ssl_server_settings,
+        self, kerberos_config_properties, kerberos_ssl_client_settings,
+        kerberos_ssl_server_settings,
     },
 };
 
@@ -130,8 +131,7 @@ pub fn validate_cluster(
         name: ClusterName::from_str(&hbase.name_any()).context(InvalidClusterNameSnafu)?,
         image: resolved_product_image,
         cluster_config: ValidatedClusterConfig {
-            zookeeper_connection_information: dereferenced_objects
-                .zookeeper_connection_information,
+            zookeeper_connection_information: dereferenced_objects.zookeeper_connection_information,
             hbase_opa_config: dereferenced_objects.hbase_opa_config,
             kerberos_enabled: hbase.has_kerberos_enabled(),
             hbase_site_kerberos_config,
@@ -334,7 +334,10 @@ spec:
 
         let env_overrides = merged_env_overrides(&hbase, &HbaseRole::Master, "default");
 
-        assert_eq!(env_overrides.get("TEST_VAR"), Some(&"MASTER_RG".to_string()));
+        assert_eq!(
+            env_overrides.get("TEST_VAR"),
+            Some(&"MASTER_RG".to_string())
+        );
         assert_eq!(
             env_overrides.get("TEST_VAR_FROM_MASTER"),
             Some(&"MASTER".to_string())

rust/operator-binary/src/discovery.rs

@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;
 
-use crate::config::writer::to_hadoop_xml;
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     builder::{configmap::ConfigMapBuilder, meta::ObjectMetaBuilder},
@@ -11,6 +10,7 @@ use stackable_operator::{
 };
 
 use crate::{
+    config::writer::to_hadoop_xml,
     crd::{HBASE_SITE_XML, HbaseRole, v1alpha1},
     hbase_controller::build_recommended_labels,
     kerberos::{self, kerberos_discovery_config_properties},

rust/operator-binary/src/hbase_controller.rs

@@ -345,10 +345,10 @@ pub async fn reconcile_hbase(
             )?;
 
             let rg_configmap = crate::controller::build::config_map::build_rolegroup_config_map(
-                hbase,
                 &validated_cluster,
                 hbase_role,
                 &rolegroup,
+                hbase,
             )
             .context(BuildRolegroupConfigMapSnafu)?;
             let rg_statefulset = build_rolegroup_statefulset(