move validated cluster to the controller which will be the central dependency for subsequent steps

Author: adwk67

rust/operator-binary/src/controller.rs

@@ -92,6 +92,7 @@ use crate::{
         jvm::{construct_hadoop_heapsize_env, construct_non_heap_jvm_args},
         opa::{HiveOpaConfig, OPA_TLS_VOLUME_NAME},
     },
+    controller::validate::{ValidatedRoleConfig, ValidatedRoleGroupConfig},
     crd::{
         APP_NAME, CORE_SITE_XML, Container, HIVE_PORT, HIVE_PORT_NAME, HIVE_SITE_XML,
         HiveClusterStatus, HiveRole, JVM_SECURITY_PROPERTIES_FILE, METRICS_PORT, METRICS_PORT_NAME,
@@ -325,6 +326,17 @@ impl ReconcilerError for Error {
     }
 }
 
+/// The validated cluster: proves that product-config validation and config merging
+/// succeeded for every role and role group before any resources are created.
+/// Placed in the controller so that subsequent steps that reference this struct
+/// only depend on the controller.
+pub struct ValidatedHiveCluster {
+    pub image: ResolvedProductImage,
+    pub role_groups: BTreeMap<String, ValidatedRoleGroupConfig>,
+    pub role_config: Option<ValidatedRoleConfig>,
+    pub metadata_database_connection_details: JdbcDatabaseConnectionDetails,
+}
+
 pub async fn reconcile_hive(
     hive: Arc<DeserializeGuard<v1alpha1::HiveCluster>>,
     ctx: Arc<Ctx>,

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

@@ -6,15 +6,17 @@ use std::{
 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,
+    commons::product_image_selection,
     product_config_utils::{transform_all_roles_to_config, validate_all_roles_and_groups_config},
     role_utils::GenericRoleConfig,
 };
 
-use crate::crd::{
-    HIVE_SITE_XML, HiveRole, JVM_SECURITY_PROPERTIES_FILE, MetaStoreConfig,
-    v1alpha1::{self, HiveMetastoreRoleConfig},
+use crate::{
+    controller::ValidatedHiveCluster,
+    crd::{
+        HIVE_SITE_XML, HiveRole, JVM_SECURITY_PROPERTIES_FILE, MetaStoreConfig,
+        v1alpha1::{self, HiveMetastoreRoleConfig},
+    },
 };
 
 #[derive(Snafu, Debug)]
@@ -60,15 +62,6 @@ pub struct ValidatedRoleGroupConfig {
     pub product_config_properties: HashMap<PropertyNameKind, BTreeMap<String, String>>,
 }
 
-/// The validated cluster: proves that product-config validation and config merging
-/// succeeded for every role and role group before any resources are created.
-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(
     hive: &v1alpha1::HiveCluster,
     image_base_name: &str,