nit

Author: mustard-mh

components/dashboard/src/service/json-rpc-envvar-client.ts

@@ -47,7 +47,7 @@ export class JsonRpcEnvvarClient implements PromiseClient<typeof EnvironmentVari
         req: PartialMessage<UpdateUserEnvironmentVariableRequest>,
     ): Promise<UpdateUserEnvironmentVariableResponse> {
         if (!req.envVarId) {
-            throw new ConnectError("id is not set", Code.InvalidArgument);
+            throw new ConnectError("envVarId is required", Code.InvalidArgument);
         }
 
         const response = new UpdateUserEnvironmentVariableResponse();
@@ -81,7 +81,7 @@ export class JsonRpcEnvvarClient implements PromiseClient<typeof EnvironmentVari
         req: PartialMessage<CreateUserEnvironmentVariableRequest>,
     ): Promise<CreateUserEnvironmentVariableResponse> {
         if (!req.name || !req.value || !req.repositoryPattern) {
-            throw new ConnectError("invalid argument", Code.InvalidArgument);
+            throw new ConnectError("name, value and repositoryPattern are required", Code.InvalidArgument);
         }
 
         const response = new CreateUserEnvironmentVariableResponse();
@@ -112,7 +112,7 @@ export class JsonRpcEnvvarClient implements PromiseClient<typeof EnvironmentVari
         req: PartialMessage<DeleteUserEnvironmentVariableRequest>,
     ): Promise<DeleteUserEnvironmentVariableResponse> {
         if (!req.envVarId) {
-            throw new ConnectError("invalid argument", Code.InvalidArgument);
+            throw new ConnectError("envVarId is required", Code.InvalidArgument);
         }
 
         const variable: UserEnvVarValue = {
@@ -132,7 +132,7 @@ export class JsonRpcEnvvarClient implements PromiseClient<typeof EnvironmentVari
         req: PartialMessage<ListConfigurationEnvironmentVariablesRequest>,
     ): Promise<ListConfigurationEnvironmentVariablesResponse> {
         if (!req.configurationId) {
-            throw new ConnectError("configurationId is not set", Code.InvalidArgument);
+            throw new ConnectError("configurationId is required", Code.InvalidArgument);
         }
 
         const result = new ListConfigurationEnvironmentVariablesResponse();
@@ -146,10 +146,10 @@ export class JsonRpcEnvvarClient implements PromiseClient<typeof EnvironmentVari
         req: PartialMessage<UpdateConfigurationEnvironmentVariableRequest>,
     ): Promise<UpdateConfigurationEnvironmentVariableResponse> {
         if (!req.envVarId) {
-            throw new ConnectError("envVarId is not set", Code.InvalidArgument);
+            throw new ConnectError("envVarId is required", Code.InvalidArgument);
         }
         if (!req.configurationId) {
-            throw new ConnectError("configurationId is not set", Code.InvalidArgument);
+            throw new ConnectError("configurationId is required", Code.InvalidArgument);
         }
 
         const response = new UpdateConfigurationEnvironmentVariableResponse();
@@ -183,7 +183,7 @@ export class JsonRpcEnvvarClient implements PromiseClient<typeof EnvironmentVari
         req: PartialMessage<CreateConfigurationEnvironmentVariableRequest>,
     ): Promise<CreateConfigurationEnvironmentVariableResponse> {
         if (!req.configurationId || !req.name || !req.value) {
-            throw new ConnectError("invalid argument", Code.InvalidArgument);
+            throw new ConnectError("configurationId, name and value are required", Code.InvalidArgument);
         }
 
         const response = new CreateConfigurationEnvironmentVariableResponse();
@@ -212,7 +212,7 @@ export class JsonRpcEnvvarClient implements PromiseClient<typeof EnvironmentVari
         req: PartialMessage<DeleteConfigurationEnvironmentVariableRequest>,
     ): Promise<DeleteConfigurationEnvironmentVariableResponse> {
         if (!req.envVarId) {
-            throw new ConnectError("invalid argument", Code.InvalidArgument);
+            throw new ConnectError("envVarId is required", Code.InvalidArgument);
         }
 
         await getGitpodService().server.deleteProjectEnvironmentVariable(req.envVarId);

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

@@ -416,7 +416,7 @@ export class TypeORMUserDBImpl extends TransactionalDBImpl<UserDB> implements Us
             const envVarRepo = ctx.entityManager.getRepository<DBUserEnvVar>(DBUserEnvVar);
 
             await envVarRepo.update(
-                { id: envVar.id, userId },
+                { id: envVar.id, userId, deleted: false },
                 filter(envVar, (_, v) => v !== null && v !== undefined),
             );
 

components/gitpod-db/src/utils.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * 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.
  */

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

@@ -31,7 +31,7 @@ import {
 import { inject, injectable } from "inversify";
 import { EnvVarService } from "../user/env-var-service";
 import { PublicAPIConverter } from "@gitpod/gitpod-protocol/lib/public-api-converter";
-import { ProjectEnvVarWithValue, UserEnvVar, UserEnvVarValue } from "@gitpod/gitpod-protocol";
+import { ProjectEnvVarWithValue, UserEnvVarValue } from "@gitpod/gitpod-protocol";
 import { WorkspaceService } from "../workspace/workspace-service";
 import { ctxUserId } from "../util/request-context";
 import { validate as uuidValidate } from "uuid";
@@ -97,7 +97,6 @@ export class EnvironmentVariableServiceAPI implements ServiceImpl<typeof Environ
             value: req.value,
             repositoryPattern: req.repositoryPattern,
         };
-        variable.repositoryPattern = UserEnvVar.normalizeRepoPattern(variable.repositoryPattern);
 
         const result = await this.envVarService.addUserEnvVar(ctxUserId(), ctxUserId(), variable);
         response.environmentVariable = this.apiConverter.toUserEnvironmentVariable(result);
@@ -154,8 +153,6 @@ export class EnvironmentVariableServiceAPI implements ServiceImpl<typeof Environ
             throw new ConnectError("envVarId is required", Code.InvalidArgument);
         }
 
-        const response = new UpdateConfigurationEnvironmentVariableResponse();
-
         const updatedProjectEnvVar = await this.envVarService.updateProjectEnvVar(ctxUserId(), req.configurationId, {
             id: req.envVarId,
             censored: req.admission
@@ -165,6 +162,7 @@ export class EnvironmentVariableServiceAPI implements ServiceImpl<typeof Environ
                 : undefined,
         });
 
+        const response = new UpdateConfigurationEnvironmentVariableResponse();
         response.environmentVariable = this.apiConverter.toConfigurationEnvironmentVariable(updatedProjectEnvVar);
         return response;
     }
@@ -173,17 +171,16 @@ export class EnvironmentVariableServiceAPI implements ServiceImpl<typeof Environ
         req: CreateConfigurationEnvironmentVariableRequest,
         _: HandlerContext,
     ): Promise<CreateConfigurationEnvironmentVariableResponse> {
-        const response = new CreateConfigurationEnvironmentVariableResponse();
-
         const variable: ProjectEnvVarWithValue = {
             name: req.name,
             value: req.value,
             censored: req.admission === EnvironmentVariableAdmission.PREBUILD ? true : false,
         };
 
         const result = await this.envVarService.addProjectEnvVar(ctxUserId(), req.configurationId, variable);
-        response.environmentVariable = this.apiConverter.toConfigurationEnvironmentVariable(result);
 
+        const response = new CreateConfigurationEnvironmentVariableResponse();
+        response.environmentVariable = this.apiConverter.toConfigurationEnvironmentVariable(result);
         return response;
     }