add impls for role/from and parsing test. Fixed comment

Author: adwk67

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

@@ -51,9 +51,7 @@ pub enum Error {
 ///
 /// Does not need a Kubernetes client: every reference to another Kubernetes resource is already
 /// dereferenced and validated by this point, so the errors returned here are resource-assembly
-/// failures only. `cluster_info` is static cluster metadata (not a client call), and
-/// `service_account_name` is the name of the RBAC `ServiceAccount` the role-group Pods run under
-/// (RBAC resources are built and applied separately, in the reconcile step).
+/// failures only. `cluster_info` is static cluster metadata (not a client call).
 pub fn build(
     cluster: &ValidatedCluster,
     cluster_info: &KubernetesClusterInfo,

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

@@ -27,7 +27,7 @@ pub fn build_pdb(
     let pdb = pod_disruption_budget_builder_with_role(
         cluster,
         &product_name(),
-        &ValidatedCluster::role_name(role),
+        &role.into(),
         &operator_name(),
         &controller_name(),
     )

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

@@ -130,12 +130,6 @@ impl ValidatedCluster {
         }
     }
 
-    /// The Kubernetes role name for an [`HbaseRole`] (e.g. `master`, `regionserver`,
-    /// `restserver`).
-    pub fn role_name(hbase_role: &HbaseRole) -> RoleName {
-        RoleName::from_str(&hbase_role.to_string()).expect("an HbaseRole name is a valid role name")
-    }
-
     /// 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 cluster_resource_names(&self) -> role_utils::ResourceNames {
@@ -153,14 +147,14 @@ impl ValidatedCluster {
     ) -> ResourceNames {
         ResourceNames {
             cluster_name: self.name.clone(),
-            role_name: Self::role_name(hbase_role),
+            role_name: hbase_role.into(),
             role_group_name: role_group_name.clone(),
         }
     }
 
     /// Recommended labels for a role-group resource.
     pub fn recommended_labels(&self, role: &HbaseRole, role_group_name: &RoleGroupName) -> Labels {
-        self.recommended_labels_for(&Self::role_name(role), role_group_name)
+        self.recommended_labels_for(&role.into(), role_group_name)
     }
 
     /// Recommended labels for a resource that is not tied to a concrete [`HbaseRole`] (e.g. the
@@ -196,12 +190,7 @@ impl ValidatedCluster {
         hbase_role: &HbaseRole,
         role_group_name: &RoleGroupName,
     ) -> Labels {
-        role_group_selector(
-            self,
-            &product_name(),
-            &Self::role_name(hbase_role),
-            role_group_name,
-        )
+        role_group_selector(self, &product_name(), &hbase_role.into(), role_group_name)
     }
 
     /// Returns an [`ObjectMetaBuilder`] pre-filled with the namespace, an owner reference back to
@@ -326,17 +315,18 @@ pub type HbaseRoleGroupConfig = stackable_operator::v2::role_utils::RoleGroupCon
 
 #[cfg(test)]
 mod tests {
+    use stackable_operator::v2::types::operator::RoleName;
     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`.
+    /// Locks the invariant behind the `expect` in the `From<HbaseRole> for RoleName` impls:
+    /// 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);
+            let _: RoleName = (&role).into();
+            let _: RoleName = role.into();
         }
     }
 }

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

@@ -30,6 +30,7 @@ use stackable_operator::{
         types::{
             common::Port,
             kubernetes::{ConfigMapName, ListenerClassName, SecretClassName, VolumeName},
+            operator::RoleName,
         },
     },
     versioned::versioned,
@@ -262,6 +263,18 @@ pub enum HbaseRole {
     RestServer,
 }
 
+impl From<HbaseRole> for RoleName {
+    fn from(value: HbaseRole) -> Self {
+        RoleName::from_str(&value.to_string()).expect("an HbaseRole name is a valid role name")
+    }
+}
+
+impl From<&HbaseRole> for RoleName {
+    fn from(value: &HbaseRole) -> Self {
+        RoleName::from_str(&value.to_string()).expect("an HbaseRole name is a valid role name")
+    }
+}
+
 impl HbaseRole {
     const DEFAULT_MASTER_GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_minutes_unchecked(20);
     // Auto TLS certificate lifetime