From fc2b7e885887e8497f57032eec2161b60cfe7bb8 Mon Sep 17 00:00:00 2001
From: Matteo Silvestri <matteosilv@gmail.com>
Date: Wed, 22 Feb 2023 10:35:37 +0100
Subject: [PATCH] fix GitlabOrgDiscoveryEntityProvider.test.ts

Signed-off-by: Matteo Silvestri <matteosilv@gmail.com>
---
 .../src/providers/GitlabOrgDiscoveryEntityProvider.test.ts | 5 ++---
 .../src/providers/GitlabOrgDiscoveryEntityProvider.ts      | 7 ++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
index 268b4c3ba4..cff215acd3 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
@@ -184,7 +184,6 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
           gitlab: {
             'test-id': {
               host: 'test-gitlab',
-              group: 'test-group',
               orgEnabled: true,
             },
           },
@@ -376,9 +375,9 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
           metadata: {
             annotations: {
               'backstage.io/managed-by-location':
-                'url:https://test-gitlab/teams/group1-group2',
+                'url:https://test-gitlab/group1/group2',
               'backstage.io/managed-by-origin-location':
-                'url:https://test-gitlab/teams/group1-group2',
+                'url:https://test-gitlab/group1/group2',
               'test-gitlab/team-path': 'group1/group2',
             },
             description: 'Group2',
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
index c507b19549..77314ead17 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
@@ -356,7 +356,12 @@ export class GitlabOrgDiscoveryEntityProvider implements EntityProvider {
   }
 
   private groupName(full_path: string): string {
-    return full_path.replace(`${this.config.group}/`, '').replaceAll('/', '-');
+    if (this.config.group && full_path.startsWith(`${this.config.group}/`)) {
+      return full_path
+        .replace(`${this.config.group}/`, '')
+        .replaceAll('/', '-');
+    }
+    return full_path.replaceAll('/', '-');
   }
 
   private createGroupEntity(group: GitLabGroup, host: string): GroupEntity {