move db connection details from dereferenced to the controller and remove derives where they do not exist on the upstream type

Author: adwk67

rust/operator-binary/src/controller.rs

@@ -399,7 +399,7 @@ pub async fn reconcile_hive(
             &validated.image,
             &rolegroup,
             &validated_rg_config.product_config_properties,
-            &dereferenced.metadata_database_connection_details,
+            &validated.metadata_database_connection_details,
             dereferenced.s3_connection_spec.as_ref(),
             &validated_rg_config.merged_config,
             &client.kubernetes_cluster_info,
@@ -411,7 +411,7 @@ pub async fn reconcile_hive(
             &validated.image,
             &rolegroup,
             &validated_rg_config.product_config_properties,
-            &dereferenced.metadata_database_connection_details,
+            &validated.metadata_database_connection_details,
             dereferenced.s3_connection_spec.as_ref(),
             &validated_rg_config.merged_config,
             &rbac_sa.name_any(),

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

@@ -1,7 +1,5 @@
 use snafu::{ResultExt, Snafu};
-use stackable_operator::{
-    crd::s3, database_connections::drivers::jdbc::JdbcDatabaseConnectionDetails, kube::ResourceExt,
-};
+use stackable_operator::{crd::s3, kube::ResourceExt};
 
 use crate::{config::opa::HiveOpaConfig, crd::v1alpha1};
 
@@ -15,11 +13,6 @@ pub enum Error {
         source: s3::v1alpha1::ConnectionError,
     },
 
-    #[snafu(display("invalid metadata database connection"))]
-    InvalidMetadataDatabaseConnection {
-        source: stackable_operator::database_connections::Error,
-    },
-
     #[snafu(display("invalid OPA configuration"))]
     InvalidOpaConfig {
         source: stackable_operator::commons::opa::Error,
@@ -29,7 +22,6 @@ pub enum Error {
 /// External references resolved during the dereference step.
 pub struct DereferencedObjects {
     pub s3_connection_spec: Option<s3::v1alpha1::ConnectionSpec>,
-    pub metadata_database_connection_details: JdbcDatabaseConnectionDetails,
     pub hive_opa_config: Option<HiveOpaConfig>,
 }
 
@@ -52,13 +44,6 @@ pub async fn dereference(
             None
         };
 
-    let metadata_database_connection_details = hive
-        .spec
-        .cluster_config
-        .metadata_database
-        .jdbc_connection_details("METADATA")
-        .context(InvalidMetadataDatabaseConnectionSnafu)?;
-
     let hive_opa_config = match hive.get_opa_config() {
         Some(opa_config) => Some(
             HiveOpaConfig::from_opa_config(client, hive, opa_config)
@@ -70,7 +55,6 @@ pub async fn dereference(
 
     Ok(DereferencedObjects {
         s3_connection_spec,
-        metadata_database_connection_details,
         hive_opa_config,
     })
 }

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

@@ -7,6 +7,7 @@ use product_config::{ProductConfigManager, types::PropertyNameKind};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     commons::product_image_selection::{self, ResolvedProductImage},
+    database_connections::drivers::jdbc::JdbcDatabaseConnectionDetails,
     product_config_utils::{transform_all_roles_to_config, validate_all_roles_and_groups_config},
     role_utils::GenericRoleConfig,
 };
@@ -38,6 +39,11 @@ pub enum Error {
 
     #[snafu(display("failed to resolve and merge config for role and role group"))]
     FailedToResolveConfig { source: crate::crd::Error },
+
+    #[snafu(display("invalid metadata database connection"))]
+    InvalidMetadataDatabaseConnection {
+        source: stackable_operator::database_connections::Error,
+    },
 }
 
 /// Per-role configuration extracted during validation.
@@ -56,11 +62,11 @@ pub struct ValidatedRoleGroupConfig {
 
 /// The validated cluster: proves that product-config validation and config merging
 /// succeeded for every role and role group before any resources are created.
-#[derive(Clone, Debug)]
 pub struct ValidatedHiveCluster {
     pub image: ResolvedProductImage,
     pub role_groups: BTreeMap<String, ValidatedRoleGroupConfig>,
     pub role_config: Option<ValidatedRoleConfig>,
+    pub metadata_database_connection_details: JdbcDatabaseConnectionDetails,
 }
 
 pub fn validate_cluster(
@@ -142,9 +148,17 @@ pub fn validate_cluster(
         );
     }
 
+    let metadata_database_connection_details = hive
+        .spec
+        .cluster_config
+        .metadata_database
+        .jdbc_connection_details("METADATA")
+        .context(InvalidMetadataDatabaseConnectionSnafu)?;
+
     Ok(ValidatedHiveCluster {
         image: resolved_product_image,
         role_groups: group_configs,
         role_config,
+        metadata_database_connection_details,
     })
 }