Skip to content

feat: add api for patching custom org roles #13357

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 14 commits into from
May 29, 2024
Merged

feat: add api for patching custom org roles #13357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3ca152a
chore: implement patching custom organization roles
Emyrk May 23, 2024
d231cdf
fixup test to assign org role instead of site
Emyrk May 23, 2024
5c80ea0
cleanup and make gen
Emyrk May 24, 2024
b55d1c5
Remove diffs for the cli, moving to another branch
Emyrk May 24, 2024
fb1dddc
revert route removal
Emyrk May 24, 2024
5eaf868
make gen
Emyrk May 24, 2024
3f56f51
chore: remove org map perms in sdk
Emyrk May 28, 2024
715efa2
add test for mismatched orgID
Emyrk May 28, 2024
816f97c
add unit tests for site & user permission attempt
Emyrk May 28, 2024
6e88678
add invalid uuid test
Emyrk May 28, 2024
282f261
make gen
Emyrk May 28, 2024
d633afc
fix ts
Emyrk May 28, 2024
5ac97f8
fixup! fix ts
Emyrk May 28, 2024
c6335cf
make gen
Emyrk May 28, 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
Prev Previous commit
Next Next commit
revert route removal
  • Loading branch information
@Emyrk
Emyrk committed May 28, 2024
commit fb1dddc5c062a48e9fe1e5e01ba7b8f43119d170
2 changes: 2 additions & 0 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,8 @@ func New(options *Options) *API {
httpmw.ExtractOrganizationParam(options.Database),
)
r.Get("/", api.organization)
r.Patch("/", api.patchOrganization)
r.Delete("/", api.deleteOrganization)
r.Post("/templateversions", api.postTemplateVersionsByOrganization)
r.Route("/templates", func(r chi.Router) {
r.Post("/", api.postTemplateByOrganization)
Expand Down
4 changes: 2 additions & 2 deletions enterprise/coderd/roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ func TestCustomOrganizationRole(t *testing.T) {
// TODO: At present user roles are not returned by the user endpoints.
// Changing this might mess up the UI in how it renders the roles on the
// users page. When the users endpoint is updated, this should be uncommented.
//roleNamesF := func(role codersdk.SlimRole) string { return role.Name }
//require.Contains(t, db2sdk.List(user.Roles, roleNamesF), role.Name)
// roleNamesF := func(role codersdk.SlimRole) string { return role.Name }
// require.Contains(t, db2sdk.List(user.Roles, roleNamesF), role.Name)

// Try to create a template version
coderdtest.CreateTemplateVersion(t, tmplAdmin, first.OrganizationID, nil)
Expand Down