Fix repo names for Bitbucket (Server)

Author: filiptronicek

components/gitpod-protocol/src/gitpod-service.ts

@@ -311,8 +311,6 @@ export interface GetDefaultWorkspaceImageResult {
 
 export interface CreateProjectParams {
     name: string;
-    /** @deprecated unused */
-    slug: string;
     cloneUrl: string;
     teamId: string;
     appInstallationId: string;

components/gitpod-protocol/src/protocol.ts

@@ -1286,6 +1286,10 @@ export interface Repository {
      * Optional date when the repository was last pushed to.
      */
     pushedAt?: string;
+    /**
+     * Optional display name (e.g. for Bitbucket)
+     */
+    displayName?: string;
 }
 
 export interface RepositoryInfo {

components/server/src/api/configuration-service-api.ts

@@ -27,9 +27,9 @@ import { PaginationToken, generatePaginationToken, parsePaginationToken } from "
 import { ctxUserId } from "../util/request-context";
 import { UserService } from "../user/user-service";
 import { SortOrder } from "@gitpod/public-api/lib/gitpod/v1/sorting_pb";
-import { Project } from "@gitpod/gitpod-protocol";
+import { CommitContext, Project } from "@gitpod/gitpod-protocol";
 import { DeepPartial } from "@gitpod/gitpod-protocol/lib/util/deep-partial";
-import { ContextService } from "../workspace/context-service";
+import { ContextParser } from "../workspace/context-parser-service";
 
 function buildUpdateObject<T extends Record<string, any>>(obj: T): Partial<T> {
     const update: Partial<T> = {};
@@ -56,8 +56,8 @@ export class ConfigurationServiceAPI implements ServiceImpl<typeof Configuration
         private readonly apiConverter: PublicAPIConverter,
         @inject(UserService)
         private readonly userService: UserService,
-        @inject(ContextService)
-        private readonly contextService: ContextService,
+        @inject(ContextParser)
+        private readonly contextParser: ContextParser,
     ) {}
 
     async createConfiguration(
@@ -76,18 +76,20 @@ export class ConfigurationServiceAPI implements ServiceImpl<typeof Configuration
             throw new ApplicationError(ErrorCodes.NOT_FOUND, "user not found");
         }
 
-        const cloneUrl = await this.contextService.parseContextUrlAsCloneUrl(installer, req.cloneUrl);
-        if (!cloneUrl) {
+        const context = await this.contextParser.handle({}, installer, req.cloneUrl);
+        if (!CommitContext.is(context)) {
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, "clone_url is not valid");
         }
 
+        // The dashboard, for example, does not provide an explicit name, so we infer it
+        const name = req.name || (context.repository.displayName ?? context.repository.name);
+
         const project = await this.projectService.createProject(
             {
                 teamId: req.organizationId,
-                name: req.name,
-                cloneUrl,
+                name,
+                cloneUrl: context.repository.cloneUrl,
                 appInstallationId: "",
-                slug: "",
             },
             installer,
         );

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

@@ -285,7 +285,7 @@ export class BitbucketServerContextParser extends AbstractContextParser implemen
         defaultBranch: BitbucketServer.Branch,
     ): Repository {
         const owner = repo.project.owner ? repo.project.owner.slug : repo.project.key;
-        const name = repo.name;
+        const name = repo.slug;
         const cloneUrl = repo.links.clone.find((u) => u.name === "http")?.href!;
         const webUrl = repo.links?.self[0]?.href?.replace(/\/browse$/, "");
 
@@ -298,6 +298,7 @@ export class BitbucketServerContextParser extends AbstractContextParser implemen
             repoKind,
             private: !repo.public,
             defaultBranch: defaultBranch.displayId || DEFAULT_BRANCH,
+            displayName: repo.name,
         };
 
         return result;

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

@@ -328,6 +328,7 @@ export class BitbucketContextParser extends AbstractContextParser implements ICo
             owner,
             private: !!repo.isPrivate,
             defaultBranch: repo.mainbranch ? repo.mainbranch.name : DEFAULT_BRANCH,
+            displayName: repo.name,
         };
         if (!!repo.parent && !!repo.parent.full_name) {
             const api = await this.api(user);

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

@@ -319,7 +319,6 @@ describe("ProjectsService", async () => {
         let project = await ps.createProject(
             {
                 name: partial.name!,
-                slug: "deprecated",
                 teamId: org.id,
                 cloneUrl: partial.cloneUrl!,
                 appInstallationId: "noid",

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

@@ -224,7 +224,7 @@ export class ProjectsService {
     }
 
     async createProject(
-        { name, slug, cloneUrl, teamId, appInstallationId }: CreateProjectParams,
+        { name, cloneUrl, teamId, appInstallationId }: CreateProjectParams,
         installer: User,
         projectSettingsDefaults: ProjectSettings = { prebuilds: Project.PREBUILD_SETTINGS_DEFAULTS },
     ): Promise<Project> {
@@ -257,14 +257,14 @@ export class ProjectsService {
         if (!hostContext || !hostContext.services) {
             throw new ApplicationError(
                 ErrorCodes.BAD_REQUEST,
-                "No GIT provider has been configured for the provided repository.",
+                "No Git provider has been configured for the provided repository.",
             );
         }
         const repoProvider = hostContext.services.repositoryProvider;
         if (!repoProvider) {
             throw new ApplicationError(
                 ErrorCodes.BAD_REQUEST,
-                "No GIT provider has been configured for the provided repository.",
+                "No Git provider has been configured for the provided repository.",
             );
         }
         const canRead = await repoProvider.hasReadAccess(installer, parsedUrl.owner, parsedUrl.repo);

components/server/src/user/env-var-service.spec.db.ts

@@ -121,7 +121,6 @@ describe("EnvVarService", async () => {
         project = await projectsService.createProject(
             {
                 name: "my-project",
-                slug: "my-project",
                 teamId: org.id,
                 cloneUrl: "https://github.com/gitpod-io/gitpod.git",
                 appInstallationId: "noid",

components/server/src/workspace/context-service.spec.db.ts

@@ -198,7 +198,6 @@ describe("ContextService", async () => {
             project = await projectService.createProject(
                 {
                     name: "my-project",
-                    slug: "my-project",
                     teamId: org.id,
                     cloneUrl: "https://github.com/gitpod-io/empty",
                     appInstallationId: "noid",

components/server/src/workspace/workspace-factory.spec.db.ts

@@ -110,7 +110,6 @@ describe("WorkspaceFactory", async () => {
         project = await projectService.createProject(
             {
                 name: "my-project",
-                slug: "my-project",
                 teamId: org.id,
                 cloneUrl: "https://github.com/gitpod-io/gitpod",
                 appInstallationId: "noid",