rename resource names functions, add role parse test

Author: adwk67

rust/operator-binary/src/controller/build/container.rs

@@ -237,7 +237,7 @@ impl ContainerConfig {
 
         // HDFS main container
         let main_container_config = Self::from(*role);
-        let resource_names = cluster.resource_names(role, role_group_name);
+        let resource_names = cluster.role_group_resource_names(role, role_group_name);
         let object_name = resource_names.qualified_role_group_name().to_string();
         let merged_config = &rolegroup_config.config;
 
@@ -285,7 +285,7 @@ impl ContainerConfig {
                     log_config,
                     vector_aggregator_config_map_name,
                 },
-                &cluster.resource_names(role, role_group_name),
+                &cluster.role_group_resource_names(role, role_group_name),
                 &VECTOR_CONFIG_VOLUME_NAME,
                 &VECTOR_LOG_VOLUME_NAME,
                 EnvVarSet::new(),

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

@@ -192,7 +192,7 @@ pub(crate) fn rolegroup_metadata(
 ) -> ObjectMetaBuilder {
     cluster.object_meta(
         cluster
-            .resource_names(role, role_group_name)
+            .role_group_resource_names(role, role_group_name)
             .qualified_role_group_name()
             .to_string(),
         cluster.recommended_labels(role, role_group_name),

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

@@ -106,7 +106,7 @@ pub(crate) fn rolegroup_metrics_service(
         metadata: cluster
             .object_meta(
                 cluster
-                    .resource_names(role, role_group_name)
+                    .role_group_resource_names(role, role_group_name)
                     .metrics_service_name()
                     .to_string(),
                 cluster.recommended_labels(role, role_group_name),

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

@@ -70,7 +70,7 @@ pub(crate) fn build_rolegroup_statefulset(
         .affinity(&merged_config.affinity)
         .service_account_name(
             validated
-                .rbac_resource_names()
+                .cluster_resource_names()
                 .service_account_name()
                 .to_string(),
         )

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

@@ -155,15 +155,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 the given role group.
-    pub(crate) fn resource_names(
+    pub(crate) fn role_group_resource_names(
         &self,
         role: &HdfsNodeRole,
         role_group_name: &RoleGroupName,
@@ -238,7 +238,7 @@ impl ValidatedCluster {
         role_group_name: &RoleGroupName,
     ) -> ServiceName {
         ServiceName::from_str(
-            self.resource_names(role, role_group_name)
+            self.role_group_resource_names(role, role_group_name)
                 .qualified_role_group_name()
                 .as_ref(),
         )
@@ -379,3 +379,20 @@ impl ValidatedClusterConfig {
 pub struct ValidatedRoleConfig {
     pub pdb: stackable_operator::commons::pdb::PdbConfig,
 }
+
+#[cfg(test)]
+mod tests {
+    use strum::IntoEnumIterator;
+
+    use super::ValidatedCluster;
+    use crate::crd::HdfsNodeRole;
+
+    /// Locks the invariant behind the `expect` in [`ValidatedCluster::role_name`]: every
+    /// `HdfsNodeRole` variant (present and future) must serialise to a valid `RoleName`.
+    #[test]
+    fn every_hdfs_node_role_serialises_to_a_valid_role_name() {
+        for role in HdfsNodeRole::iter() {
+            ValidatedCluster::role_name(&role);
+        }
+    }
+}