[server] Add organization image auth context to workspace image validation #20560
+37
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ation Tool: gitpod/catfood.gitpod.cloud
geropl
reviewed
Jan 28, 2025
| // if the image resolution is for an organization, we also include the organization's set up env vars | ||
| if (organizationId) { | ||
| await this.auth.checkPermissionOnOrganization(user.id, "read_env_var", organizationId); | ||
| const orgEnvVars = await this.orgDB.getOrgEnvironmentVariables(organizationId); |
There was a problem hiding this comment.
I feel this should be rather EnvVarService.listOrgEnvVars + EnvVarService.getOrgEnvVarWithValue (or sth) instead, even though the later needs to be added.
@filiptronicek WDYT?
There was a problem hiding this comment.
@geropl klingt gut, I'm going to implement listOrgEnvVarsWithValues on the EnvVarService to combine these to and make it easier to read.
Tool: gitpod/catfood.gitpod.cloud
roboquat
deleted the
ft/fix-additional-image-auth-org-setting-validation
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
As a follow-up to #20538, this PR adds org-level
GITPOD_IMAGE_AUTHauthentication for base image validation.This is relevant for validating workspace images when tweaking the organization settings and setting a new custom default workspace image.
Related Issue(s)
Fixes CLC-1104
How to test
geropl/workspace-base:latestas the default workspace image. It should not let you and result with an error/hold