Refactor test for multiple-consumer

Fix prefix double dash

Signed-off-by: Mangirdas Judeikis <mangirdas@judeikis.lt>
On-behalf-of: @SAP mangirdas.judeikis@sap.com

Author: mjudeikis

backend/kubernetes/resources/namespace.go

@@ -61,7 +61,7 @@ func CreateNamespace(ctx context.Context, client client.Client, generateNamePref
 	name := identityHash(identity)
 	namespace := &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: fmt.Sprintf("%s-%s", generateNamePrefix, name),
+			Name: fmt.Sprintf("%s%s", generateNamePrefix, name),
 			Annotations: map[string]string{
 				IdentityAnnotationKey: identity,
 				AuthorAnnotationKey:   author,

backend/kubernetes/resources/namespace_test.go

@@ -60,7 +60,7 @@ func TestCreateNamespace(t *testing.T) {
 		},
 		{
 			name:         "create new namespace with generateName already ending with dash",
-			generateName: "test-ns-",
+			generateName: "test-ns",
 			identity:     "test-id-456",
 			author:       "alice",
 			wantErr:      false,
@@ -98,7 +98,7 @@ func TestCreateNamespace(t *testing.T) {
 
 			expectedPrefix := tt.generateName
 			expectedHash := expectedIdentityHash(tt.identity)
-			expectedName := fmt.Sprintf("%s-%s", expectedPrefix, expectedHash)
+			expectedName := fmt.Sprintf("%s%s", expectedPrefix, expectedHash)
 
 			if result.Name != expectedName {
 				t.Errorf("CreateNamespace() name = %v, expected %v", result.Name, expectedName)

backend/options/options.go

@@ -102,7 +102,7 @@ func NewOptions() *Options {
 
 		ExtraOptions: ExtraOptions{
 			Provider:               "kubernetes",
-			NamespacePrefix:        "cluster",
+			NamespacePrefix:        "cluster-",
 			PrettyName:             "Backend",
 			ConsumerScope:          string(kubebindv1alpha2.NamespacedScope),
 			ClusterScopedIsolation: string(kubebindv1alpha2.IsolationPrefixed),

deploy/examples/template-cowboys.yaml

@@ -16,6 +16,3 @@ spec:
       labelSelector:
         matchLabels:
           app: cowboy
-  namespaces:
-  - name: wild-west
-

deploy/examples/template-sheriffs.yaml

@@ -21,6 +21,4 @@ spec:
           group: wildwest.dev
           jsonPath:
             name: spec.secretRefs.#.name
-            namespace: spec.secretRefs.#.namespace
-  namespaces:
-  - name: wild-west
+            namespace: spec.secretRefs.#.namespace