refactor: consolidate template and workspace acl validation #19192
+535
−103
Conversation
This file contains hidden or 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
|
I think this should finally address all your feedback on the first PR (except for the addition of an "update ACL" verb). sorry for the delay! |
|
jk, I just realized it was only yelling about a file that I can edit, not the fully generated files |
Emyrk
reviewed
Aug 6, 2025
Emyrk
approved these changes
Aug 7, 2025
Comment on lines
+14
to
+26
| type UpdateValidator[Role codersdk.WorkspaceRole | codersdk.TemplateRole] interface { | ||
| // Users should return a map from user UUIDs (as strings) to the role they | ||
| // are being assigned. Additionally, it should return a string that will be | ||
| // used as the field name for the ValidationErrors returned from Validate. | ||
| Users() (map[string]Role, string) | ||
| // Groups should return a map from group UUIDs (as strings) to the role they | ||
| // are being assigned. Additionally, it should return a string that will be | ||
| // used as the field name for the ValidationErrors returned from Validate. | ||
| Groups() (map[string]Role, string) | ||
| // ValidateRole should return an error that will be used in the | ||
| // ValidationError if the role is invalid for the corresponding resource type. | ||
| ValidateRole(role Role) error | ||
| } |
|
I tested a deleted user in one of the template tests at least: coder/enterprise/coderd/templates_test.go Line 1505 in 48dd824 I'm working on another pr right now to add the other workspace ACL endpoints and a bunch of tests for all of them |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
ValidateUserIDsquery andValidateGroupIDsqueriesGetGroups, but that has a join in it and would send more data over the wire. Plus it's just nice for these two queries to have parity and there isn't a good equivalent for users already. I hope we can find more places that these will be useful.EXPLAINand this one should be faster (tho not exactly fast, it could certainly be optimized more)ACLUpdateValidatorinterface that lets us create little adapters type for resources that implement an/acl [patch]endpoint like templates and workspaces. It handles validating UUIDs, validating role names, and ensuring that the IDs given actually correspond to IDs in the database.