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

Author: adwk67

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

@@ -67,9 +67,6 @@ 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.
-///
-/// `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).
 pub fn build(cluster: &ValidatedCluster) -> Result<KubernetesResources, Error> {
     let mut stateful_sets = vec![];
     let mut services = vec![];

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

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

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

@@ -253,12 +253,6 @@ impl ValidatedCluster {
         }
     }
 
-    /// The single NiFi role name (`node`).
-    pub fn role_name() -> RoleName {
-        RoleName::from_str(&NifiRole::Node.to_string())
-            .expect("the node 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 {
@@ -275,14 +269,14 @@ impl ValidatedCluster {
     ) -> ResourceNames {
         ResourceNames {
             cluster_name: self.name.clone(),
-            role_name: Self::role_name(),
+            role_name: NifiRole::Node.into(),
             role_group_name: role_group_name.clone(),
         }
     }
 
     /// Recommended labels for a role-group resource.
     pub fn recommended_labels(&self, role_group_name: &RoleGroupName) -> Labels {
-        self.recommended_labels_for(&Self::role_name(), role_group_name)
+        self.recommended_labels_for(&NifiRole::Node.into(), role_group_name)
     }
 
     /// Recommended labels for a resource that is not tied to a concrete role, using a free-form role/role-group label value.
@@ -299,7 +293,7 @@ impl ValidatedCluster {
     pub fn unversioned_recommended_labels(&self, role_group_name: &RoleGroupName) -> Labels {
         self.recommended_labels_with(
             &UNVERSIONED_PRODUCT_VERSION,
-            &Self::role_name(),
+            &NifiRole::Node.into(),
             role_group_name,
         )
     }
@@ -323,7 +317,12 @@ 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(),
+            &NifiRole::Node.into(),
+            role_group_name,
+        )
     }
 
     /// Returns an [`ObjectMetaBuilder`](stackable_operator::builder::meta::ObjectMetaBuilder)
@@ -418,3 +417,21 @@ impl Resource for ValidatedCluster {
         &mut self.metadata
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use stackable_operator::v2::types::operator::RoleName;
+    use strum::IntoEnumIterator;
+
+    use crate::crd::NifiRole;
+
+    /// Locks the invariant behind the `expect` in the `From<NifiRole> for RoleName` impls:
+    /// every `NifiRole` variant (present and future) must serialise to a valid `RoleName`.
+    #[test]
+    fn every_nifi_role_serialises_to_a_valid_role_name() {
+        for role in NifiRole::iter() {
+            let _: RoleName = (&role).into();
+            let _: RoleName = role.into();
+        }
+    }
+}

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

@@ -36,7 +36,7 @@ use stackable_operator::{
         role_utils::JavaCommonConfig,
         types::{
             kubernetes::{ConfigMapName, ListenerClassName, SecretClassName},
-            operator::ProductVersion,
+            operator::{ProductVersion, RoleName},
         },
     },
     versioned::versioned,
@@ -224,7 +224,17 @@ pub fn default_allow_all() -> bool {
 }
 
 #[derive(
-    Clone, Debug, Deserialize, Eq, JsonSchema, Ord, PartialEq, PartialOrd, Serialize, strum::Display,
+    Clone,
+    Debug,
+    Deserialize,
+    Eq,
+    JsonSchema,
+    Ord,
+    PartialEq,
+    PartialOrd,
+    Serialize,
+    strum::Display,
+    strum::EnumIter,
 )]
 #[serde(rename_all = "camelCase")]
 #[strum(serialize_all = "camelCase")]
@@ -233,6 +243,18 @@ pub enum NifiRole {
     Node,
 }
 
+impl From<NifiRole> for RoleName {
+    fn from(value: NifiRole) -> Self {
+        RoleName::from_str(&value.to_string()).expect("a NifiRole is a valid role name")
+    }
+}
+
+impl From<&NifiRole> for RoleName {
+    fn from(value: &NifiRole) -> Self {
+        RoleName::from_str(&value.to_string()).expect("a NifiRole is a valid role name")
+    }
+}
+
 #[derive(Clone, Debug, Default, Deserialize, JsonSchema, Serialize)]
 pub struct NifiStatus {
     pub deployed_version: Option<ProductVersion>,