code rabbit fixes

msukkari · msukkari · commit 53248d88393e · 2025-04-24T18:42:17.000-07:00
diff --git a/docs/docs/connections/bitbucket-cloud.mdx b/docs/docs/connections/bitbucket-cloud.mdx
@@ -36,7 +36,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';
         {
             "type": "bitbucket",
             "deploymentType": "cloud",
-            "project": [
+            "projects": [
                 "myWorkspace/myRepo"
             ]
         }
diff --git a/docs/docs/connections/bitbucket-data-center.mdx b/docs/docs/connections/bitbucket-data-center.mdx
@@ -14,7 +14,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';
         {
             "type": "bitbucket",
             "deploymentType": "server",
-            "url": "https://mybitbucketdeployment.com"
+            "url": "https://mybitbucketdeployment.com",
             "repos": [
                 "myProject/myRepo"
             ]
@@ -26,7 +26,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';
         {
             "type": "bitbucket",
             "deploymentType": "server",
-            "url": "https://mybitbucketdeployment.com"
+            "url": "https://mybitbucketdeployment.com",
             "projects": [
                 "myProject"
             ]
@@ -38,7 +38,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';
         {
             "type": "bitbucket",
             "deploymentType": "server",
-            "url": "https://mybitbucketdeployment.com"
+            "url": "https://mybitbucketdeployment.com",
             // Include all repos in myProject...
             "projects": [
                 "myProject"
diff --git a/packages/backend/src/bitbucket.ts b/packages/backend/src/bitbucket.ts
@@ -12,6 +12,7 @@ import {
 import { SchemaRestRepository as ServerRepository } from "@coderabbitai/bitbucket/server/openapi";
 import { processPromiseResults } from "./connectionUtils.js";
 import { throwIfAnyFailed } from "./connectionUtils.js";
+import { PaginatedResponse } from "@gitbeaker/rest";
 
 const logger = createLogger("Bitbucket");
 const BITBUCKET_CLOUD_GIT = 'https://bitbucket.org';
@@ -27,7 +28,6 @@ interface BitbucketClient {
     apiClient: any;
     baseUrl: string;
     gitUrl: string;
-    getPaginated: <T, V extends CloudGetRequestPath | ServerGetRequestPath>(path: V, get: (url: V) => Promise<PaginatedResponse<T>>) => Promise<T[]>;
     getReposForWorkspace: (client: BitbucketClient, workspaces: string[]) => Promise<{validRepos: BitbucketRepository[], notFoundWorkspaces: string[]}>;
     getReposForProjects: (client: BitbucketClient, projects: string[]) => Promise<{validRepos: BitbucketRepository[], notFoundProjects: string[]}>;
     getRepos: (client: BitbucketClient, repos: string[]) => Promise<{validRepos: BitbucketRepository[], notFoundRepos: string[]}>;
@@ -40,7 +40,7 @@ type CloudGetRequestPath = ClientPathsWithMethod<CloudAPI, "get">;
 type ServerAPI = ReturnType<typeof createBitbucketServerClient>;
 type ServerGetRequestPath = ClientPathsWithMethod<ServerAPI, "get">;
 
-type PaginatedResponse<T> = {
+type CloudPaginatedResponse<T> = {
     readonly next?: string;
     readonly page?: number;
     readonly pagelen?: number;
@@ -49,6 +49,15 @@ type PaginatedResponse<T> = {
     readonly values?: readonly T[];
 }
 
+type ServerPaginatedResponse<T> = {
+    readonly size: number;
+    readonly limit: number;
+    readonly isLastPage: boolean;
+    readonly values: readonly T[];
+    readonly start: number;
+    readonly nextPageStart: number;
+}
+
 export const getBitbucketReposFromConfig = async (config: BitbucketConnectionConfig, orgId: number, db: PrismaClient) => {
     const token = config.token ?
         await getTokenFromConfig(config.token, orgId, db, logger) :
@@ -82,7 +91,7 @@ export const getBitbucketReposFromConfig = async (config: BitbucketConnectionCon
     if (config.projects) {
         const { validRepos, notFoundProjects } = await client.getReposForProjects(client, config.projects);
         allRepos = allRepos.concat(validRepos);
-        notFound.repos = notFoundProjects;
+        notFound.orgs = notFoundProjects;
     }
 
     if (config.repos) {
@@ -103,12 +112,18 @@ export const getBitbucketReposFromConfig = async (config: BitbucketConnectionCon
 
 function cloudClient(user: string | undefined, token: string | undefined): BitbucketClient {
 
-    const authorizationString = !user || user == "x-token-auth" ? `Bearer ${token}` : `Basic ${Buffer.from(`${user}:${token}`).toString('base64')}`;
+    const authorizationString = 
+        token
+        ? !user || user == "x-token-auth"
+            ? `Bearer ${token}`
+            : `Basic ${Buffer.from(`${user}:${token}`).toString('base64')}`
+        : undefined;
+
     const clientOptions: ClientOptions = {
         baseUrl: BITBUCKET_CLOUD_API,
         headers: {
             Accept: "application/json",
-            Authorization: authorizationString,
+            ...(authorizationString ? { Authorization: authorizationString } : {}),
         },
     };
 
@@ -119,7 +134,6 @@ function cloudClient(user: string | undefined, token: string | undefined): Bitbu
         apiClient: apiClient,
         baseUrl: BITBUCKET_CLOUD_API,
         gitUrl: BITBUCKET_CLOUD_GIT,
-        getPaginated: getPaginatedCloud,
         getReposForWorkspace: cloudGetReposForWorkspace,
         getReposForProjects: cloudGetReposForProjects,
         getRepos: cloudGetRepos,
@@ -133,7 +147,10 @@ function cloudClient(user: string | undefined, token: string | undefined): Bitbu
 * We need to do `V extends CloudGetRequestPath` since we will need to call `apiClient.GET(url, ...)`, which
 * expects `url` to be of type `CloudGetRequestPath`. See example.
 **/
-const getPaginatedCloud = async <T, V extends CloudGetRequestPath | ServerGetRequestPath>(path: V, get: (url: V) => Promise<PaginatedResponse<T>>) => {
+const getPaginatedCloud = async <T>(
+    path: CloudGetRequestPath,
+    get: (url: CloudGetRequestPath) => Promise<CloudPaginatedResponse<T>>
+): Promise<T[]> => {
     const results: T[] = [];
     let url = path;
 
@@ -150,8 +167,7 @@ const getPaginatedCloud = async <T, V extends CloudGetRequestPath | ServerGetReq
             break;
         }
 
-        // cast required here since response.next is a string.
-        url = response.next as V;
+        url = response.next as CloudGetRequestPath;
     }
     return results;
 }
@@ -164,7 +180,7 @@ async function cloudGetReposForWorkspace(client: BitbucketClient, workspaces: st
 
             const path = `/repositories/${workspace}` as CloudGetRequestPath;
             const { durationMs, data } = await measure(async () => {
-                const fetchFn = () => client.getPaginated<CloudRepository, typeof path>(path, async (url) => {
+                const fetchFn = () => getPaginatedCloud<CloudRepository>(path, async (url) => {
                     const response = await client.apiClient.GET(url, {
                         params: {
                             path: {
@@ -223,9 +239,15 @@ async function cloudGetReposForProjects(client: BitbucketClient, projects: strin
 
         logger.debug(`Fetching all repos for project ${project} for workspace ${workspace}...`);
         try {
-            const path = `/repositories/${workspace}?q=project.key="${project_name}"` as CloudGetRequestPath;
-            const repos = await client.getPaginated<CloudRepository, typeof path>(path, async (url) => {
-                const response = await client.apiClient.GET(url);
+            const path = `/repositories/${workspace}` as CloudGetRequestPath;
+            const repos = await getPaginatedCloud<CloudRepository>(path, async (url) => {
+                const response = await client.apiClient.GET(url, {
+                    params: {
+                        query: {
+                            q: `project.key="${project_name}"`
+                        }
+                    }
+                });
                 const { data, error } = response;
                 if (error) {
                     throw new Error (`Failed to fetch projects for workspace ${workspace}: ${error.type}`);
@@ -317,6 +339,10 @@ function cloudShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketConn
             return true;
         }
 
+        if (!!config.exclude?.archived) {
+            logger.warn(`Exclude archived repos flag provided in config but Bitbucket Cloud does not support archived repos. Ignoring...`);
+        }
+
         if (!!config.exclude?.forks && cloudRepo.parent !== undefined) {
             return true;
         }
@@ -358,7 +384,6 @@ function serverClient(url: string, user: string | undefined, token: string | und
         apiClient: apiClient,
         baseUrl: url,
         gitUrl: url,
-        getPaginated: getPaginatedServer,
         getReposForWorkspace: serverGetReposForWorkspace,
         getReposForProjects: serverGetReposForProjects,
         getRepos: serverGetRepos,
@@ -368,25 +393,27 @@ function serverClient(url: string, user: string | undefined, token: string | und
     return client;
 }
 
-const getPaginatedServer = async <T, V extends CloudGetRequestPath | ServerGetRequestPath>(path: V, get: (url: V) => Promise<PaginatedResponse<T>>) => {
+const getPaginatedServer = async <T>(
+    path: ServerGetRequestPath,
+    get: (url: ServerGetRequestPath, start?: number) => Promise<ServerPaginatedResponse<T>>
+): Promise<T[]> => {
     const results: T[] = [];
-    let url = path;
+    let nextStart: number | undefined;
 
     while (true) {
-        const response = await get(url);
+        const response = await get(path, nextStart);
 
         if (!response.values || response.values.length === 0) { 
             break;
         }
 
         results.push(...response.values);
 
-        if (!response.next) {
+        if (response.isLastPage) {
             break;
         }
 
-        // cast required here since response.next is a string.
-        url = response.next as V;
+        nextStart = response.nextPageStart;
     }
     return results;
 }
@@ -406,8 +433,14 @@ async function serverGetReposForProjects(client: BitbucketClient, projects: stri
 
             const path = `/rest/api/1.0/projects/${project}/repos` as ServerGetRequestPath;
             const { durationMs, data } = await measure(async () => {
-                const fetchFn = () => client.getPaginated<ServerRepository, typeof path>(path, async (url) => {
-                    const response = await client.apiClient.GET(url);
+                const fetchFn = () => getPaginatedServer<ServerRepository>(path, async (url, start) => {
+                    const response = await client.apiClient.GET(url, {
+                        params: {
+                            query: {
+                                start,
+                            }
+                        }
+                    });
                     const { data, error } = response;
                     if (error) {
                         throw new Error(`Failed to fetch repos for project ${project}: ${JSON.stringify(error)}`);
@@ -504,8 +537,10 @@ function serverShouldExcludeRepo(repo: BitbucketRepository, config: BitbucketCon
             return true;
         }
 
-        // Note: Bitbucket Server doesn't have a direct way to check if a repo is a fork
-        // We'll need to check the origin property if it exists
+        if (!!config.exclude?.archived && serverRepo.archived) {
+            return true;
+        }
+
         if (!!config.exclude?.forks && serverRepo.origin !== undefined) {
             return true;
         }
diff --git a/packages/backend/src/repoCompileUtils.ts b/packages/backend/src/repoCompileUtils.ts
@@ -378,6 +378,8 @@ export const compileBitbucketConfig = async (
         const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
         const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
         const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
+        const isArchived = isServer ? (repo as BitbucketServerRepository).archived === true : false;
+        const isFork = isServer ? (repo as BitbucketServerRepository).origin !== undefined : (repo as BitbucketCloudRepository).parent !== undefined;
         const repoName = path.join(repoNameRoot, displayName);
         const cloneUrl = getCloneUrl(repo);
         const webUrl = getWebUrl(repo);
@@ -390,8 +392,8 @@ export const compileBitbucketConfig = async (
             webUrl: webUrl,
             name: repoName,
             displayName: displayName,
-            isFork: false,
-            isArchived: false,
+            isFork: isFork,
+            isArchived: isArchived,
             org: {
                 connect: {
                     id: orgId,
@@ -407,8 +409,8 @@ export const compileBitbucketConfig = async (
                     'zoekt.web-url-type': codeHostType,
                     'zoekt.web-url': webUrl,
                     'zoekt.name': repoName,
-                    'zoekt.archived': marshalBool(false),
-                    'zoekt.fork': marshalBool(false),
+                    'zoekt.archived': marshalBool(isArchived),
+                    'zoekt.fork': marshalBool(isFork),
                     'zoekt.public': marshalBool(isPublic),
                     'zoekt.display-name': displayName,
                 },
diff --git a/packages/backend/src/repoManager.ts b/packages/backend/src/repoManager.ts
@@ -190,7 +190,7 @@ export class RepoManager implements IRepoManager {
             }
         })();
 
-        let password: string = "";
+        let password: string | undefined = undefined;
         for (const repoConnection of repoConnections) {
             const connection = repoConnection.connection;
             if (connection.connectionType !== 'github' && connection.connectionType !== 'gitlab' && connection.connectionType !== 'gitea' && connection.connectionType !== 'bitbucket') {
@@ -201,7 +201,7 @@ export class RepoManager implements IRepoManager {
             if (config.token) {
                 password = await getTokenFromConfig(config.token, connection.orgId, db, this.logger);
                 if (password) {
-                    // If we're using a bitbucket connection, check to see if we're provided a username
+                    // If we're using a bitbucket connection we need to set the username to be able to clone the repo
                     if (connection.connectionType === 'bitbucket') {
                         const bitbucketConfig = config as BitbucketConnectionConfig;
                         username = bitbucketConfig.user ?? "x-token-auth";
@@ -211,7 +211,9 @@ export class RepoManager implements IRepoManager {
             }
         }
 
-        return { username, password };
+        return password
+            ? { username, password }
+            : undefined;
     }
 
     private async syncGitRepository(repo: RepoWithConnections, repoAlreadyInIndexingState: boolean) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';`
`36`	`36`	`{`
`37`	`37`	`"type": "bitbucket",`
`38`	`38`	`"deploymentType": "cloud",`
`39`		`- "project": [`
	`39`	`+ "projects": [`
`40`	`40`	`"myWorkspace/myRepo"`
`41`	`41`	`]`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';`
`14`	`14`	`{`
`15`	`15`	`"type": "bitbucket",`
`16`	`16`	`"deploymentType": "server",`
`17`		`- "url": "https://mybitbucketdeployment.com"`
	`17`	`+ "url": "https://mybitbucketdeployment.com",`
`18`	`18`	`"repos": [`
`19`	`19`	`"myProject/myRepo"`
`20`	`20`	`]`
`@@ -26,7 +26,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';`
`26`	`26`	`{`
`27`	`27`	`"type": "bitbucket",`
`28`	`28`	`"deploymentType": "server",`
`29`		`- "url": "https://mybitbucketdeployment.com"`
	`29`	`+ "url": "https://mybitbucketdeployment.com",`
`30`	`30`	`"projects": [`
`31`	`31`	`"myProject"`
`32`	`32`	`]`
`@@ -38,7 +38,7 @@ import BitbucketAppPassword from '/snippets/bitbucket-app-password.mdx';`
`38`	`38`	`{`
`39`	`39`	`"type": "bitbucket",`
`40`	`40`	`"deploymentType": "server",`
`41`		`- "url": "https://mybitbucketdeployment.com"`
	`41`	`+ "url": "https://mybitbucketdeployment.com",`
`42`	`42`	`// Include all repos in myProject...`
`43`	`43`	`"projects": [`
`44`	`44`	`"myProject"`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ export class RepoManager implements IRepoManager {`
`190`	`190`	`}`
`191`	`191`	`})();`
`192`	`192`
`193`		`- let password: string = "";`
	`193`	`+ let password: string \| undefined = undefined;`
`194`	`194`	`for (const repoConnection of repoConnections) {`
`195`	`195`	`const connection = repoConnection.connection;`
`196`	`196`	`if (connection.connectionType !== 'github' && connection.connectionType !== 'gitlab' && connection.connectionType !== 'gitea' && connection.connectionType !== 'bitbucket') {`
`@@ -201,7 +201,7 @@ export class RepoManager implements IRepoManager {`
`201`	`201`	`if (config.token) {`
`202`	`202`	`password = await getTokenFromConfig(config.token, connection.orgId, db, this.logger);`
`203`	`203`	`if (password) {`
`204`		`- // If we're using a bitbucket connection, check to see if we're provided a username`
	`204`	`+ // If we're using a bitbucket connection we need to set the username to be able to clone the repo`
`205`	`205`	`if (connection.connectionType === 'bitbucket') {`
`206`	`206`	`const bitbucketConfig = config as BitbucketConnectionConfig;`
`207`	`207`	`username = bitbucketConfig.user ?? "x-token-auth";`
`@@ -211,7 +211,9 @@ export class RepoManager implements IRepoManager {`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`214`		`- return { username, password };`
	`214`	`+ return password`
	`215`	`+ ? { username, password }`
	`216`	`+ : undefined;`
`215`	`217`	`}`
`216`	`218`
`217`	`219`	`private async syncGitRepository(repo: RepoWithConnections, repoAlreadyInIndexingState: boolean) {`