move validated struct to controller, add dereferenced fields to validated cluster struct

Author: adwk67

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

@@ -6,14 +6,16 @@ use std::{
 use product_config::{ProductConfigManager, types::PropertyNameKind};
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
-    commons::product_image_selection::{self, ResolvedProductImage},
+    commons::product_image_selection::{self},
     product_config_utils::{transform_all_roles_to_config, validate_all_roles_and_groups_config},
     role_utils::GenericRoleConfig,
 };
 
 use crate::{
     crd::{AnyServiceConfig, HbaseRole, v1alpha1},
-    hbase_controller::CONTAINER_IMAGE_BASE_NAME,
+    hbase_controller::{CONTAINER_IMAGE_BASE_NAME, ValidatedCluster},
+    security::opa::HbaseOpaConfig,
+    zookeeper::ZookeeperConnectionInformation,
 };
 
 #[derive(Snafu, Debug)]
@@ -59,21 +61,14 @@ 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.
-#[derive(Clone, Debug)]
-pub struct ValidatedHbaseCluster {
-    pub image: ResolvedProductImage,
-    pub role_groups: BTreeMap<HbaseRole, BTreeMap<String, ValidatedRoleGroupConfig>>,
-    pub role_configs: BTreeMap<HbaseRole, ValidatedRoleConfig>,
-}
-
 pub fn validate_cluster(
     hbase: &v1alpha1::HbaseCluster,
     image_repository: &str,
     pkg_version: &str,
     product_config_manager: &ProductConfigManager,
-) -> Result<ValidatedHbaseCluster, Error> {
+    zookeeper_connection_information: ZookeeperConnectionInformation,
+    hbase_opa_config: Option<HbaseOpaConfig>,
+) -> Result<ValidatedCluster, Error> {
     let resolved_product_image = hbase
         .spec
         .image
@@ -130,9 +125,11 @@ pub fn validate_cluster(
         role_groups.insert(hbase_role, group_configs);
     }
 
-    Ok(ValidatedHbaseCluster {
+    Ok(ValidatedCluster {
         image: resolved_product_image,
         role_groups,
         role_configs,
+        zookeeper_connection_information,
+        hbase_opa_config,
     })
 }

rust/operator-binary/src/hbase_controller.rs

@@ -71,6 +71,7 @@ use crate::{
         construct_global_jvm_args, construct_hbase_heapsize_env,
         construct_role_specific_non_heap_jvm_args,
     },
+    controller::validate::{ValidatedRoleConfig, ValidatedRoleGroupConfig},
     crd::{
         APP_NAME, AnyServiceConfig, Container, HBASE_ENV_SH, HBASE_MASTER_PORT,
         HBASE_MASTER_UI_PORT, HBASE_REGIONSERVER_PORT, HBASE_REGIONSERVER_UI_PORT, HBASE_SITE_XML,
@@ -111,6 +112,19 @@ pub struct Ctx {
     pub operator_environment: OperatorEnvironmentOptions,
 }
 
+/// 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.
+#[derive(Clone, Debug)]
+pub struct ValidatedCluster {
+    pub image: ResolvedProductImage,
+    pub role_groups: BTreeMap<HbaseRole, BTreeMap<String, ValidatedRoleGroupConfig>>,
+    pub role_configs: BTreeMap<HbaseRole, ValidatedRoleConfig>,
+    pub zookeeper_connection_information: ZookeeperConnectionInformation,
+    pub hbase_opa_config: Option<HbaseOpaConfig>,
+}
+
 #[derive(Snafu, Debug, EnumDiscriminants)]
 #[strum_discriminants(derive(IntoStaticStr))]
 pub enum Error {
@@ -307,6 +321,8 @@ pub async fn reconcile_hbase(
         &ctx.operator_environment.image_repository,
         crate::built_info::PKG_VERSION,
         &ctx.product_config,
+        dereferenced.zookeeper_connection_information,
+        dereferenced.hbase_opa_config,
     )
     .context(ValidateSnafu)?;
 
@@ -354,10 +370,10 @@ pub async fn reconcile_hbase(
                 &client.kubernetes_cluster_info,
                 &rolegroup,
                 &validated_rg_config.product_config_properties,
-                &dereferenced.zookeeper_connection_information,
+                &validated.zookeeper_connection_information,
                 &validated_rg_config.merged_config,
                 &validated.image,
-                dereferenced.hbase_opa_config.as_ref(),
+                validated.hbase_opa_config.as_ref(),
             )?;
             let rg_statefulset = build_rolegroup_statefulset(
                 hbase,
@@ -418,7 +434,7 @@ pub async fn reconcile_hbase(
     let discovery_cm = build_discovery_configmap(
         hbase,
         &client.kubernetes_cluster_info,
-        &dereferenced.zookeeper_connection_information,
+        &validated.zookeeper_connection_information,
         &validated.image,
     )
     .context(BuildDiscoveryConfigMapSnafu)?;

rust/operator-binary/src/security/opa.rs

@@ -19,6 +19,7 @@ pub enum Error {
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
+#[derive(Clone, Debug)]
 pub struct HbaseOpaConfig {
     authorization_connection_string: String,
     dry_run: bool,

rust/operator-binary/src/zookeeper.rs

@@ -43,6 +43,7 @@ pub enum Error {
 type Result<T, E = Error> = std::result::Result<T, E>;
 
 /// Contains the information as exposed by the Zookeeper/Znode discovery CM (should work with both)
+#[derive(Clone, Debug)]
 pub struct ZookeeperConnectionInformation {
     /// E.g. `simple-zk-server-default-0.simple-zk-server-default.default.svc.cluster.local:2282,simple-zk-server-default-1.simple-zk-server-default.default.svc.cluster.local:2282,simple-zk-server-default-2.simple-zk-server-default.default.svc.cluster.local:2282`
     hosts: String,