pass dereferenced struct rather than each field

Author: adwk67

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

@@ -12,10 +12,9 @@ use stackable_operator::{
 };
 
 use crate::{
+    controller::dereference::DereferencedObjects,
     crd::{AnyServiceConfig, HbaseRole, v1alpha1},
     hbase_controller::{CONTAINER_IMAGE_BASE_NAME, ValidatedCluster},
-    security::opa::HbaseOpaConfig,
-    zookeeper::ZookeeperConnectionInformation,
 };
 
 #[derive(Snafu, Debug)]
@@ -65,8 +64,7 @@ pub fn validate_cluster(
     hbase: &v1alpha1::HbaseCluster,
     image_repository: &str,
     product_config_manager: &ProductConfigManager,
-    zookeeper_connection_information: ZookeeperConnectionInformation,
-    hbase_opa_config: Option<HbaseOpaConfig>,
+    dereferenced_objects: DereferencedObjects,
 ) -> Result<ValidatedCluster, Error> {
     let resolved_product_image = hbase
         .spec
@@ -132,7 +130,7 @@ pub fn validate_cluster(
         image: resolved_product_image,
         role_groups,
         role_configs,
-        zookeeper_connection_information,
-        hbase_opa_config,
+        zookeeper_connection_information: dereferenced_objects.zookeeper_connection_information,
+        hbase_opa_config: dereferenced_objects.hbase_opa_config,
     })
 }

rust/operator-binary/src/hbase_controller.rs

@@ -311,16 +311,15 @@ pub async fn reconcile_hbase(
 
     let client = &ctx.client;
 
-    let dereferenced = crate::controller::dereference::dereference(client, hbase)
+    let dereferenced_objects = crate::controller::dereference::dereference(client, hbase)
         .await
         .context(DereferenceSnafu)?;
 
     let validated = crate::controller::validate::validate_cluster(
         hbase,
         &ctx.operator_environment.image_repository,
         &ctx.product_config,
-        dereferenced.zookeeper_connection_information,
-        dereferenced.hbase_opa_config,
+        dereferenced_objects,
     )
     .context(ValidateSnafu)?;