added role/From impl for single opa role plus parsing test

Author: adwk67

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

@@ -104,12 +104,6 @@ impl ValidatedCluster {
         format!("{name}-{role}", name = self.name, role = OpaRole::Server)
     }
 
-    /// The single OPA role name (`server`).
-    pub fn role_name() -> RoleName {
-        RoleName::from_str(&OpaRole::Server.to_string())
-            .expect("the server role 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 {
@@ -126,13 +120,13 @@ impl ValidatedCluster {
     ) -> ResourceNames {
         ResourceNames {
             cluster_name: self.name.clone(),
-            role_name: Self::role_name(),
+            role_name: OpaRole::Server.into(),
             role_group_name: role_group_name.clone(),
         }
     }
 
     pub fn recommended_labels(&self, role_group_name: &RoleGroupName) -> Labels {
-        self.recommended_labels_for(&Self::role_name(), role_group_name)
+        self.recommended_labels_for(&OpaRole::Server.into(), role_group_name)
     }
 
     /// Recommended labels for a resource that is not tied to a concrete role,
@@ -164,12 +158,17 @@ impl ValidatedCluster {
 
     /// Selector labels matching the pods of a role group.
     pub fn role_group_selector(&self, role_group_name: &RoleGroupName) -> Labels {
-        role_group_selector(self, &product_name(), &Self::role_name(), role_group_name)
+        role_group_selector(
+            self,
+            &product_name(),
+            &OpaRole::Server.into(),
+            role_group_name,
+        )
     }
 
     /// Selector labels matching all pods of the (single) OPA role.
     pub fn role_selector(&self) -> Labels {
-        role_selector(self, &product_name(), &Self::role_name())
+        role_selector(self, &product_name(), &OpaRole::Server.into())
     }
 
     /// Returns an [`ObjectMetaBuilder`](stackable_operator::builder::meta::ObjectMetaBuilder)
@@ -307,3 +306,21 @@ impl ValidatedOpaConfig {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use stackable_operator::v2::types::operator::RoleName;
+    use strum::IntoEnumIterator;
+
+    use crate::crd::OpaRole;
+
+    /// Locks the invariant behind the `expect` in the `From<OpaRole> for RoleName` impls:
+    /// every `OpaRole` variant (present and future) must serialise to a valid `RoleName`.
+    #[test]
+    fn every_opa_role_serialises_to_a_valid_role_name() {
+        for role in OpaRole::iter() {
+            let _: RoleName = (&role).into();
+            let _: RoleName = role.into();
+        }
+    }
+}

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

@@ -1,3 +1,5 @@
+use std::str::FromStr;
+
 use serde::{Deserialize, Serialize};
 use stackable_operator::{
     commons::{
@@ -21,7 +23,10 @@ use stackable_operator::{
     v2::{
         config_overrides::JsonConfigOverrides,
         role_utils::GenericCommonConfig,
-        types::kubernetes::{ConfigMapName, SecretClassName},
+        types::{
+            kubernetes::{ConfigMapName, SecretClassName},
+            operator::RoleName,
+        },
     },
     versioned::versioned,
 };
@@ -254,6 +259,18 @@ pub enum OpaRole {
     Server,
 }
 
+impl From<OpaRole> for RoleName {
+    fn from(value: OpaRole) -> Self {
+        RoleName::from_str(&value.to_string()).expect("an OpaRole is a valid role name")
+    }
+}
+
+impl From<&OpaRole> for RoleName {
+    fn from(value: &OpaRole) -> Self {
+        RoleName::from_str(&value.to_string()).expect("an OpaRole is a valid role name")
+    }
+}
+
 // TODO (@Techassi): Support versioned status
 #[derive(Clone, Default, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]