fix: fix branch

Signed-off-by: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
This commit is contained in:
ElaineDeMattosSilvaB
2024-03-16 13:29:38 +01:00
parent a70377d3e1
commit 4d87f98ec7
6 changed files with 11 additions and 9 deletions
@@ -35,6 +35,7 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
// (undocumented)
getProviderName(): string;
// (undocumented)
// (undocumented)
refresh(logger: LoggerService): Promise<void>;
}
@@ -65,6 +66,7 @@ export type GitLabGroup = {
name: string;
full_path: string;
description?: string;
visibility?: string;
parent_id?: number;
};
@@ -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",
@@ -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\//, ''),
),
@@ -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',
@@ -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;
};
-4
View File
@@ -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