Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions packages/functions/extract/src/get-members.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions packages/functions/extract/src/get-namespace-members.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
Expand Down
1 change: 1 addition & 0 deletions packages/integrations/source-control/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
32 changes: 25 additions & 7 deletions packages/integrations/source-control/src/github/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 } };

Expand Down