diff --git a/plugins/catalog-backend-module-gitlab/api-report.md b/plugins/catalog-backend-module-gitlab/api-report.md index 809ac168f2..772df7d37b 100644 --- a/plugins/catalog-backend-module-gitlab/api-report.md +++ b/plugins/catalog-backend-module-gitlab/api-report.md @@ -35,6 +35,7 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider { // (undocumented) getProviderName(): string; // (undocumented) + // (undocumented) refresh(logger: LoggerService): Promise; } @@ -65,6 +66,7 @@ export type GitLabGroup = { name: string; full_path: string; description?: string; + visibility?: string; parent_id?: number; }; diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json index 54ecf67503..d81db51117 100644 --- a/plugins/catalog-backend-module-gitlab/package.json +++ b/plugins/catalog-backend-module-gitlab/package.json @@ -15,7 +15,7 @@ */ { "name": "@backstage/plugin-catalog-backend-module-gitlab", - "version": "0.3.10-next.0", + "version": "0.3.11-next.2", "description": "A Backstage catalog backend module that helps integrate towards GitLab", "version": "0.3.15", "main": "src/index.ts", @@ -71,10 +71,7 @@ "@backstage/catalog-model": "workspace:^", "@backstage/config": "workspace:^", "@backstage/integration": "workspace:^", - "@backstage/plugin-catalog-common": "workspace:^", "@backstage/plugin-catalog-node": "workspace:^", - "@backstage/plugin-events-node": "workspace:^", - "@gitbeaker/rest": "^39.25.0", "lodash": "^4.17.21", "node-fetch": "^2.6.7", "uuid": "^9.0.0" @@ -82,7 +79,6 @@ "devDependencies": { "@backstage/backend-test-utils": "workspace:^", "@backstage/cli": "workspace:^", - "@backstage/plugin-events-backend-test-utils": "workspace:^", "@types/lodash": "^4.14.151", "@types/uuid": "^9.0.0", "luxon": "^3.0.0", diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts index b30da0461a..8f56657f68 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts @@ -173,6 +173,7 @@ export class GitLabClient { name description fullPath + visibility parent { id } @@ -207,6 +208,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/defaultTransformers.ts b/plugins/catalog-backend-module-gitlab/src/lib/defaultTransformers.ts index d7a6bf76e9..912e5a0502 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/defaultTransformers.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/defaultTransformers.ts @@ -49,6 +49,10 @@ export function defaultGroupEntitiesTransformer( const annotations: { [annotationName: string]: string } = {}; annotations[`${options.providerConfig.host}/team-path`] = group.full_path; + if (group.visibility !== undefined) { + annotations[`${options.providerConfig.host}/visibility`] = + group.visibility; + } const entity: GroupEntity = { apiVersion: 'backstage.io/v1alpha1', diff --git a/plugins/catalog-backend-module-gitlab/src/lib/types.ts b/plugins/catalog-backend-module-gitlab/src/lib/types.ts index b60814ade1..2857fea162 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/types.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/types.ts @@ -79,6 +79,7 @@ export type GitLabGroup = { name: string; full_path: string; description?: string; + visibility?: string; parent_id?: number; }; @@ -118,6 +119,7 @@ export type GitLabDescendantGroupsResponse = { name: string; description: string; fullPath: string; + visibility: string; parent: { id: string; }; diff --git a/yarn.lock b/yarn.lock index ce5c906b86..78162415e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5598,11 +5598,7 @@ __metadata: "@backstage/cli": "workspace:^" "@backstage/config": "workspace:^" "@backstage/integration": "workspace:^" - "@backstage/plugin-catalog-common": "workspace:^" "@backstage/plugin-catalog-node": "workspace:^" - "@backstage/plugin-events-backend-test-utils": "workspace:^" - "@backstage/plugin-events-node": "workspace:^" - "@gitbeaker/rest": ^39.25.0 "@types/lodash": ^4.14.151 "@types/uuid": ^9.0.0 lodash: ^4.17.21