Merge branch 'main' into ft/focus-targets

Author: filiptronicek

components/dashboard/src/components/UsageBasedBillingConfig.tsx

@@ -196,8 +196,6 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
     const showBalance = !showSpinner;
     const showUpgradeTeam =
         !showSpinner && AttributionId.parse(attributionId)?.kind === "team" && !stripeSubscriptionId;
-    const showUpgradeUser =
-        !showSpinner && AttributionId.parse(attributionId)?.kind === "user" && !stripeSubscriptionId;
     const showManageBilling = !showSpinner && !!stripeSubscriptionId;
 
     const updateUsageLimit = useCallback(
@@ -230,13 +228,7 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
 
     return (
         <div className="mb-16">
-            {!hideSubheading && (
-                <Subheading>
-                    {attributionId && AttributionId.parse(attributionId)?.kind === "user"
-                        ? "Manage billing for your personal account."
-                        : "Manage billing for your organization."}
-                </Subheading>
-            )}
+            {!hideSubheading && <Subheading>Manage billing for your organization.</Subheading>}
             <div className="max-w-xl flex flex-col">
                 {errorMessage && (
                     <Alert className="max-w-xl mt-2" closable={false} showIcon={true} type="error">
@@ -305,7 +297,7 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
                         </div>
                     </div>
                 )}
-                {(showUpgradeTeam || showUpgradeUser) && (
+                {showUpgradeTeam && (
                     <>
                         <div className="flex flex-col mt-4 p-4 rounded-t-xl bg-gray-50 dark:bg-gray-800">
                             <div className="uppercase text-sm text-gray-400 dark:text-gray-500">Current Plan</div>
@@ -391,11 +383,7 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
             )}
             {showUpdateLimitModal && (
                 <UpdateLimitModal
-                    minValue={
-                        AttributionId.parse(attributionId || "")?.kind === "user"
-                            ? BASE_USAGE_LIMIT_FOR_STRIPE_USERS
-                            : 0
-                    }
+                    minValue={0}
                     currentValue={usageLimit}
                     onClose={() => setShowUpdateLimitModal(false)}
                     onUpdate={async (newLimit) => await updateUsageLimit(newLimit)}

components/dashboard/src/workspaces/CreateWorkspacePage.tsx

@@ -181,7 +181,7 @@ export function CreateWorkspacePage() {
     const [selectAccountError, setSelectAccountError] = useState<SelectAccountPayload | undefined>(undefined);
 
     const createWorkspace = useCallback(
-        async (options?: Omit<GitpodServer.CreateWorkspaceOptions, "contextUrl">) => {
+        async (options?: Omit<GitpodServer.CreateWorkspaceOptions, "contextUrl" | "organizationId">) => {
             // add options from search params
             const opts = options || {};
 

components/gitpod-cli/cmd/ssh.go

@@ -0,0 +1,50 @@
+// Copyright (c) 2023 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.
+
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/gitpod"
+
+	"github.com/spf13/cobra"
+)
+
+// todo(ft): distribute this common metadata from the root command to all subcommands to reduce latency
+var gitpodHost = os.Getenv("GITPOD_HOST")
+
+// sshCmd represents the ssh command
+var sshCmd = &cobra.Command{
+	Use:   "ssh",
+	Short: "Show the SSH connection command for the current workspace",
+	Long: fmt.Sprintf(`Displays a command with which you can connect to the current workspace.
+The returned command requires SSH keys to be configured with Gitpod.
+See %s/user/keys for a guide on setting them up.
+`, gitpodHost), RunE: func(cmd *cobra.Command, args []string) error {
+		ctx, cancel := context.WithTimeout(cmd.Context(), 10*time.Second)
+		defer cancel()
+
+		wsInfo, err := gitpod.GetWSInfo(ctx)
+		if err != nil {
+			return fmt.Errorf("cannot get workspace info: %w", err)
+		}
+
+		host := strings.Replace(wsInfo.WorkspaceUrl, wsInfo.WorkspaceId, wsInfo.WorkspaceId+".ssh", -1)
+		sshKeyHost := fmt.Sprintf(`%s@%s`, wsInfo.WorkspaceId, host)
+
+		sshCommand := fmt.Sprintf(`ssh '%s'`, sshKeyHost)
+		fmt.Println(sshCommand)
+
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(sshCmd)
+}

components/gitpod-db/src/project-db.spec.db.ts

@@ -51,6 +51,7 @@ class ProjectDBSpec {
             slug: "some-project",
             cloneUrl: "some-random-clone-url",
             userId: user.id,
+            teamId: "team-1",
             appInstallationId: "app-1",
         });
         const searchTerm = "rand";

components/gitpod-db/src/team-db.ts

@@ -12,9 +12,10 @@ import {
     OrganizationSettings,
 } from "@gitpod/gitpod-protocol";
 import { DBTeamMembership } from "./typeorm/entity/db-team-membership";
+import { TransactionalDB } from "./typeorm/transactional-db-impl";
 
 export const TeamDB = Symbol("TeamDB");
-export interface TeamDB {
+export interface TeamDB extends TransactionalDB<TeamDB> {
     findTeams(
         offset: number,
         limit: number,

components/gitpod-db/src/typeorm/entity/db-project.ts

@@ -30,7 +30,7 @@ export class DBProject {
         transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED,
     })
     @Index("ind_teamId")
-    teamId?: string;
+    teamId: string;
 
     @Column({
         default: "",

components/gitpod-db/src/typeorm/entity/db-workspace.ts

@@ -36,7 +36,7 @@ export class DBWorkspace implements Workspace {
         transformer: Transformer.MAP_NULL_TO_UNDEFINED,
     })
     @Index()
-    organizationId?: string;
+    organizationId: string;
 
     @Column(TypeORM.UUID_COLUMN_TYPE)
     @Index()

components/gitpod-db/src/typeorm/migration/1686907204398-FreeCredits.ts

@@ -5,9 +5,14 @@
  */
 
 import { MigrationInterface, QueryRunner } from "typeorm";
+import { tableExists } from "./helper/helper";
 
 export class FreeCredits1686907204398 implements MigrationInterface {
     public async up(queryRunner: QueryRunner): Promise<void> {
+        if (await tableExists(queryRunner, "d_b_free_credits")) {
+            return;
+        }
+
         await queryRunner.query(
             `
             CREATE TABLE d_b_free_credits (

components/gitpod-db/src/typeorm/team-db-impl.ts

@@ -12,9 +12,8 @@ import {
     OrganizationSettings,
     User,
 } from "@gitpod/gitpod-protocol";
-import { inject, injectable } from "inversify";
-import { TypeORM } from "./typeorm";
-import { Repository } from "typeorm";
+import { inject, injectable, optional } from "inversify";
+import { EntityManager, Repository } from "typeorm";
 import { v4 as uuidv4 } from "uuid";
 import { randomBytes } from "crypto";
 import { TeamDB } from "../team-db";
@@ -26,13 +25,16 @@ import { ResponseError } from "vscode-jsonrpc";
 import { ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import slugify from "slugify";
 import { DBOrgSettings } from "./entity/db-team-settings";
+import { TransactionalDBImpl, UndefinedEntityManager } from "./transactional-db-impl";
 
 @injectable()
-export class TeamDBImpl implements TeamDB {
-    @inject(TypeORM) typeORM: TypeORM;
+export class TeamDBImpl extends TransactionalDBImpl<TeamDB> implements TeamDB {
+    constructor(@inject(UndefinedEntityManager) @optional() transactionalEM: EntityManager | undefined) {
+        super(transactionalEM);
+    }
 
-    protected async getEntityManager() {
-        return (await this.typeORM.getConnection()).manager;
+    protected createTransactionalDB(transactionalEM: EntityManager): TeamDB {
+        return new TeamDBImpl(transactionalEM);
     }
 
     protected async getTeamRepo(): Promise<Repository<DBTeam>> {

components/gitpod-db/src/user-db.spec.db.ts

@@ -287,6 +287,7 @@ namespace TestData {
         deleted: false,
         readonly: false,
     };
+    export const organizationId: string = "org1";
     export const ID1: Identity = { ...DEFAULT, authId: "2345" };
     export const ID2: Identity = { ...DEFAULT, authId: "3456", authProviderId: "Public-GitLab" };
     export const ID3: Identity = { ...DEFAULT, authId: "4567", authProviderId: "ACME" };
@@ -301,6 +302,7 @@ namespace TestData {
             image: "",
             tasks: [],
         },
+        organizationId,
         context: { title: "example" },
         contextURL: "example.org",
         description: "blabla",