From 1150a8cdeca6d79335f72e13f24b39f50a1872ae Mon Sep 17 00:00:00 2001 From: Jasper Boeijenga Date: Wed, 11 Oct 2023 13:00:35 +0200 Subject: [PATCH] Add group in the error message from the graphQL query Signed-off-by: Jasper Boeijenga --- plugins/catalog-backend-module-gitlab/src/lib/client.ts | 6 +++++- .../src/providers/GitlabOrgDiscoveryEntityProvider.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts index c4cdd444cb..5447dec9d4 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts @@ -236,7 +236,11 @@ export class GitLabClient { }, ).then(r => r.json()); if (response.errors) { - throw new Error(`GraphQL errors: ${JSON.stringify(response.errors)}`); + throw new Error( + `GraphQL errors: ${JSON.stringify( + response.errors, + )}, for group: ${groupPath}`, + ); } if (!response.data.group?.groupMembers?.nodes) { diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts index 54373791ff..6dbb0d162b 100644 --- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts +++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts @@ -249,7 +249,7 @@ export class GitlabOrgDiscoveryEntityProvider implements EntityProvider { try { groupUsers = await client.getGroupMembers(group.full_path, ['DIRECT']); } catch { - logger.error(`Failed fetching user for group: ${group.full_path}`); + logger.error(`Failed fetching users for group: ${group.full_path}`); } for (const groupUser of groupUsers.items) {