rename resource names functions, add role parse test

Author: adwk67

rust/operator-binary/src/controller/build/resource/config_map.rs

@@ -111,7 +111,7 @@ pub fn build_rolegroup_config_map(
     let cm_metadata = cluster
         .object_meta(
             cluster
-                .resource_names(role, role_group_name)
+                .role_group_resource_names(role, role_group_name)
                 .role_group_config_map()
                 .to_string(),
             role,

rust/operator-binary/src/controller/build/resource/rbac.rs

@@ -20,7 +20,7 @@ stackable_operator::constant!(NONE_ROLE_GROUP_NAME: RoleGroupName = "none");
 pub fn build_service_account(cluster: &ValidatedCluster) -> ServiceAccount {
     rbac::build_service_account(
         cluster,
-        &cluster.rbac_resource_names(),
+        &cluster.cluster_resource_names(),
         rbac_labels(cluster),
     )
 }
@@ -30,7 +30,7 @@ pub fn build_service_account(cluster: &ValidatedCluster) -> ServiceAccount {
 pub fn build_role_binding(cluster: &ValidatedCluster) -> RoleBinding {
     rbac::build_role_binding(
         cluster,
-        &cluster.rbac_resource_names(),
+        &cluster.cluster_resource_names(),
         rbac_labels(cluster),
     )
 }

rust/operator-binary/src/controller/build/resource/service.rs

@@ -35,7 +35,7 @@ pub fn build_rolegroup_service(
         metadata: cluster
             .object_meta(
                 cluster
-                    .resource_names(hbase_role, role_group_name)
+                    .role_group_resource_names(hbase_role, role_group_name)
                     .headless_service_name()
                     .to_string(),
                 hbase_role,
@@ -77,7 +77,7 @@ pub fn build_rolegroup_metrics_service(
         metadata: cluster
             .object_meta(
                 cluster
-                    .resource_names(hbase_role, role_group_name)
+                    .role_group_resource_names(hbase_role, role_group_name)
                     .metrics_service_name()
                     .to_string(),
                 hbase_role,

rust/operator-binary/src/controller/build/resource/statefulset.rs

@@ -110,7 +110,7 @@ pub fn build_rolegroup_statefulset(
     let resolved_product_image = &cluster.image;
     let merged_config = &validated_rg_config.config.config;
     let logging = &validated_rg_config.config.logging;
-    let resource_names = cluster.resource_names(hbase_role, role_group_name);
+    let resource_names = cluster.role_group_resource_names(hbase_role, role_group_name);
     let https_enabled = cluster.has_https_enabled();
 
     let ports = hbase_role
@@ -240,7 +240,7 @@ pub fn build_rolegroup_statefulset(
         .context(AddVolumeSnafu)?
         .service_account_name(
             cluster
-                .rbac_resource_names()
+                .cluster_resource_names()
                 .service_account_name()
                 .to_string(),
         )

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

@@ -138,15 +138,15 @@ impl ValidatedCluster {
 
     /// Type-safe names for the per-cluster RBAC resources: the ServiceAccount shared by all
     /// Pods, its (namespaced) RoleBinding, and the operator-deployed ClusterRole it binds.
-    pub fn rbac_resource_names(&self) -> role_utils::ResourceNames {
+    pub fn cluster_resource_names(&self) -> role_utils::ResourceNames {
         role_utils::ResourceNames {
             cluster_name: self.name.clone(),
             product_name: product_name(),
         }
     }
 
     /// Type-safe names for the resources of a given role group.
-    pub(crate) fn resource_names(
+    pub(crate) fn role_group_resource_names(
         &self,
         hbase_role: &HbaseRole,
         role_group_name: &RoleGroupName,
@@ -323,3 +323,20 @@ pub type HbaseRoleGroupConfig = stackable_operator::v2::role_utils::RoleGroupCon
     stackable_operator::v2::role_utils::JavaCommonConfig,
     v1alpha1::HbaseConfigOverrides,
 >;
+
+#[cfg(test)]
+mod tests {
+    use strum::IntoEnumIterator;
+
+    use super::ValidatedCluster;
+    use crate::crd::HbaseRole;
+
+    /// Locks the invariant behind the `expect` in [`ValidatedCluster::role_name`]: every
+    /// `HbaseRole` variant (present and future) must serialise to a valid `RoleName`.
+    #[test]
+    fn every_hbase_role_serialises_to_a_valid_role_name() {
+        for role in HbaseRole::iter() {
+            ValidatedCluster::role_name(&role);
+        }
+    }
+}