decouple gp env from theia #3569

akosyakov · 2021-03-24T10:28:06Z

What it does

fix [gp] Support gp env by talking to server directly #3162: decouple gp env from theia

How to test

test both Theia and VS Code
get: should return exact and wildcard matches, should not return unmatched i.e. wildcards or other repos
set/delete: should create, updated or delete based on exact matches, should not mutate unmatched i.e. wildcards or other repos

components/gitpod-protocol/go/reconnecting-ws.go

geropl · 2021-03-26T09:27:53Z

components/server/src/auth/resource-access.ts

@@ -176,11 +218,14 @@ export namespace ScopedResourceGuard {

    export const SNAPSHOT_WORKSPACE_SUBJECT_ID_PREFIX = 'ws-'

-    export interface ResourceScope {
-        kind: GuardedResourceKind;
+    export interface ResourceScope<K extends GuardedResourceKind = GuardedResourceKind> {


components/server/src/workspace/gitpod-server-impl.ts

geropl · 2021-03-26T09:32:37Z

components/server/src/workspace/gitpod-server-impl.ts

        const envvar: UserEnvVar = {
            ...variable,
            id: variable.id || uuidv4(),
            userId: user.id,
        };
+        await this.guardAccess({ kind: 'envVar', subject: envvar }, typeof variable.id === 'string' ? 'update' : 'create');


geropl · 2021-03-26T09:33:25Z

components/server/src/workspace/gitpod-server-impl.ts

        await this.userDB.setEnvVar(envvar);
    }

    async deleteEnvVar(variable: UserEnvVarValue): Promise<void> {
        // Note: this operation is per-user only, hence needs no resource guard
        const user = this.checkUser("deleteEnvVar");

+        if (!variable.id && variable.name && variable.repositoryPattern) {


This seems to be the same/a similar check as above. Would it make sense to extract those into one method isUpdate?

I would prefer to keep code like that, since I'm not sure about client expectation when id is provided for delete.

Ideally I would remove id completely and use (name, repositoryPattern) as a primary key.

geropl · 2021-03-26T09:35:45Z

/werft run

👍 started the job as gitpod-build-akosyakov-gp-support-gp-env-by-3162.22

will test now...

geropl · 2021-03-26T12:23:04Z

Tested, and works as advertised. Not approving yet due to the ongoing discussions above. ☝️

JanKoehnlein

LGTM

akosyakov · 2021-03-27T09:18:18Z

components/gitpod-cli/cmd/git-token-validator.go

@@ -35,6 +36,13 @@ var gitTokenValidator = &cobra.Command{
 	Args:   cobra.ExactArgs(0),
 	Hidden: true,
 	Run: func(cmd *cobra.Command, args []string) {
+		log.SetOutput(io.Discard)


@JanKoehnlein Does it make sense to you? Otherwise I am not sure where everything get logged?

Yes, it makes sense. I am just not sure whether we should use another file. The credential helper could still have the same file open for appending, as it starts the token validator in background and then releases the file on exit. Anyway, this shouldn't be a problem on Linux.

akosyakov · 2021-03-29T06:20:33Z

/werft run

👍 started the job as gitpod-build-akosyakov-gp-support-gp-env-by-3162.24

JanKoehnlein

LGTM

JanKoehnlein

In VS Code

$ gp env BAR=BAR
cannot set BAR: jsonrpc2: code 403 message: operation not permitted: missing create permission on envVar

JanKoehnlein · 2021-03-29T11:18:12Z

When I try to unset a variable with a wildcard scope using gp env, I get an unhelpful error message

cannot unset foo: jsonrpc2: code 404 message: Missing ID field

Apart from that it works fin now, in Theia and VS Code.

JanKoehnlein

LGTM

akosyakov · 2021-03-29T14:07:41Z

/werft run

👍 started the job as gitpod-build-akosyakov-gp-support-gp-env-by-3162.29

akosyakov mentioned this pull request Mar 24, 2021

[WIP][gp] Support gp env by talking to server directly #3379

Closed

akosyakov force-pushed the akosyakov/gp-support-gp-env-by-3162 branch 14 times, most recently from 8a02196 to ade6376 Compare March 25, 2021 13:22

akosyakov mentioned this pull request Mar 25, 2021

[dashboard] Env Variables & Misc Fixes #3581

Merged

5 tasks

akosyakov force-pushed the akosyakov/gp-support-gp-env-by-3162 branch from fa9cace to 16a56e0 Compare March 25, 2021 19:38

akosyakov marked this pull request as ready for review March 25, 2021 19:53

akosyakov requested review from csweichel, geropl, JanKoehnlein and svenefftinge March 25, 2021 19:56

geropl reviewed Mar 26, 2021

View reviewed changes

components/gitpod-protocol/go/reconnecting-ws.go Show resolved Hide resolved

geropl reviewed Mar 26, 2021

View reviewed changes

components/server/src/workspace/gitpod-server-impl.ts Show resolved Hide resolved

geropl reviewed Mar 26, 2021

View reviewed changes

JanKoehnlein approved these changes Mar 26, 2021

View reviewed changes

akosyakov mentioned this pull request Mar 27, 2021

[git] implement scope elevation in server #3565

Merged

akosyakov force-pushed the akosyakov/gp-support-gp-env-by-3162 branch from 16a56e0 to 09b2dcd Compare March 27, 2021 09:17

akosyakov commented Mar 27, 2021

View reviewed changes

JanKoehnlein approved these changes Mar 29, 2021

View reviewed changes

JanKoehnlein suggested changes Mar 29, 2021

View reviewed changes

akosyakov force-pushed the akosyakov/gp-support-gp-env-by-3162 branch from 09b2dcd to 3089e19 Compare March 29, 2021 08:16

JanKoehnlein self-requested a review March 29, 2021 11:18

JanKoehnlein approved these changes Mar 29, 2021

View reviewed changes

akosyakov force-pushed the akosyakov/gp-support-gp-env-by-3162 branch from 3089e19 to 3ba02c2 Compare March 29, 2021 11:40

akosyakov added 2 commits March 29, 2021 11:53

fix #3162: decouple gp env from theia

ff8f91e

[gitpod-cli/protocol] remove dependency to common-go

2adaa06

akosyakov force-pushed the akosyakov/gp-support-gp-env-by-3162 branch from 3ba02c2 to 2adaa06 Compare March 29, 2021 11:53

akosyakov merged commit 5e39b06 into main Mar 29, 2021

akosyakov deleted the akosyakov/gp-support-gp-env-by-3162 branch March 29, 2021 14:10

jankeromnes mentioned this pull request Apr 14, 2021

[server] Implement a getAllEnvVars() method that doesn't filter on repository pattern precedence #3938

Merged

decouple gp env from theia #3569

decouple gp env from theia #3569

Uh oh!

Conversation

akosyakov commented Mar 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What it does

How to test

Uh oh!

Uh oh!

geropl Mar 26, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

geropl Mar 26, 2021

Choose a reason for hiding this comment

Uh oh!

geropl Mar 26, 2021

Choose a reason for hiding this comment

Uh oh!

akosyakov Mar 27, 2021

Choose a reason for hiding this comment

Uh oh!

geropl commented Mar 26, 2021 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

geropl commented Mar 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JanKoehnlein left a comment

Choose a reason for hiding this comment

Uh oh!

akosyakov Mar 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JanKoehnlein Mar 29, 2021

Choose a reason for hiding this comment

Uh oh!

akosyakov commented Mar 29, 2021 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JanKoehnlein left a comment

Choose a reason for hiding this comment

Uh oh!

JanKoehnlein left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JanKoehnlein commented Mar 29, 2021

Uh oh!

JanKoehnlein left a comment

Choose a reason for hiding this comment

Uh oh!

akosyakov commented Mar 29, 2021 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

akosyakov commented Mar 24, 2021 •

edited

Loading

geropl commented Mar 26, 2021 •

edited by werft-gitpod-dev-com bot

Loading

geropl commented Mar 26, 2021 •

edited

Loading

akosyakov Mar 27, 2021 •

edited

Loading

akosyakov commented Mar 29, 2021 •

edited by werft-gitpod-dev-com bot

Loading

JanKoehnlein left a comment •

edited

Loading

akosyakov commented Mar 29, 2021 •

edited by werft-gitpod-dev-com bot

Loading