From edb1e853f6d9bfa56703aed4c5d52f82aa7dea95 Mon Sep 17 00:00:00 2001
From: Markus <markus.siebert@deutschebahn.com>
Date: Tue, 13 Feb 2024 12:43:47 +0100
Subject: [PATCH] feat: Add gitlab group visibility to group entity via
 annotation part2

Signed-off-by: Markus <markus.siebert@deutschebahn.com>
---
 plugins/catalog-backend-module-gitlab/src/lib/client.ts       | 2 ++
 plugins/catalog-backend-module-gitlab/src/lib/types.ts        | 1 +
 .../src/providers/GitlabOrgDiscoveryEntityProvider.test.ts    | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
index 65c3898d06..d69c99c777 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
@@ -136,6 +136,7 @@ export class GitLabClient {
                       name
                       description
                       fullPath
+                      visibility
                       parent {
                         id
                       }
@@ -170,6 +171,7 @@ export class GitLabClient {
           name: groupItem.name,
           description: groupItem.description,
           full_path: groupItem.fullPath,
+          visibility: groupItem.visibility,
           parent_id: Number(
             groupItem.parent.id.replace(/^gid:\/\/gitlab\/Group\//, ''),
           ),
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/types.ts b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
index 635b7d4d6a..6566d8d19e 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/types.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
@@ -116,6 +116,7 @@ export type GitLabDescendantGroupsResponse = {
             name: string;
             description: string;
             fullPath: string;
+            visibility: string;
             parent: {
               id: string;
             };
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 c86c9f52d4..8dffdf1d7b 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
@@ -526,6 +526,7 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
                       name: 'group2',
                       description: 'Group2',
                       fullPath: 'group1/group2',
+                      visibility: 'private',
                       parent: {
                         id: 'gid://gitlab/Group/123',
                       },
@@ -535,6 +536,7 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
                       name: 'group3',
                       description: 'Group3',
                       fullPath: 'group1/group3',
+                      visibility: 'public',
                       parent: {
                         id: 'gid://gitlab/Group/123',
                       },
@@ -704,6 +706,7 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
               'backstage.io/managed-by-origin-location':
                 'url:https://gitlab.com/group1/group2',
               'gitlab.com/team-path': 'group1/group2',
+              'gitlab.com/visibility': 'private',
             },
             description: 'Group2',
             name: 'group2',
@@ -729,6 +732,7 @@ describe('GitlabOrgDiscoveryEntityProvider', () => {
               'backstage.io/managed-by-origin-location':
                 'url:https://gitlab.com/group1/group3',
               'gitlab.com/team-path': 'group1/group3',
+              'gitlab.com/visibility': 'public',
             },
             description: 'Group3',
             name: 'group3',