Update gitlab rest client

Author: jeanp413

components/server/package.json

@@ -37,7 +37,7 @@
     "@authzed/authzed-node": "^0.10.0",
     "@bufbuild/connect": "^0.8.1",
     "@bufbuild/connect-express": "^0.8.1",
-    "@gitbeaker/node": "^35.8.1",
+    "@gitbeaker/rest": "^39.12.0",
     "@gitpod/content-service": "0.1.5",
     "@gitpod/gitpod-db": "0.1.5",
     "@gitpod/gitpod-protocol": "0.1.5",

components/server/src/gitlab/api.ts

@@ -7,7 +7,7 @@
 import { injectable, inject } from "inversify";
 import { User } from "@gitpod/gitpod-protocol";
 
-import { Gitlab } from "@gitbeaker/node";
+import { Gitlab } from "@gitbeaker/rest";
 import {
     Projects,
     Users,
@@ -19,10 +19,11 @@ import {
     MergeRequests,
     Issues,
     RepositoryFiles,
+    NamespaceSchema,
+    UserSchema,
+    ExpandedUserSchema,
+    ProjectSchema,
 } from "@gitbeaker/core";
-import { ProjectExtendedSchema } from "@gitbeaker/core/dist/types/resources/Projects";
-import { NamespaceSchema } from "@gitbeaker/core/dist/types/resources/Namespaces";
-import { UserExtendedSchema, UserSchema } from "@gitbeaker/core/dist/types/resources/Users";
 import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { GitLabScope } from "./scopes";
 import { AuthProviderParams } from "../auth/auth-provider";
@@ -90,9 +91,7 @@ export class GitLabApi {
         path: string,
     ): Promise<string | undefined> {
         const projectId = `${org}/${name}`;
-        const result = await this.run<string>(user, (api) =>
-            api.RepositoryFiles.showRaw(projectId, path, { ref: commitish }),
-        );
+        const result = await this.run<string>(user, (api) => api.RepositoryFiles.showRaw(projectId, path, commitish));
         if (GitLab.ApiError.is(result)) {
             return undefined; // e.g. 404 error, because the file isn't found
         }
@@ -137,7 +136,7 @@ export namespace GitLab {
     /**
      * https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/projects.md#get-single-project
      */
-    export interface Project extends ProjectExtendedSchema {
+    export interface Project extends ProjectSchema {
         visibility: "public" | "private" | "internal";
         archived: boolean;
         path: string; // "diaspora-project-site"
@@ -227,7 +226,7 @@ export namespace GitLab {
         merge_requests_count: number;
     }
     // https://docs.gitlab.com/ee/api/users.html#list-current-user-for-normal-users
-    export interface User extends UserExtendedSchema {
+    export interface User extends ExpandedUserSchema {
         email: string;
         state: "active" | string;
     }
@@ -256,19 +255,19 @@ export namespace GitLab {
     export namespace Permissions {
         export function hasWriteAccess(repo: Project): boolean {
             if (repo.permissions.project_access) {
-                return repo.permissions.project_access.access_level >= 30;
+                return (repo.permissions.project_access as unknown as { access_level: number }).access_level >= 30;
             }
             if (repo.permissions.group_access) {
-                return repo.permissions.group_access.access_level >= 30;
+                return (repo.permissions.group_access as unknown as { access_level: number }).access_level >= 30;
             }
             return false;
         }
         export function hasMaintainerAccess(repo: Project): boolean {
             if (repo.permissions.project_access) {
-                return repo.permissions.project_access.access_level >= 40;
+                return (repo.permissions.project_access as unknown as { access_level: number }).access_level >= 40;
             }
             if (repo.permissions.group_access) {
-                return repo.permissions.group_access.access_level >= 40;
+                return (repo.permissions.group_access as unknown as { access_level: number }).access_level >= 40;
             }
             return false;
         }

components/server/src/gitlab/file-provider.ts

@@ -30,7 +30,7 @@ export class GitlabFileProvider implements FileProvider {
         path: string,
     ): Promise<string> {
         const result = await this.gitlabApi.run<GitLab.Commit[]>(user, async (g) => {
-            return g.Commits.all(`${repository.owner}/${repository.name}`, { path, ref_name: revisionOrBranch });
+            return g.Commits.all(`${repository.owner}/${repository.name}`, { path, refName: revisionOrBranch });
         });
 
         if (GitLab.ApiError.is(result)) {

components/server/src/gitlab/gitlab-app-support.ts

@@ -6,7 +6,7 @@
 
 import { AuthProviderInfo, ProviderRepository, User } from "@gitpod/gitpod-protocol";
 import { inject, injectable } from "inversify";
-import { Gitlab } from "@gitbeaker/node";
+import { Gitlab } from "@gitbeaker/rest";
 import { GitLab } from "./api";
 import { TokenProvider } from "../user/token-provider";
 
@@ -36,7 +36,7 @@ export class GitLabAppSupport {
         // also cf. https://docs.gitlab.com/ee/api/members.html#valid-access-levels
         //
         const projectsWithAccess = await api.Projects.all({
-            min_access_level: "40",
+            minAccessLevel: 40,
             perPage: 100,
         });
         for (const project of projectsWithAccess) {

components/server/src/gitlab/gitlab-auth-provider.ts

@@ -66,7 +66,7 @@ export class GitLabAuthProvider extends GenericAuthProvider {
             host: this.baseURL,
         });
         const getCurrentUser = async () => {
-            const response = await api.Users.current();
+            const response = await api.Users.showCurrentUser();
             return response as unknown as GitLab.User;
         };
         const unconfirmedUserMessage = "Please confirm your GitLab account and try again.";

components/server/src/gitlab/gitlab-context-parser.ts

@@ -222,7 +222,7 @@ export class GitlabContextParser extends AbstractContextParser implements IConte
             }
 
             const result = await this.gitlabApi.run<GitLab.TreeObject[]>(user, async (g) => {
-                return g.Repositories.tree(`${owner}/${repoName}`, {
+                return g.Repositories.allRepositoryTrees(`${owner}/${repoName}`, {
                     ref: branchOrTag.name,
                     path: path.dirname(branchOrTag.fullPath),
                 });
@@ -421,7 +421,7 @@ export class GitlabContextParser extends AbstractContextParser implements IConte
     ): Promise<IssueContext> {
         const ctxPromise = this.handleDefaultContext(user, host, owner, repoName);
         const result = await this.gitlabApi.run<GitLab.Issue>(user, async (g) => {
-            return g.Issues.show(`${owner}/${repoName}`, nr);
+            return g.Issues.show(nr, { projectId: `${owner}/${repoName}` });
         });
         if (GitLab.ApiError.is(result)) {
             throw await NotFoundError.create(await this.tokenHelper.getCurrentToken(user), user, host, owner, repoName);

components/server/src/gitlab/gitlab-file-provider.spec.ts

@@ -75,9 +75,8 @@ class TestFileProvider {
                 const project = await api.run<GitLab.Project>(this.user, (g) =>
                     g.Projects.create({
                         name: `test_project_${i}`,
-                        path: `test_project_${i}`,
-                        namespace_id: 57982169,
-                        initialize_with_readme: true,
+                        namespaceId: 57982169,
+                        initializeWithReadme: true,
                         description: "generated project to test pagination",
                     }),
                 );

components/server/src/gitlab/gitlab-repository-provider.ts

@@ -126,8 +126,8 @@ export class GitlabRepositoryProvider implements RepositoryProvider {
         const projectId = `${owner}/${repo}`;
         const result = await this.gitlab.run<GitLab.Commit[]>(user, async (g) => {
             return g.Commits.all(projectId, {
-                ref_name: ref,
-                per_page: maxDepth,
+                refName: ref,
+                perPage: maxDepth,
                 page: 1,
             });
         });