fix: extract errors - suppress push access on fetchMembers, dont insert empty values in members (#392)

* dont insert empty value arrays

* suppress push access github error

---------

Co-authored-by: David Abram <[email protected]>

Author: dejan-crocoder

package-lock.json

@@ -33,6 +33,11 @@ export const getMembers: GetMembersFunction = async (
 
   const { members, pagination } = await integrations.sourceControl.fetchMembers(externalRepositoryId, namespaceName, repositoryName, perPage, page);
 
+  if (members.length === 0 && pagination.totalPages === 1) return {
+    members: [],
+    paginationInfo: pagination,
+  }
+
   const insertedMembers = await db.transaction(async (tx) => {
     return Promise.all(members.map(member =>
       tx.insert(entities.members).values(member)

packages/functions/extract/src/get-members.ts

@@ -33,6 +33,11 @@ export const getNamespaceMembers: GetNamespaceMembersFunction = async (
 
   const { members, pagination } = await integrations.sourceControl.fetchNamespaceMembers(externalNamespaceId, namespaceName, perPage, page);
 
+  if (members.length === 0 && pagination.totalPages === 1) return {
+    members: [],
+    paginationInfo: pagination,
+  }
+
   // TODO: Deki is not a wizard
   const insertedMembers = await db.transaction(async (tx) => {
     return Promise.all(members.map(member =>

packages/functions/extract/src/get-namespace-members.ts

@@ -14,6 +14,7 @@
     "@acme/extract-schema": "*",
     "@gitbeaker/core": "^39.34.2",
     "@gitbeaker/rest": "^39.34.2",
+    "@octokit/request-error": "^5.0.1",
     "@octokit/rest": "^20.0.2",
     "@types/parse-link-header": "^2.0.3",
     "fuse.js": "^7.0.0",

packages/integrations/source-control/package.json

@@ -6,6 +6,7 @@ import type { NewRepository, NewNamespace, NewMergeRequest, NewMember, NewMergeR
 import type { Pagination, TimePeriod } from '../source-control';
 import type { components } from '@octokit/openapi-types';
 import { TimelineEventTypes } from '../../../../../packages/schemas/extract/src/timeline-events';
+import { RequestError } from '@octokit/request-error';
 
 const FILE_STATUS_FLAGS_MAPPING: Record<
   "added"
@@ -137,13 +138,30 @@ export class GitHubSourceControl implements SourceControl {
   async fetchMembers(externalRepositoryId: number, namespaceName: string, repositoryName: string, perPage: number, page?: number): Promise<{ members: NewMember[], pagination: Pagination }> {
     page = page || 1;
 
-    const result = await this.api.repos.listCollaborators({
-      owner: namespaceName,
-      repo: repositoryName,
-      page,
-      per_page: perPage,
-      affiliation: 'all',
-    });
+    let result: Awaited<ReturnType<Octokit['repos']['listCollaborators']>>;
+    try {
+      result = await this.api.repos.listCollaborators({
+        owner: namespaceName,
+        repo: repositoryName,
+        page,
+        per_page: perPage,
+        affiliation: 'all',
+      });
+    } catch (error) {
+      if (error instanceof RequestError && error.message === "Must have push access to view repository collaborators."){
+        console.log("SUPPRESSED: Must have push access to view repository collaborators.")
+        return {
+          members: [],
+          pagination: {
+            page: 1,
+            perPage: perPage,
+            totalPages: 1,
+          }
+        }  
+      }
+
+      throw error;
+    }
 
     const linkHeader = parseLinkHeader(result.headers.link) || { next: { per_page: perPage } };