Update priority (prioritize User level vars)

Author: filiptronicek

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

@@ -311,7 +311,7 @@ describe("EnvVarService", async () => {
         const workspaceConfig: WorkspaceConfig = {
             env: {
                 foobar: "yes please",
-                [fooAnyUserEnvVar.name]: "overridden",
+                [fooAnyUserEnvVar.name]: "overridden_by_user_var",
             },
         };
 
@@ -336,7 +336,7 @@ describe("EnvVarService", async () => {
             })),
         );
         expect(envVars.workspace).to.have.deep.members([
-            { name: fooAnyUserEnvVar.name, value: "overridden" },
+            fooAnyUserEnvVar,
             barUserCommitEnvVar,
             bazProjectEnvVar,
             { name: "foobar", value: "yes please" },

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

@@ -260,14 +260,7 @@ export class EnvVarService {
             };
         }
 
-        // 1. first merge user envs
-        if (CommitContext.is(wsContext)) {
-            // this is a commit context, thus we can filter the env vars
-            const userEnvVars = await this.userDB.getEnvVars(requestorId);
-            merge(UserEnvVar.filter(userEnvVars, wsContext.repository.owner, wsContext.repository.name));
-        }
-
-        // 2. then from the .gitpod.yml
+        // 1. first merge the `env` in the .gitpod.yml
         if (wsConfig?.env) {
             const configEnvVars = Object.entries(wsConfig.env as Record<string, string>).map(([name, value]) => ({
                 name,
@@ -276,6 +269,13 @@ export class EnvVarService {
             merge(configEnvVars);
         }
 
+        // 2. then user envs
+        if (CommitContext.is(wsContext)) {
+            // this is a commit context, thus we can filter the env vars
+            const userEnvVars = await this.userDB.getEnvVars(requestorId);
+            merge(UserEnvVar.filter(userEnvVars, wsContext.repository.owner, wsContext.repository.name));
+        }
+
         // 3. then from the project
         if (projectEnvVars.length) {
             // Instead of using an access guard for Project environment variables, we let Project owners decide whether