enable prebuilds

AlexTugarev · AlexTugarev · commit 3ec7952cf3cd · 2021-08-17T12:17:11.000Z
diff --git a/components/dashboard/src/projects/Prebuild.tsx b/components/dashboard/src/projects/Prebuild.tsx
@@ -16,12 +16,14 @@ import PrebuildLogs from "../components/PrebuildLogs";
 import { shortCommitMessage } from "./render-utils";
 
 export default function () {
-    const { teams } = useContext(TeamsContext);
     const location = useLocation();
+
+    const { teams } = useContext(TeamsContext);
+    const team = getCurrentTeam(location, teams);
+
     const match = useRouteMatch<{ team: string, project: string, prebuildId: string }>("/:team/:project/:prebuildId");
     const projectName = match?.params?.project;
     const prebuildId = match?.params?.prebuildId;
-    const team = getCurrentTeam(location, teams);
 
     const [ prebuild, setPrebuild ] = useState<PrebuildInfo | undefined>();
 
@@ -44,7 +46,7 @@ export default function () {
             });
             setPrebuild(prebuilds[0]);
         })();
-    }, [ teams, team ]);
+    }, [ teams ]);
 
     const renderTitle = () => {
         if (!prebuild) {
diff --git a/components/dashboard/src/projects/Prebuilds.tsx b/components/dashboard/src/projects/Prebuilds.tsx
@@ -18,11 +18,13 @@ import { shortCommitMessage } from "./render-utils";
 
 export default function () {
     const history = useHistory();
-    const { teams } = useContext(TeamsContext);
     const location = useLocation();
+
+    const { teams } = useContext(TeamsContext);
+    const team = getCurrentTeam(location, teams);
+
     const match = useRouteMatch<{ team: string, resource: string }>("/:team/:resource");
     const projectName = match?.params?.resource;
-    const team = getCurrentTeam(location, teams);
 
     // @ts-ignore
     const [project, setProject] = useState<Project | undefined>();
@@ -55,7 +57,7 @@ export default function () {
                 }
             }
         })();
-    }, [ teams, team ]);
+    }, [ teams ]);
 
     const prebuildContextMenu = (p: PrebuildInfo) => {
         const running = p.status === "building";
diff --git a/components/dashboard/src/projects/Project.tsx b/components/dashboard/src/projects/Project.tsx
@@ -18,11 +18,13 @@ import { shortCommitMessage } from "./render-utils";
 
 export default function () {
     const history = useHistory();
-    const { teams } = useContext(TeamsContext);
     const location = useLocation();
+
+    const { teams } = useContext(TeamsContext);
+    const team = getCurrentTeam(location, teams);
+
     const match = useRouteMatch<{ team: string, resource: string }>("/:team/:resource");
     const projectName = match?.params?.resource;
-    const team = getCurrentTeam(location, teams);
 
     const [project, setProject] = useState<Project | undefined>();
 
@@ -34,7 +36,7 @@ export default function () {
 
     useEffect(() => {
         updateProject();
-    }, [ teams, team ]);
+    }, [ teams ]);
 
     const updateProject = async () => {
         if (!teams || !projectName) {
@@ -87,7 +89,7 @@ export default function () {
             // TODO(at): this need to be revised once prebuild events are integrated
             return;
         }
-        if (!team || !project) {
+        if (!project) {
             return;
         }
         prebuildLoaders.add(branch.name);
diff --git a/components/dashboard/src/projects/Projects.tsx b/components/dashboard/src/projects/Projects.tsx
@@ -32,7 +32,7 @@ export default function () {
 
     useEffect(() => {
         updateProjects();
-    }, [ teams, team ]);
+    }, [ teams ]);
 
     const updateProjects = async () => {
         if (!teams) {
diff --git a/components/server/ee/src/gitlab/gitlab-app-support.ts b/components/server/ee/src/gitlab/gitlab-app-support.ts
@@ -27,7 +27,7 @@ export class GitLabAppSupport {
         // we are listing only those projects with access level of maintainers.
         // also cf. https://docs.gitlab.com/ee/api/members.html#valid-access-levels
         //
-        const projectsWithAccess = await api.Projects.all({ min_access_level: "40" });
+        const projectsWithAccess = await api.Projects.all({ min_access_level: "40", perPage: 100 });
         for (const project of projectsWithAccess) {
             const anyProject = project as any;
             const fullPath = anyProject.path_with_namespace as string;
diff --git a/components/server/ee/src/prebuilds/github-app.ts b/components/server/ee/src/prebuilds/github-app.ts
@@ -352,8 +352,8 @@ export class GithubApp {
                 }
             }
         }
-
     }
+
     protected async findInstallationOwner(installationId: number): Promise<{user: User, project?: Project} | undefined> {
         // Legacy mode
         //
diff --git a/components/server/ee/src/prebuilds/gitlab-app.ts b/components/server/ee/src/prebuilds/gitlab-app.ts
@@ -6,8 +6,8 @@
 
 import * as express from 'express';
 import { postConstruct, injectable, inject } from 'inversify';
-import { UserDB } from '@gitpod/gitpod-db/lib';
-import { User } from '@gitpod/gitpod-protocol';
+import { ProjectDB, TeamDB, UserDB } from '@gitpod/gitpod-db/lib';
+import { Project, User } from '@gitpod/gitpod-protocol';
 import { PrebuildManager } from '../prebuilds/prebuild-manager';
 import { TraceContext } from '@gitpod/gitpod-protocol/lib/util/tracing';
 import { StartPrebuildResult } from './prebuild-manager';
@@ -23,6 +23,8 @@ export class GitLabApp {
     @inject(PrebuildManager) protected readonly prebuildManager: PrebuildManager;
     @inject(TokenService) protected readonly tokenService: TokenService;
     @inject(HostContextProvider) protected readonly hostCtxProvider: HostContextProvider;
+    @inject(ProjectDB) protected readonly projectDB: ProjectDB;
+    @inject(TeamDB) protected readonly teamDB: TeamDB;
 
     protected _router = express.Router();
     public static path = '/apps/gitlab/';
@@ -97,15 +99,35 @@ export class GitLabApp {
             }
 
             log.debug({ userId: user.id }, "GitLab push hook: Starting prebuild", { body, contextURL });
-            // todo@alex: add branch and project args
-            const ws = await this.prebuildManager.startPrebuild({ span }, { user, contextURL, cloneURL: body.repository.git_http_url, commit: body.after });
+
+            const branch = this.getBranchFromRef(body.ref);
+            const project = (await this.findProjectOwner(body.repository.git_http_url))?.project;
+
+            const ws = await this.prebuildManager.startPrebuild({ span }, { user, contextURL, cloneURL: body.repository.git_http_url, commit: body.after, branch, project });
 
             return ws;
         } finally {
             span.finish();
         }
     }
 
+    protected async findProjectOwner(cloneURL: string): Promise<{user: User, project?: Project} | undefined> {
+        // Project mode
+        //
+        const project = await this.projectDB.findProjectByCloneUrl(cloneURL);
+        if (project) {
+            const owner = !!project.userId
+                ? { userId: project.userId }
+                : (await this.teamDB.findMembersByTeam(project.teamId || '')).filter(m => m.role === "owner")[0];
+            if (owner) {
+                const user = await this.userDB.findUserById(owner.userId);
+                if (user) {
+                    return { user, project};
+                }
+            }
+        }
+    }
+
     protected createContextUrl(body: GitLabPushHook) {
         const repoUrl = body.repository.git_http_url;
         const contextURL = `${repoUrl.substr(0, repoUrl.length - 4)}/-/tree${body.ref.substr('refs/head/'.length)}`;
@@ -115,16 +137,41 @@ export class GitLabApp {
     get router(): express.Router {
         return this._router;
     }
+
+    protected getBranchFromRef(ref: string): string | undefined {
+        const headsPrefix = "refs/heads/";
+        if (ref.startsWith(headsPrefix)) {
+            return ref.substring(headsPrefix.length);
+        }
+
+        return undefined;
+    }
 }
 
 interface GitLabPushHook {
     object_kind: 'push';
     before: string;
     after: string; // commit
-    ref: string; // branch
+    ref: string; // e.g. "refs/heads/master"
+    user_avatar: string;
+    user_name: string;
+    project: GitLabProject;
     repository: GitLabRepository;
 }
 
 interface GitLabRepository {
-    git_http_url: string; //e.g. http://example.com/mike/diaspora.git
+    name: string,
+    git_http_url: string; // e.g. http://example.com/mike/diaspora.git
+    visibility_level: number,
+}
+
+interface GitLabProject {
+    id: number,
+    namespace: string,
+    name: string,
+    path_with_namespace: string, // e.g. "mike/diaspora"
+    git_http_url: string; // e.g. http://example.com/mike/diaspora.git
+    web_url: string; // e.g. http://example.com/mike/diaspora
+    visibility_level: number,
+    avatar_url: string | null,
 }
diff --git a/components/server/src/gitlab/api.ts b/components/server/src/gitlab/api.ts
@@ -225,12 +225,15 @@ export namespace GitLab {
         short_id: string;
         title: string;
         message: string;
-        parent_ids: string[];
+        parent_ids: string[] | null;
+        author_name: string;
+        authored_date: string;
     }
     export interface Branch {
         commit: Commit;
         name: string;
         default: boolean;
+        web_url: string;
     }
     export interface Tag {
         name: string,
diff --git a/components/server/src/gitlab/gitlab-repository-provider.ts b/components/server/src/gitlab/gitlab-repository-provider.ts
@@ -11,6 +11,8 @@ import { GitLabApi, GitLab } from "./api";
 import { RepositoryProvider } from '../repohost/repository-provider';
 import { parseRepoUrl } from '../repohost/repo-url';
 
+import { log } from '@gitpod/gitpod-protocol/lib/util/logging';
+
 @injectable()
 export class GitlabRepositoryProvider implements RepositoryProvider {
     @inject(GitLabApi) protected readonly gitlab: GitLabApi;
@@ -31,17 +33,64 @@ export class GitlabRepositoryProvider implements RepositoryProvider {
     }
 
     async getBranch(user: User, owner: string, repo: string, branch: string): Promise<Branch> {
-        // todo
-        throw new Error("not implemented");
+        const response = await this.gitlab.run<GitLab.Branch>(user, async g => {
+            return g.Branches.show(`${owner}/${repo}`, branch);
+        });
+        if (GitLab.ApiError.is(response)) {
+            throw response;
+        }
+        return {
+            htmlUrl: response.web_url,
+            name: response.name,
+            commit: {
+                sha: response.commit.id,
+                author: response.commit.author_name,
+                authorDate: response.commit.authored_date,
+                commitMessage: "UNKNOWN COMMIT MESSAGE",
+                authorAvatarUrl: "",
+            }
+        };
     }
 
     async getBranches(user: User, owner: string, repo: string): Promise<Branch[]> {
-        // todo
-        return [];
+        const branches: Branch[] = [];
+        const response = await this.gitlab.run<GitLab.Branch[]>(user, async g => {
+            return g.Branches.all(`${owner}/${repo}`);
+        });
+        if (GitLab.ApiError.is(response)) {
+            throw response;
+        }
+        for (const b of response) {
+            branches.push({
+                htmlUrl: b.web_url,
+                name: b.name,
+                commit: {
+                    sha: b.commit.id,
+                    author: b.commit.author_name,
+                    authorDate: b.commit.authored_date,
+                    commitMessage: "UNKNOWN COMMIT MESSAGE",
+                    authorAvatarUrl: "",
+                }
+            })
+        }
+        return branches;
     }
 
     async getCommitInfo(user: User, owner: string, repo: string, ref: string): Promise<CommitInfo | undefined> {
-        // todo
-        return undefined;
+        const response = await this.gitlab.run<GitLab.Commit>(user, async g => {
+            return g.Commits.show(`${owner}/${repo}`, ref);
+        });
+        if (GitLab.ApiError.is(response)) {
+            // throw response;
+            log.debug("Failed to fetch commit.", { response });
+            return undefined;
+        }
+        return {
+            sha: response.id,
+            author: response.author_name,
+            authorDate: response.authored_date,
+            commitMessage: "UNKNOWN COMMIT MESSAGE",
+            authorAvatarUrl: "",
+        };
     }
 }
diff --git a/components/server/src/projects/projects-service.ts b/components/server/src/projects/projects-service.ts
@@ -5,7 +5,7 @@
  */
 
 import { inject, injectable } from "inversify";
-import { DBWithTracing, ProjectDB, TeamDB, TracedWorkspaceDB, WorkspaceDB } from "@gitpod/gitpod-db/lib";
+import { DBWithTracing, ProjectDB, TeamDB, TracedWorkspaceDB, UserDB, WorkspaceDB } from "@gitpod/gitpod-db/lib";
 import { Branch, CommitInfo, CreateProjectParams, FindPrebuildsParams, PrebuildInfo, PrebuiltWorkspace, Project, ProjectConfig, User } from "@gitpod/gitpod-protocol";
 import { HostContextProvider } from "../auth/host-context-provider";
 import { parseRepoUrl } from "../repohost";
@@ -16,6 +16,7 @@ export class ProjectsService {
 
     @inject(ProjectDB) protected readonly projectDB: ProjectDB;
     @inject(TeamDB) protected readonly teamDB: TeamDB;
+    @inject(UserDB) protected readonly userDB: UserDB;
     @inject(TracedWorkspaceDB) protected readonly workspaceDb: DBWithTracing<WorkspaceDB>;
     @inject(HostContextProvider) protected readonly hostContextProvider: HostContextProvider;
 
@@ -92,7 +93,34 @@ export class ProjectsService {
             ...(!!userId ? { userId } : { teamId }),
             appInstallationId
         });
-        return this.projectDB.storeProject(project);
+        await this.projectDB.storeProject(project);
+
+        // TODO(at) refactor
+
+        const parsedUrl = parseRepoUrl(project.cloneUrl);
+        if ("gitlab.com" === parsedUrl?.host) {
+            const repositoryService = this.hostContextProvider.get(parsedUrl?.host)?.services?.repositoryService;
+            if (repositoryService) {
+                let user: User | undefined;
+                if (userId) {
+                    user = await this.userDB.findUserById(userId);
+                } else if (teamId) {
+                    const owner = await (await this.teamDB.findMembersByTeam(teamId)).find(m => m.role === "owner");
+                    if (owner) {
+                        user = await this.userDB.findUserById(owner.userId);
+                    }
+                }
+                if (user) {
+                    if (await repositoryService.canInstallAutomatedPrebuilds(user, cloneUrl)) {
+                        await repositoryService.installAutomatedPrebuilds(user, cloneUrl);
+                    }
+                } else {
+                    log.error("cannot find user for project", { cloneUrl })
+                }
+            }
+        }
+
+        return project;
     }
 
     async deleteProject(projectId: string): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -352,8 +352,8 @@ export class GithubApp {`
`352`	`352`	`}`
`353`	`353`	`}`
`354`	`354`	`}`
`355`		`-`
`356`	`355`	`}`
	`356`	`+`
`357`	`357`	`protected async findInstallationOwner(installationId: number): Promise<{user: User, project?: Project} \| undefined> {`
`358`	`358`	`// Legacy mode`
`359`	`359`	`//`