💄

Author: jeanp413

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

@@ -23,7 +23,11 @@ export interface ProjectDB extends TransactionalDB<ProjectDB> {
     storeProject(project: Project): Promise<Project>;
     updateProject(partialProject: PartialProject): Promise<void>;
     markDeleted(projectId: string): Promise<void>;
-    setProjectEnvironmentVariable(projectId: string, name: string, value: string, censored: boolean): Promise<void>;
+    findProjectEnvironmentVariable(
+        projectId: string,
+        envVar: ProjectEnvVarWithValue,
+    ): Promise<ProjectEnvVar | undefined>;
+    setProjectEnvironmentVariable(projectId: string, envVar: ProjectEnvVarWithValue): Promise<void>;
     getProjectEnvironmentVariables(projectId: string): Promise<ProjectEnvVar[]>;
     getProjectEnvironmentVariableById(variableId: string): Promise<ProjectEnvVar | undefined>;
     deleteProjectEnvironmentVariable(variableId: string): Promise<void>;

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

@@ -17,7 +17,7 @@ import { DBProjectUsage } from "./entity/db-project-usage";
 import { TransactionalDBImpl } from "./transactional-db-impl";
 import { TypeORM } from "./typeorm";
 
-function toProjectEnvVar(envVarWithValue: ProjectEnvVarWithValue): ProjectEnvVar {
+function toProjectEnvVar(envVarWithValue: DBProjectEnvVar): ProjectEnvVar {
     const envVar = { ...envVarWithValue };
     delete (envVar as any)["value"];
     return envVar;
@@ -160,35 +160,38 @@ export class ProjectDBImpl extends TransactionalDBImpl<ProjectDB> implements Pro
         }
     }
 
-    public async setProjectEnvironmentVariable(
+    public async findProjectEnvironmentVariable(
         projectId: string,
-        name: string,
-        value: string,
-        censored: boolean,
-    ): Promise<void> {
-        if (!name) {
+        envVar: ProjectEnvVarWithValue,
+    ): Promise<ProjectEnvVar | undefined> {
+        const envVarRepo = await this.getProjectEnvVarRepo();
+        return envVarRepo.findOne({ projectId, name: envVar.name, deleted: false });
+    }
+
+    public async setProjectEnvironmentVariable(projectId: string, envVar: ProjectEnvVarWithValue): Promise<void> {
+        if (!envVar.name) {
             throw new Error("Variable name cannot be empty");
         }
-        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)) {
+        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(envVar.name)) {
             throw new Error(
                 "Please choose a variable name containing only letters, numbers, or _, and which doesn't start with a number",
             );
         }
         const envVarRepo = await this.getProjectEnvVarRepo();
-        const envVarWithValue = await envVarRepo.findOne({ projectId, name, deleted: false });
+        const envVarWithValue = await envVarRepo.findOne({ projectId, name: envVar.name, deleted: false });
         if (envVarWithValue) {
             await envVarRepo.update(
                 { id: envVarWithValue.id, projectId: envVarWithValue.projectId },
-                { value, censored },
+                { value: envVar.value, censored: envVar.censored },
             );
             return;
         }
         await envVarRepo.save({
             id: uuidv4(),
             projectId,
-            name,
-            value,
-            censored,
+            name: envVar.name,
+            value: envVar.value,
+            censored: envVar.censored,
             creationTime: new Date().toISOString(),
             deleted: false,
         });

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

@@ -15,6 +15,7 @@ import {
     TokenEntry,
     User,
     UserEnvVar,
+    UserEnvVarValue,
     UserSSHPublicKey,
 } from "@gitpod/gitpod-protocol";
 import { EncryptionService } from "@gitpod/gitpod-protocol/lib/encryption/encryption-service";
@@ -28,7 +29,7 @@ import {
     OAuthUser,
 } from "@jmondi/oauth2-server";
 import { inject, injectable, optional } from "inversify";
-import { EntityManager, Repository } from "typeorm";
+import { EntityManager, Equal, Not, Repository } from "typeorm";
 import { v4 as uuidv4 } from "uuid";
 import {
     BUILTIN_WORKSPACE_PROBE_USER_ID,
@@ -396,9 +397,27 @@ export class TypeORMUserDBImpl extends TransactionalDBImpl<UserDB> implements Us
         return Number.parseInt(count);
     }
 
-    public async setEnvVar(envVar: UserEnvVar): Promise<void> {
+    public async findEnvVar(userId: string, envVar: UserEnvVarValue): Promise<UserEnvVar | undefined> {
         const repo = await this.getUserEnvVarRepo();
-        await repo.save(envVar);
+        return repo.findOne({
+            where: {
+                userId,
+                name: envVar.name,
+                repositoryPattern: envVar.repositoryPattern,
+                deleted: Not(Equal(true)),
+            },
+        });
+    }
+
+    public async setEnvVar(userId: string, envVar: UserEnvVarValue): Promise<void> {
+        const repo = await this.getUserEnvVarRepo();
+        await repo.save({
+            id: envVar.id || uuidv4(),
+            userId,
+            name: envVar.name,
+            repositoryPattern: envVar.repositoryPattern,
+            value: envVar.value,
+        });
     }
 
     public async getEnvVars(userId: string): Promise<UserEnvVar[]> {
@@ -408,9 +427,8 @@ export class TypeORMUserDBImpl extends TransactionalDBImpl<UserDB> implements Us
     }
 
     public async deleteEnvVar(envVar: UserEnvVar): Promise<void> {
-        envVar.deleted = true;
         const repo = await this.getUserEnvVarRepo();
-        await repo.save(envVar);
+        await repo.update({ userId: envVar.userId, id: envVar.id }, { deleted: true });
     }
 
     public async hasSSHPublicKey(userId: string): Promise<boolean> {

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

@@ -14,6 +14,7 @@ import {
     TokenEntry,
     User,
     UserEnvVar,
+    UserEnvVarValue,
     UserSSHPublicKey,
 } from "@gitpod/gitpod-protocol";
 import { OAuthTokenRepository, OAuthUserRepository } from "@jmondi/oauth2-server";
@@ -112,7 +113,8 @@ export interface UserDB extends OAuthUserRepository, OAuthTokenRepository, Trans
      */
     findUsersByEmail(email: string): Promise<User[]>;
 
-    setEnvVar(envVar: UserEnvVar): Promise<void>;
+    findEnvVar(userId: string, envVar: UserEnvVarValue): Promise<UserEnvVar | undefined>;
+    setEnvVar(userId: string, envVar: UserEnvVarValue): Promise<void>;
     deleteEnvVar(envVar: UserEnvVar): Promise<void>;
     getEnvVars(userId: string): Promise<UserEnvVar[]>;
 

components/gitpod-protocol/src/protocol.ts

@@ -396,12 +396,14 @@ export interface EnvVarWithValue {
 }
 
 export interface ProjectEnvVarWithValue extends EnvVarWithValue {
-    id: string;
-    projectId: string;
+    id?: string;
     censored: boolean;
 }
 
-export type ProjectEnvVar = Omit<ProjectEnvVarWithValue, "value">;
+export interface ProjectEnvVar extends Omit<ProjectEnvVarWithValue, "value"> {
+    id: string;
+    projectId: string;
+}
 
 export interface UserEnvVarValue extends EnvVarWithValue {
     id?: string;