-
Notifications
You must be signed in to change notification settings - Fork 106
Improved Gitlab All in case of many repositories #372
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
abraverm
wants to merge
1
commit into
sourcebot-dev:main
Choose a base branch
from
abraverm:refactor-all
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,7 @@ import { PrismaClient } from "@sourcebot/db"; | |
import { processPromiseResults, throwIfAnyFailed } from "./connectionUtils.js"; | ||
import * as Sentry from "@sentry/node"; | ||
import { env } from "./env.js"; | ||
import { log } from "console"; | ||
|
||
const logger = createLogger('gitlab'); | ||
export const GITLAB_CLOUD_HOSTNAME = "gitlab.com"; | ||
|
@@ -45,15 +46,27 @@ export const getGitLabReposFromConfig = async (config: GitlabConnectionConfig, o | |
if (config.all === true) { | ||
if (hostname !== GITLAB_CLOUD_HOSTNAME) { | ||
try { | ||
logger.debug(`Fetching all projects visible in ${config.url}...`); | ||
const { durationMs, data: _projects } = await measure(async () => { | ||
const fetchFn = () => api.Projects.all({ | ||
perPage: 100, | ||
}); | ||
return fetchWithRetry(fetchFn, `all projects in ${config.url}`, logger); | ||
// Fetch all groups | ||
logger.debug(`Fetching all groups visible in ${config.url}...`); | ||
const { durationMs: groupsDuration, data: _groups } = await measure(async () => { | ||
const fetchFn = () => api.Groups.all({ perPage: 100, allAvailable: true }); | ||
return fetchWithRetry(fetchFn, `all groups in ${config.url}`, logger); | ||
}); | ||
logger.debug(`Found ${_groups.length} groups in ${groupsDuration}ms.`); | ||
|
||
config.groups = _groups.map(g => g.full_path); | ||
|
||
logger.debug(`Found these groups: ${config.groups.join('\n')}`); | ||
|
||
// Fetch all users - too much for sourcebot/gitlab | ||
logger.debug(`Fetching all users visible in ${config.url}...`); | ||
const { durationMs: usersDuration, data: _users } = await measure(async () => { | ||
const fetchFn = () => api.Users.all({ perPage: 100, withoutProjects: false }); | ||
return fetchWithRetry(fetchFn, `all users in ${config.url}`, logger); | ||
}); | ||
logger.debug(`Found ${_projects.length} projects in ${durationMs}ms.`); | ||
allRepos = allRepos.concat(_projects); | ||
logger.debug(`Found ${_users.length} users in ${usersDuration}ms.`); | ||
|
||
config.users = _users.map(u => u.username); | ||
} catch (e) { | ||
Sentry.captureException(e); | ||
logger.error(`Failed to fetch all projects visible in ${config.url}.`, e); | ||
|
@@ -65,76 +78,96 @@ export const getGitLabReposFromConfig = async (config: GitlabConnectionConfig, o | |
} | ||
|
||
if (config.groups) { | ||
const results = await Promise.allSettled(config.groups.map(async (group) => { | ||
try { | ||
logger.debug(`Fetching project info for group ${group}...`); | ||
const { durationMs, data } = await measure(async () => { | ||
const fetchFn = () => api.Groups.allProjects(group, { | ||
perPage: 100, | ||
includeSubgroups: true | ||
const batchSize = 10; | ||
const allResults = []; | ||
|
||
// Process groups in batches of 10 | ||
for (let i = 0; i < config.groups.length; i += batchSize) { | ||
const batch = config.groups.slice(i, i + batchSize); | ||
logger.debug(`Processing batch ${i/batchSize + 1} of ${Math.ceil(config.groups.length/batchSize)} (${batch.length} groups)`); | ||
|
||
const batchResults = await Promise.allSettled(batch.map(async (group) => { | ||
try { | ||
logger.debug(`Fetching project info for group ${group}...`); | ||
const { durationMs, data } = await measure(async () => { | ||
const fetchFn = () => api.Groups.allProjects(group, { | ||
perPage: 100, | ||
includeSubgroups: true | ||
}); | ||
return fetchWithRetry(fetchFn, `group ${group}`, logger); | ||
}); | ||
return fetchWithRetry(fetchFn, `group ${group}`, logger); | ||
}); | ||
logger.debug(`Found ${data.length} projects in group ${group} in ${durationMs}ms.`); | ||
return { | ||
type: 'valid' as const, | ||
data | ||
}; | ||
} catch (e: any) { | ||
Sentry.captureException(e); | ||
logger.error(`Failed to fetch projects for group ${group}.`, e); | ||
|
||
const status = e?.cause?.response?.status; | ||
if (status === 404) { | ||
logger.error(`Group ${group} not found or no access`); | ||
logger.debug(`Found ${data.length} projects in group ${group} in ${durationMs}ms.`); | ||
return { | ||
type: 'notFound' as const, | ||
value: group | ||
type: 'valid' as const, | ||
data | ||
}; | ||
} | ||
throw e; | ||
} | ||
})); | ||
} catch (e: any) { | ||
Sentry.captureException(e); | ||
logger.error(`Failed to fetch projects for group ${group}.`, e); | ||
|
||
throwIfAnyFailed(results); | ||
const { validItems: validRepos, notFoundItems: notFoundOrgs } = processPromiseResults(results); | ||
const status = e?.cause?.response?.status; | ||
if (status === 404) { | ||
logger.error(`Group ${group} not found or no access`); | ||
return { | ||
type: 'notFound' as const, | ||
value: group | ||
}; | ||
} | ||
throw e; | ||
} | ||
})); | ||
allResults.push(...batchResults); | ||
} | ||
const { validItems: validRepos, notFoundItems: notFoundOrgs } = processPromiseResults(allResults); | ||
allRepos = allRepos.concat(validRepos); | ||
notFound.orgs = notFoundOrgs; | ||
logger.debug(`Found ${validRepos.length} valid repositories in groups.`); | ||
logger.debug(`Not found groups: ${notFoundOrgs.join(', ')}`); | ||
logger.debug(`These repositories will be downloaded: ${allRepos.map(repo => repo.path_with_namespace).join('\n')}`); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: |
||
} | ||
|
||
if (config.users) { | ||
const results = await Promise.allSettled(config.users.map(async (user) => { | ||
try { | ||
logger.debug(`Fetching project info for user ${user}...`); | ||
const { durationMs, data } = await measure(async () => { | ||
const fetchFn = () => api.Users.allProjects(user, { | ||
perPage: 100, | ||
const batchSize = 10; | ||
const allResults = []; | ||
|
||
// Process users in batches of 10 | ||
for (let i = 0; i < config.users.length; i += batchSize) { | ||
const batch = config.users.slice(i, i + batchSize); | ||
logger.debug(`Processing batch ${i/batchSize + 1} of ${Math.ceil(config.users.length/batchSize)} (${batch.length} users)`); | ||
|
||
const batchResults = await Promise.allSettled(batch.map(async (user) => { | ||
try { | ||
logger.debug(`Fetching project info for user ${user}...`); | ||
const { durationMs, data } = await measure(async () => { | ||
const fetchFn = () => api.Users.allProjects(user, { | ||
perPage: 100, | ||
}); | ||
return fetchWithRetry(fetchFn, `user ${user}`, logger); | ||
}); | ||
return fetchWithRetry(fetchFn, `user ${user}`, logger); | ||
}); | ||
logger.debug(`Found ${data.length} projects owned by user ${user} in ${durationMs}ms.`); | ||
return { | ||
type: 'valid' as const, | ||
data | ||
}; | ||
} catch (e: any) { | ||
Sentry.captureException(e); | ||
logger.error(`Failed to fetch projects for user ${user}.`, e); | ||
|
||
const status = e?.cause?.response?.status; | ||
if (status === 404) { | ||
logger.error(`User ${user} not found or no access`); | ||
logger.debug(`Found ${data.length} projects owned by user ${user} in ${durationMs}ms.`); | ||
return { | ||
type: 'notFound' as const, | ||
value: user | ||
type: 'valid' as const, | ||
data | ||
}; | ||
} | ||
throw e; | ||
} | ||
})); | ||
} catch (e: any) { | ||
Sentry.captureException(e); | ||
logger.error(`Failed to fetch projects for user ${user}.`, e); | ||
|
||
throwIfAnyFailed(results); | ||
const { validItems: validRepos, notFoundItems: notFoundUsers } = processPromiseResults(results); | ||
const status = e?.cause?.response?.status; | ||
if (status === 404) { | ||
logger.error(`User ${user} not found or no access`); | ||
return { | ||
type: 'notFound' as const, | ||
value: user | ||
}; | ||
} | ||
throw e; | ||
} | ||
})); | ||
|
||
allResults.push(...batchResults); | ||
} | ||
const { validItems: validRepos, notFoundItems: notFoundUsers } = processPromiseResults(allResults); | ||
allRepos = allRepos.concat(validRepos); | ||
notFound.users = notFoundUsers; | ||
} | ||
|
@@ -169,7 +202,6 @@ export const getGitLabReposFromConfig = async (config: GitlabConnectionConfig, o | |
} | ||
})); | ||
|
||
throwIfAnyFailed(results); | ||
const { validItems: validRepos, notFoundItems: notFoundRepos } = processPromiseResults(results); | ||
allRepos = allRepos.concat(validRepos); | ||
notFound.repos = notFoundRepos; | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Avoid mutating input parameters.
Modifying the
config
object directly creates unexpected side effects for callers. Consider storing the discovered groups and users in local variables instead.Also applies to: 69-69
🤖 Prompt for AI Agents