fixup

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
eclipse-che · Oct 30, 2024 · 2961586 · 2961586
1 parent 979402e
commit 2961586
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/controllers/usernamespace/workspaces_config_controller.go b/controllers/usernamespace/workspaces_config_controller.go
@@ -721,7 +721,7 @@ func buildKey(gvk schema.GroupVersionKind, name string, namespace string) string
 
 func getGkvItem(key string) string {
 	splits := strings.Split(key, ".")
-	return strings.ReplaceAll(splits[0], "#", ".")
+	return strings.ReplaceAll(splits[0], "-", ".")
 }
 
 func getNameItem(key string) string {
@@ -739,7 +739,7 @@ func gvk2Item(gvk schema.GroupVersionKind) string {
 	if gvk.Group == "" {
 		return fmt.Sprintf("%s_%s", gvk.Version, gvk.Kind)
 	}
-	return fmt.Sprintf("%s_%s_%s", strings.ReplaceAll(gvk.Group, ".", "#"), gvk.Version, gvk.Kind)
+	return fmt.Sprintf("%s_%s_%s", strings.ReplaceAll(gvk.Group, ".", "-"), gvk.Version, gvk.Kind)
 }
 
 func item2gkv(item string) schema.GroupVersionKind {

diff --git a/controllers/usernamespace/workspaces_config_controller_test.go b/controllers/usernamespace/workspaces_config_controller_test.go
@@ -165,6 +165,22 @@ func TestBuildKey(t *testing.T) {
 			namespace: "eclipse-che",
 			gkv:       corev1.SchemeGroupVersion.WithKind("ConfigMap"),
 		},
+		{
+			name:      "test_test",
+			namespace: "eclipse-che",
+			gkv:       corev1.SchemeGroupVersion.WithKind("ConfigMap"),
+		},
+		{
+			name:      "test-test",
+			namespace: "eclipse-che",
+			gkv:       corev1.SchemeGroupVersion.WithKind("ConfigMap"),
+		},
+		{
+			name:      "test-test_test.test-test_test.test",
+			namespace: "eclipse-che",
+			gkv:       corev1.SchemeGroupVersion.WithKind("ConfigMap"),
+		},
+
 		{
 			name:      "test",
 			namespace: "eclipse-che",
@@ -190,6 +206,21 @@ func TestBuildKey(t *testing.T) {
 			namespace: "eclipse-che",
 			gkv:       rbacv1.SchemeGroupVersion.WithKind("ClusterRole"),
 		},
+		{
+			name:      "test_test",
+			namespace: "eclipse-che",
+			gkv:       rbacv1.SchemeGroupVersion.WithKind("ClusterRole"),
+		},
+		{
+			name:      "test-test",
+			namespace: "eclipse-che",
+			gkv:       rbacv1.SchemeGroupVersion.WithKind("ClusterRole"),
+		},
+		{
+			name:      "test-test_test.test-test_test.test",
+			namespace: "eclipse-che",
+			gkv:       rbacv1.SchemeGroupVersion.WithKind("ClusterRole"),
+		},
 	}
 
 	for i, testCase := range testCases {