Skip to content

[WS CLI] Make env --scope=user compatible with GitLab groups #20279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 22, 2024
Merged

[WS CLI] Make env --scope=user compatible with GitLab groups #20279

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d903498
[WS CLI] Make `env --scope=user` compatible with GitLab groups
filiptronicek Oct 9, 2024
a3b27b8
Allow updating `*/*` scoped vars for backwards compat
filiptronicek Oct 22, 2024
d1332f2
Merge branch 'main' into ft/gitlab-compatible-user-scopes-vars
filiptronicek Oct 22, 2024
3f54d8a
Fix test races
filiptronicek Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/gitpod-cli/cmd/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func connectToServer(ctx context.Context, options *connectToServerOptions) (*con
operations := "create/get/update/delete"
if options != nil && options.setEnvScope == envScopeUser {
// Updating user env vars requires a different token with a special scope
repositoryPattern = "*/*"
repositoryPattern = "*/**"
operations = "update"
}

Expand Down Expand Up @@ -230,7 +230,7 @@ func setEnvs(ctx context.Context, setEnvScope envScope, args []string) error {
if ferr, ok := err.(*jsonrpc2.Error); ok && ferr.Code == http.StatusForbidden && setEnvScope == envScopeUser {
return fmt.Errorf(""+
"Can't automatically create env var `%s` for security reasons.\n"+
"Please create the var manually under %s/user/variables using Name=%s, Scope=*/*, Value=foobar", v.Name, result.gitpodHost, v.Name)
"Please create the var manually under %s/user/variables using Name=%s, Scope=*/**, Value=foobar", v.Name, result.gitpodHost, v.Name)
}
return err
}
Expand Down
2 changes: 1 addition & 1 deletion components/server/src/workspace/workspace-starter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,7 +1717,7 @@ export class WorkspaceStarter {
"resource:" +
ScopedResourceGuard.marshalResourceScope({
kind: "envVar",
subjectID: "*/*",
subjectID: "*/**",
operations: ["update"],
}),
);
Expand Down
Loading