rename resource name functions, remove patch reference

Author: adwk67

Cargo.toml

@@ -31,5 +31,5 @@ indoc = "2"
 regex = "1.12"
 
 [patch."https://github.com/stackabletech/operator-rs.git"]
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch="feat/smooth-operator/build-rbac" }
+# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch="feat/smooth-operator/build-rbac" }
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

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

@@ -17,11 +17,19 @@ stackable_operator::constant!(NONE_ROLE_NAME: RoleName = "none");
 stackable_operator::constant!(NONE_ROLE_GROUP_NAME: RoleGroupName = "none");
 
 pub fn build_service_account(server: &ValidatedSparkConnectServer) -> ServiceAccount {
-    rbac::build_service_account(server, &server.rbac_resource_names(), rbac_labels(server))
+    rbac::build_service_account(
+        server,
+        &server.cluster_resource_names(),
+        rbac_labels(server),
+    )
 }
 
 pub fn build_role_binding(server: &ValidatedSparkConnectServer) -> RoleBinding {
-    rbac::build_role_binding(server, &server.rbac_resource_names(), rbac_labels(server))
+    rbac::build_role_binding(
+        server,
+        &server.cluster_resource_names(),
+        rbac_labels(server),
+    )
 }
 
 fn rbac_labels(server: &ValidatedSparkConnectServer) -> Labels {

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

@@ -190,7 +190,7 @@ pub(crate) fn build_stateful_set(
 
     let mut pb = PodBuilder::new();
 
-    pb.service_account_name(validated.rbac_resource_names().service_account_name())
+    pb.service_account_name(validated.cluster_resource_names().service_account_name())
         .metadata(metadata)
         .image_pull_secrets_from_product_image(resolved_product_image)
         .add_volume(
@@ -403,7 +403,7 @@ pub(crate) fn server_properties(
     let resolved_product_image = &validated.resolved_product_image;
     let spark_image = resolved_product_image.image.clone();
     let spark_version = resolved_product_image.product_version.clone();
-    let service_account_name = validated.rbac_resource_names().service_account_name();
+    let service_account_name = validated.cluster_resource_names().service_account_name();
     let namespace = driver_service
         .namespace()
         .context(ObjectHasNoNamespaceSnafu)?;

rust/operator-binary/src/connect/controller/validate.rs

@@ -237,7 +237,7 @@ impl ValidatedSparkConnectServer {
 
     /// Type-safe names for the per-cluster RBAC resources: the ServiceAccount,
     /// 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/history/controller/build/resource/config_map.rs

@@ -55,7 +55,7 @@ pub(crate) fn build_config_map(
     rg: &ValidatedHistoryRoleGroup,
 ) -> Result<ConfigMap> {
     let cm_name = validated
-        .resource_names(role_group_name)
+        .role_group_resource_names(role_group_name)
         .role_group_config_map()
         .to_string();
 

rust/operator-binary/src/history/controller/build/resource/rbac.rs

@@ -17,11 +17,19 @@ stackable_operator::constant!(NONE_ROLE_NAME: RoleName = "none");
 stackable_operator::constant!(NONE_ROLE_GROUP_NAME: RoleGroupName = "none");
 
 pub fn build_service_account(server: &ValidatedSparkHistoryServer) -> ServiceAccount {
-    rbac::build_service_account(server, &server.rbac_resource_names(), rbac_labels(server))
+    rbac::build_service_account(
+        server,
+        &server.cluster_resource_names(),
+        rbac_labels(server),
+    )
 }
 
 pub fn build_role_binding(server: &ValidatedSparkHistoryServer) -> RoleBinding {
-    rbac::build_role_binding(server, &server.rbac_resource_names(), rbac_labels(server))
+    rbac::build_role_binding(
+        server,
+        &server.cluster_resource_names(),
+        rbac_labels(server),
+    )
 }
 
 fn rbac_labels(server: &ValidatedSparkHistoryServer) -> Labels {

rust/operator-binary/src/history/controller/build/resource/service.rs

@@ -19,7 +19,7 @@ pub fn build_rolegroup_metrics_service(
         metadata: validated
             .object_meta(
                 validated
-                    .resource_names(role_group_name)
+                    .role_group_resource_names(role_group_name)
                     .metrics_service_name()
                     .to_string(),
                 role_group_name,

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

@@ -85,7 +85,7 @@ pub(crate) fn build_stateful_set(
     log_dir: &ResolvedLogDir,
 ) -> Result<StatefulSet> {
     let resolved_product_image = &validated.resolved_product_image;
-    let resource_names = validated.resource_names(role_group_name);
+    let resource_names = validated.role_group_resource_names(role_group_name);
 
     let log_config_map = if let Some(ContainerLogConfig {
         choice:
@@ -119,7 +119,7 @@ pub(crate) fn build_stateful_set(
         .context(MissingSecretLifetimeSnafu)?;
     pb.service_account_name(
         validated
-            .rbac_resource_names()
+            .cluster_resource_names()
             .service_account_name()
             .to_string(),
     )

rust/operator-binary/src/history/controller/validate.rs

@@ -204,15 +204,15 @@ impl ValidatedSparkHistoryServer {
 
     /// Type-safe names for the per-cluster RBAC resources: the ServiceAccount,
     /// 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 a given role group.
-    pub fn resource_names(&self, role_group_name: &RoleGroupName) -> ResourceNames {
+    pub fn role_group_resource_names(&self, role_group_name: &RoleGroupName) -> ResourceNames {
         ResourceNames {
             cluster_name: self.name.clone(),
             role_name: Self::role_name(),