resource name function rename and role parse test

Author: adwk67

rust/operator-binary/src/controller.rs

@@ -228,7 +228,7 @@ impl ValidatedCluster {
         }
     }
 
-    pub fn resource_names(
+    pub fn role_group_resource_names(
         &self,
         role: &SupersetRole,
         role_group_name: &RoleGroupName,
@@ -242,7 +242,7 @@ 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(),

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

@@ -49,7 +49,7 @@ pub fn build_rolegroup_config_map(
             validated
                 .object_meta(
                     validated
-                        .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/deployment.rs

@@ -67,7 +67,7 @@ pub fn build_rolegroup_deployment(
 ) -> Result<Deployment> {
     let merged_config = &rolegroup_config.config;
 
-    let resource_names = validated.resource_names(superset_role, role_group_name);
+    let resource_names = validated.role_group_resource_names(superset_role, role_group_name);
     let recommended_object_labels = validated.recommended_labels(superset_role, role_group_name);
 
     // The Celery process command, liveness probe and replica policy are the only differences
@@ -103,7 +103,7 @@ pub fn build_rolegroup_deployment(
         .affinity(&merged_config.affinity)
         .service_account_name(
             validated
-                .rbac_resource_names()
+                .cluster_resource_names()
                 .service_account_name()
                 .to_string(),
         );

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

@@ -253,7 +253,7 @@ pub(crate) fn build_vector_container(
                 &Container::Vector.to_container_name(),
                 &validated.image,
                 vector_log_config,
-                &validated.resource_names(superset_role, role_group_name),
+                &validated.role_group_resource_names(superset_role, role_group_name),
                 &CONFIG_VOLUME_NAME,
                 &LOG_VOLUME_NAME,
                 EnvVarSet::new(),

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

@@ -28,7 +28,7 @@ pub fn build_rolegroup_headless_service(
         metadata: validated
             .object_meta(
                 validated
-                    .resource_names(role, role_group_name)
+                    .role_group_resource_names(role, role_group_name)
                     .headless_service_name()
                     .to_string(),
                 role,
@@ -54,7 +54,7 @@ pub fn build_rolegroup_metrics_service(
     role: &SupersetRole,
     role_group_name: &RoleGroupName,
 ) -> Service {
-    let resource_names = validated.resource_names(role, role_group_name);
+    let resource_names = validated.role_group_resource_names(role, role_group_name);
     Service {
         metadata: validated
             .object_meta(

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

@@ -97,7 +97,7 @@ pub fn build_node_rolegroup_statefulset(
 ) -> Result<StatefulSet> {
     let merged_config = &rolegroup_config.config;
 
-    let resource_names = validated.resource_names(superset_role, role_group_name);
+    let resource_names = validated.role_group_resource_names(superset_role, role_group_name);
     let recommended_object_labels = validated.recommended_labels(superset_role, role_group_name);
     // Used for PVC templates that cannot be modified once they are deployed (a constant "none"
     // version keeps the labels stable across version upgrades).
@@ -119,7 +119,7 @@ pub fn build_node_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/crd/mod.rs

@@ -604,8 +604,18 @@ impl v1alpha1::SupersetCluster {
 #[cfg(test)]
 mod tests {
     use stackable_operator::versioned::test_utils::RoundtripTestData;
+    use strum::IntoEnumIterator;
 
-    use super::v1alpha1;
+    use super::{SupersetRole, v1alpha1};
+
+    /// Locks the invariant behind the `expect` in [`SupersetRole::role_name`]: every
+    /// `SupersetRole` variant (present and future) must serialise to a valid `RoleName`.
+    #[test]
+    fn every_superset_role_serialises_to_a_valid_role_name() {
+        for role in SupersetRole::iter() {
+            role.role_name();
+        }
+    }
 
     impl RoundtripTestData for v1alpha1::SupersetClusterSpec {
         fn roundtrip_test_data() -> Vec<Self> {