From b9578fd485daade2723444ea4eb067327fb1d691 Mon Sep 17 00:00:00 2001 From: sbarrypoppulo <101636916+sbarrypoppulo@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:10:03 +0100 Subject: [PATCH 1/3] Update .changeset/thick-pets-drive.md Co-authored-by: Jamie Klassen Signed-off-by: sbarrypoppulo <101636916+sbarrypoppulo@users.noreply.github.com> --- .changeset/thick-pets-drive.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/thick-pets-drive.md b/.changeset/thick-pets-drive.md index a4d8a35029..ee09f8af06 100644 --- a/.changeset/thick-pets-drive.md +++ b/.changeset/thick-pets-drive.md @@ -1,5 +1,5 @@ --- -'@backstage/plugin-catalog-backend-module-gitlab': patch +'@backstage/plugin-catalog-backend-module-gitlab': minor --- Fix Gitlab.com user ingestion by scoping GitlabOrgDiscoveryEntityProvider to a group. From 5a3842761c2d6f0964d754d99ff231b0ed589bd4 Mon Sep 17 00:00:00 2001 From: sbarrypoppulo <101636916+sbarrypoppulo@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:10:28 +0100 Subject: [PATCH 2/3] Update plugins/catalog-backend-module-gitlab/src/lib/client.ts Co-authored-by: Jamie Klassen Signed-off-by: sbarrypoppulo <101636916+sbarrypoppulo@users.noreply.github.com> --- plugins/catalog-backend-module-gitlab/src/lib/client.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts index fa4ccf9f97..dca545eab3 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts @@ -118,13 +118,13 @@ export class GitLabClient { groupMembers(first: 100, relations: [DESCENDANTS], after: $endCursor) { nodes { user { - id - username + id + username publicEmail name state webUrl - avatarUrl + avatarUrl } } pageInfo { From ecf970e4fe8479d475740a2517e1ba8e7adf720b Mon Sep 17 00:00:00 2001 From: sbarrypoppulo <101636916+sbarrypoppulo@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:10:47 +0100 Subject: [PATCH 3/3] Update plugins/catalog-backend-module-gitlab/src/lib/client.ts Co-authored-by: Jamie Klassen Signed-off-by: sbarrypoppulo <101636916+sbarrypoppulo@users.noreply.github.com> --- .../src/lib/client.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts index dca545eab3..f44aec9b20 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts @@ -187,24 +187,24 @@ export class GitLabClient { body: JSON.stringify({ variables: { group: groupPath, endCursor }, query: `query listSaasGroups($group: ID!, $endCursor: String) { - group(fullPath: $group) { - descendantGroups(first: 100, after: $endCursor){ - nodes{ - id - name - description - fullPath - parent{ - id - } - } - pageInfo { - endCursor - hasNextPage + group(fullPath: $group) { + descendantGroups(first: 100, after: $endCursor) { + nodes { + id + name + description + fullPath + parent { + id } + } + pageInfo { + endCursor + hasNextPage + } } - } - }`, + } + }`, }), }, ).then(r => r.json());