Skip to content

feat: get org scoped provisioners #13953

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 8 commits into from
Jul 23, 2024
Merged

feat: get org scoped provisioners #13953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06214ee
generate db query
f0ssel Jul 19, 2024
5c26725
failing rbac
f0ssel Jul 19, 2024
8d9dbe5
fix test
f0ssel Jul 22, 2024
11d1899
fix rbac
f0ssel Jul 22, 2024
de4b71b
no more .all()
f0ssel Jul 22, 2024
6ef3bc4
no error for org admin
f0ssel Jul 22, 2024
f629752
cleanup
f0ssel Jul 22, 2024
e04b331
stop catching no rows
f0ssel Jul 23, 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
cleanup
  • Loading branch information
@f0ssel
f0ssel committed Jul 22, 2024
commit f629752bd2d52f7dd8a0af48f0824654b01e5600
3 changes: 0 additions & 3 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3140,9 +3140,6 @@ func (q *FakeQuerier) GetProvisionerDaemonsByOrganization(_ context.Context, org
daemons := make([]database.ProvisionerDaemon, 0)
for _, daemon := range q.provisionerDaemons {
if daemon.OrganizationID == organizationID {
// clone the Tags before appending, since maps are reference types and
// we don't want the caller to be able to mutate the map we have inside
// dbmem!
daemon.Tags = maps.Clone(daemon.Tags)
daemons = append(daemons, daemon)
}
Expand Down
2 changes: 1 addition & 1 deletion enterprise/coderd/provisionerdaemons_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ func TestGetProvisionerDaemons(t *testing.T) {
require.NoError(t, err)
srv.DRPCConn().Close()

daemons, err := client.OrganizationProvisionerDaemons(ctx, org.ID) //nolint:gocritic // Test assertion.
daemons, err := orgAdmin.OrganizationProvisionerDaemons(ctx, org.ID)
require.NoError(t, err)
if assert.Len(t, daemons, 1) {
assert.Equal(t, daemonName, daemons[0].Name)
Expand Down
Loading