fix: make role-utils and role-group-utils pub

Author: maltesander

crates/stackable-operator/src/v2/mod.rs

@@ -3,6 +3,8 @@ use crate::v2::types::kubernetes::Uid;
 pub mod builder;
 pub mod config_overrides;
 pub mod macros;
+pub mod role_group_utils;
+pub mod role_utils;
 pub mod types;
 
 /// Has a non-empty name

crates/stackable-operator/src/v2/role_group_utils.rs

@@ -114,7 +114,7 @@ impl ResourceNames {
 #[cfg(test)]
 mod tests {
     use super::{ClusterName, RoleGroupName, RoleName};
-    use crate::framework::{
+    use crate::v2::{
         role_group_utils::{QualifiedRoleGroupName, ResourceNames},
         types::kubernetes::{ConfigMapName, ListenerName, ServiceName, StatefulSetName},
     };

crates/stackable-operator/src/v2/role_utils.rs

@@ -4,15 +4,6 @@ use std::{
 };
 
 use serde::{Deserialize, Serialize};
-use stackable_operator::{
-    config::{
-        fragment::{self, FromFragment},
-        merge::{self, Merge, merge},
-    },
-    k8s_openapi::{DeepMerge, api::core::v1::PodTemplateSpec},
-    role_utils::{CommonConfiguration, Role, RoleGroup},
-    schemars::{self, JsonSchema},
-};
 
 use super::{
     builder::pod::container::EnvVarSet,
@@ -21,6 +12,15 @@ use super::{
         operator::{ClusterName, ProductName},
     },
 };
+use crate::{
+    config::{
+        fragment::{self, FromFragment},
+        merge::{self, Merge, merge},
+    },
+    k8s_openapi::{DeepMerge, api::core::v1::PodTemplateSpec},
+    role_utils::{CommonConfiguration, Role, RoleGroup},
+    schemars::{self, JsonSchema},
+};
 
 // Variant of [`stackable_operator::role_utils::GenericCommonConfig`] that implements [`Merge`]
 #[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
@@ -201,21 +201,21 @@ mod tests {
 
     use rstest::*;
     use serde::Serialize;
-    use stackable_operator::{
+
+    use super::ResourceNames;
+    use crate::{
         config::{fragment::Fragment, merge::Merge},
         k8s_openapi::api::core::v1::PodTemplateSpec,
         kube::api::ObjectMeta,
         role_utils::{CommonConfiguration, GenericRoleConfig, Role, RoleGroup},
         schemars::{self, JsonSchema},
-    };
-
-    use super::ResourceNames;
-    use crate::framework::{
-        config_overrides::KeyValueConfigOverrides,
-        role_utils::with_validated_config,
-        types::{
-            kubernetes::{ClusterRoleName, RoleBindingName, ServiceAccountName},
-            operator::{ClusterName, ProductName},
+        v2::{
+            config_overrides::KeyValueConfigOverrides,
+            role_utils::with_validated_config,
+            types::{
+                kubernetes::{ClusterRoleName, RoleBindingName, ServiceAccountName},
+                operator::{ClusterName, ProductName},
+            },
         },
     };