pass dereferenced struct rather than each field

Author: adwk67

rust/operator-binary/src/controller.rs

@@ -352,16 +352,15 @@ pub async fn reconcile_hive(
     let client = &ctx.client;
     let hive_namespace = hive.namespace().context(ObjectHasNoNamespaceSnafu)?;
 
-    let dereferenced = crate::controller::dereference::dereference(client, hive)
+    let dereferenced_objects = crate::controller::dereference::dereference(client, hive)
         .await
         .context(DereferenceSnafu)?;
 
     let validated = validate::validate_cluster(
         hive,
         &ctx.operator_environment.image_repository,
         &ctx.product_config,
-        dereferenced.s3_connection_spec,
-        dereferenced.hive_opa_config,
+        dereferenced_objects,
     )
     .context(ValidateSnafu)?;
 

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

@@ -7,14 +7,12 @@ use product_config::{ProductConfigManager, types::PropertyNameKind};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     commons::product_image_selection,
-    crd::s3,
     product_config_utils::{transform_all_roles_to_config, validate_all_roles_and_groups_config},
     role_utils::GenericRoleConfig,
 };
 
 use crate::{
-    config::opa::HiveOpaConfig,
-    controller::{CONTAINER_IMAGE_BASE_NAME, ValidatedCluster},
+    controller::{CONTAINER_IMAGE_BASE_NAME, ValidatedCluster, dereference::DereferencedObjects},
     crd::{
         HIVE_SITE_XML, HiveRole, JVM_SECURITY_PROPERTIES_FILE, MetaStoreConfig,
         v1alpha1::{self, HiveMetastoreRoleConfig},
@@ -68,8 +66,7 @@ pub fn validate_cluster(
     hive: &v1alpha1::HiveCluster,
     image_repository: &str,
     product_config_manager: &ProductConfigManager,
-    s3_connection_spec: Option<s3::v1alpha1::ConnectionSpec>,
-    hive_opa_config: Option<HiveOpaConfig>,
+    dereferenced_objects: DereferencedObjects,
 ) -> Result<ValidatedCluster, Error> {
     let resolved_product_image = hive
         .spec
@@ -159,7 +156,7 @@ pub fn validate_cluster(
         role_groups: group_configs,
         role_config,
         metadata_database_connection_details,
-        s3_connection_spec,
-        hive_opa_config,
+        s3_connection_spec: dereferenced_objects.s3_connection_spec,
+        hive_opa_config: dereferenced_objects.hive_opa_config,
     })
 }