Adapt nested subgroups

Author: Laurie T. Malau

components/server/ee/src/workspace/workspace-factory.ts

@@ -16,7 +16,7 @@ import { ResponseError } from 'vscode-jsonrpc';
 import { ErrorCodes } from '@gitpod/gitpod-protocol/lib/messaging/error';
 import { generateWorkspaceID } from '@gitpod/gitpod-protocol/lib/util/generate-workspace-id';
 import { HostContextProvider } from '../../../src/auth/host-context-provider';
-import { parseRepoUrl } from '../../../src/repohost';
+import { RepoURL } from '../../../src/repohost';
 
 @injectable()
 export class WorkspaceFactoryEE extends WorkspaceFactory {
@@ -153,7 +153,7 @@ export class WorkspaceFactoryEE extends WorkspaceFactory {
     protected async storePrebuildInfo(ctx: TraceContext, project: Project, pws: PrebuiltWorkspace, ws: Workspace, user: User) {
         const span = TraceContext.startSpan("storePrebuildInfo", ctx);
         const { userId, teamId, name: projectName, id: projectId } = project;
-        const parsedUrl = parseRepoUrl(project.cloneUrl);
+        const parsedUrl = RepoURL.parseRepoUrl(project.cloneUrl);
         if (!parsedUrl) {
             return;
         }

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

@@ -6,7 +6,7 @@
 
 import { Branch, CommitInfo, Repository, User } from "@gitpod/gitpod-protocol";
 import { inject, injectable } from 'inversify';
-import { parseRepoUrl } from '../repohost/repo-url';
+import { RepoURL } from '../repohost/repo-url';
 import { RepositoryProvider } from '../repohost/repository-provider';
 import { BitbucketApiFactory } from './bitbucket-api-factory';
 
@@ -19,7 +19,7 @@ export class BitbucketRepositoryProvider implements RepositoryProvider {
         const api = await this.apiFactory.create(user);
         const repo = (await api.repositories.get({ workspace: owner, repo_slug: name })).data;
         const cloneUrl = repo.links!.clone!.find((x: any) => x.name === "https")!.href!;
-        const host = parseRepoUrl(cloneUrl)!.host;
+        const host = RepoURL.parseRepoUrl(cloneUrl)!.host;
         const description = repo.description;
         const avatarUrl = repo.owner!.links!.avatar!.href;
         const webUrl = repo.links!.html!.href;

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

@@ -9,7 +9,7 @@ import { injectable, inject } from 'inversify';
 import { User, Repository } from "@gitpod/gitpod-protocol"
 import { GitHubGraphQlEndpoint, GitHubRestApi } from "./api";
 import { RepositoryProvider } from '../repohost/repository-provider';
-import { parseRepoUrl } from '../repohost/repo-url';
+import { RepoURL } from '../repohost/repo-url';
 import { Branch, CommitInfo } from '@gitpod/gitpod-protocol/src/protocol';
 
 @injectable()
@@ -20,7 +20,7 @@ export class GithubRepositoryProvider implements RepositoryProvider {
     async getRepo(user: User, owner: string, repo: string): Promise<Repository> {
         const repository = await this.github.getRepository(user, { owner, repo });
         const cloneUrl = repository.clone_url;
-        const host = parseRepoUrl(cloneUrl)!.host;
+        const host = RepoURL.parseRepoUrl(cloneUrl)!.host;
         const description = repository.description;
         const avatarUrl = repository.owner.avatar_url;
         const webUrl = repository.html_url;

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

@@ -9,7 +9,7 @@ import { injectable, inject } from 'inversify';
 import { User, Repository, Branch, CommitInfo } from "@gitpod/gitpod-protocol"
 import { GitLabApi, GitLab } from "./api";
 import { RepositoryProvider } from '../repohost/repository-provider';
-import { parseRepoUrl } from '../repohost/repo-url';
+import { RepoURL } from '../repohost/repo-url';
 
 import { log } from '@gitpod/gitpod-protocol/lib/util/logging';
 
@@ -26,7 +26,7 @@ export class GitlabRepositoryProvider implements RepositoryProvider {
         }
         const cloneUrl = response.http_url_to_repo;
         const description = response.default_branch;
-        const host = parseRepoUrl(cloneUrl)!.host;
+        const host = RepoURL.parseRepoUrl(cloneUrl)!.host;
         const avatarUrl = response.owner?.avatar_url || undefined;
         const webUrl = response.web_url;
         const defaultBranch = response.default_branch

components/server/src/projects/projects-service.ts

@@ -9,7 +9,7 @@ import { DBWithTracing, ProjectDB, TeamDB, TracedWorkspaceDB, UserDB, WorkspaceD
 import { Branch, CommitContext, PrebuildWithStatus, CreateProjectParams, FindPrebuildsParams, Project, ProjectConfig, User, WorkspaceConfig } from "@gitpod/gitpod-protocol";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { HostContextProvider } from "../auth/host-context-provider";
-import { FileProvider, parseRepoUrl } from "../repohost";
+import { FileProvider, RepoURL } from "../repohost";
 import { log } from '@gitpod/gitpod-protocol/lib/util/logging';
 import { ContextParser } from "../workspace/context-parser-service";
 import { ConfigInferrer } from "./config-inferrer";
@@ -46,13 +46,13 @@ export class ProjectsService {
     }
 
     protected getRepositoryProvider(project: Project) {
-        const parsedUrl = parseRepoUrl(project.cloneUrl);
+        const parsedUrl = RepoURL.parseRepoUrl(project.cloneUrl);
         const repositoryProvider = parsedUrl && this.hostContextProvider.get(parsedUrl.host)?.services?.repositoryProvider;
         return repositoryProvider;
     }
 
     async getBranchDetails(user: User, project: Project, branchName?: string): Promise<Project.BranchDetails[]> {
-        const parsedUrl = parseRepoUrl(project.cloneUrl);
+        const parsedUrl = RepoURL.parseRepoUrl(project.cloneUrl);
         if (!parsedUrl) {
             return [];
         }
@@ -109,7 +109,7 @@ export class ProjectsService {
 
     protected async onDidCreateProject(project: Project) {
         let { userId, teamId, cloneUrl } = project;
-        const parsedUrl = parseRepoUrl(project.cloneUrl);
+        const parsedUrl = RepoURL.parseRepoUrl(project.cloneUrl);
         if ("gitlab.com" === parsedUrl?.host) {
             const repositoryService = this.hostContextProvider.get(parsedUrl?.host)?.services?.repositoryService;
             if (repositoryService) {
@@ -140,7 +140,7 @@ export class ProjectsService {
         if (!project) {
             return [];
         }
-        const parsedUrl = parseRepoUrl(project.cloneUrl);
+        const parsedUrl = RepoURL.parseRepoUrl(project.cloneUrl);
         if (!parsedUrl) {
             return [];
         }

components/server/src/repohost/repo-url.spec.ts

@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import * as chai from 'chai';
+import { suite, test } from 'mocha-typescript';
+import { RepoURL } from './repo-url';
+
+const expect = chai.expect;
+
+@suite
+export class RepoUrlTest {
+
+    @test public parseRepoUrl() {
+        const testUrl = RepoURL.parseRepoUrl("https://gitlab.com/hello-group/my-cool-project.git")
+        expect(testUrl).to.deep.equal({
+            host: 'gitlab.com',
+            owner: 'hello-group',
+            repo: 'my-cool-project'
+        });
+    }
+
+    @test public parseSubgroupOneLevel() {
+        const testUrl = RepoURL.parseRepoUrl("https://gitlab.com/hello-group/my-subgroup/my-cool-project.git")
+        expect(testUrl).to.deep.equal({
+            host: 'gitlab.com',
+            owner: 'hello-group/my-subgroup',
+            repo: 'my-cool-project'
+        });
+    }
+
+    @test public parseSubgroupTwoLevels() {
+        const testUrl = RepoURL.parseRepoUrl("https://gitlab.com/hello-group/my-subgroup/my-sub-subgroup/my-cool-project.git")
+        expect(testUrl).to.deep.equal({
+            host: 'gitlab.com',
+            owner: 'hello-group/my-subgroup/my-sub-subgroup',
+            repo: 'my-cool-project'
+        });
+    }
+
+    @test public parseSubgroupThreeLevels() {
+        const testUrl = RepoURL.parseRepoUrl(
+            "https://gitlab.com/hello-group/my-subgroup/my-sub-subgroup/my-sub-sub-subgroup/my-cool-project.git")
+        expect(testUrl).to.deep.equal({
+            host: 'gitlab.com',
+            owner: 'hello-group/my-subgroup/my-sub-subgroup/my-sub-sub-subgroup',
+            repo: 'my-cool-project'
+        });
+    }
+
+    @test public parseSubgroupFourLevels() {
+        const testUrl = RepoURL.parseRepoUrl(
+            "https://gitlab.com/hello-group/my-subgroup/my-sub-subgroup/my-sub-sub-subgroup/my-sub-sub-sub-subgroup/my-cool-project.git")
+        expect(testUrl).to.deep.equal({
+            host: 'gitlab.com',
+            owner: 'hello-group/my-subgroup/my-sub-subgroup/my-sub-sub-subgroup/my-sub-sub-sub-subgroup',
+            repo: 'my-cool-project'
+        });
+    }
+
+}
+
+module.exports = new RepoUrlTest()

components/server/src/repohost/repo-url.ts

@@ -6,21 +6,24 @@
 
 
 import * as url from 'url';
-
-export function parseRepoUrl(repoUrl: string): { host: string, owner: string, repo: string} | undefined {
-    const u = url.parse(repoUrl);
-    const host = u.hostname || '';
-    const path = u.pathname || '';
-    const segments = path.split('/').filter(s => !!s); // e.g. [ 'gitpod-io', 'gitpod.git' ]
-    if (segments.length === 2) {
-        const owner = segments[0];
-        const repo = segments[1].endsWith('.git') ? segments[1].slice(0, -4) : segments[1];
-        return { host, owner, repo };
-    }
-    if (segments.length === 3) {
-        const owner = `${segments[0]}/${segments[1]}`;
-        const repo = segments[2].endsWith('.git') ? segments[2].slice(0, -4) : segments[1];
-        return { host, owner, repo };
+export namespace RepoURL {
+    export function parseRepoUrl(repoUrl: string): { host: string, owner: string, repo: string} | undefined {
+        const u = url.parse(repoUrl);
+        const host = u.hostname || '';
+        const path = u.pathname || '';
+        const segments = path.split('/').filter(s => !!s); // e.g. [ 'gitpod-io', 'gitpod.git' ]
+        if (segments.length === 2) {
+            const owner = segments[0];
+            const repo = segments[1].endsWith('.git') ? segments[1].slice(0, -4) : segments[1];
+            return { host, owner, repo };
+        }
+        if (segments.length > 2) {
+            const endSegment = segments[segments.length - 1];
+            const ownerSegments = segments.slice(0, segments.length-1);
+            const owner = ownerSegments.join("/");
+            const repo = endSegment.endsWith('.git') ? endSegment.slice(0, -4) : endSegment;
+            return { host, owner, repo };
+        }
+        return undefined;
     }
-    return undefined;
-}
+}

components/server/src/workspace/gitpod-server-impl.ts

@@ -34,7 +34,7 @@ import { HostContextProvider } from '../auth/host-context-provider';
 import { GuardedResource, ResourceAccessGuard, ResourceAccessOp } from '../auth/resource-access';
 import { Config } from '../config';
 import { NotFoundError, UnauthorizedError } from '../errors';
-import { parseRepoUrl } from '../repohost/repo-url';
+import { RepoURL } from '../repohost/repo-url';
 import { TermsProvider } from '../terms/terms-provider';
 import { TheiaPluginService } from '../theia-plugin/theia-plugin-service';
 import { AuthorizationService } from '../user/authorization-service';
@@ -970,7 +970,7 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
         return (await Promise.all(repositories
             .filter(repo => repo.url != undefined)
             .map(async whitelistedRepo => {
-                const repoUrl = parseRepoUrl(whitelistedRepo.url!);
+                const repoUrl = RepoURL.parseRepoUrl(whitelistedRepo.url!);
                 if (!repoUrl) return undefined;
 
                 const { host, owner, repo } = repoUrl;