Commitd48e08e

committed

fix(enterprise/coderd): skip org membership check for prebuilds user on group patch

1 parent49fcffc commitd48e08eCopy full SHA for d48e08e

File tree

+33

-0

lines changed

+33

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`"github.com/coder/coder/v2/coderd/database/db2sdk"`
`15`	`15`	`"github.com/coder/coder/v2/coderd/httpapi"`
`16`	`16`	`"github.com/coder/coder/v2/coderd/httpmw"`
	`17`	`+"github.com/coder/coder/v2/coderd/prebuilds"`
`17`	`18`	`"github.com/coder/coder/v2/codersdk"`
`18`	`19`	`)`
`19`	`20`
`@@ -171,6 +172,12 @@ func (api API) patchGroup(rw http.ResponseWriter, r http.Request) {`
`171`	`172`	`})`
`172`	`173`	`return`
`173`	`174`	`}`
	`175`	`+// Skip membership checks for the prebuilds user. There is a valid use case`
	`176`	`+// for adding the prebuilds user to a single group: in order to set a quota`
	`177`	`+// allowance specifically for prebuilds.`
	`178`	`+ifid==prebuilds.SystemUserID.String() {`
	`179`	`+continue`
	`180`	`+}`
`174`	`181`	`_,err:=database.ExpectOne(api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{`
`175`	`182`	`OrganizationID:group.OrganizationID,`
`176`	`183`	`UserID:uuid.MustParse(id),`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -463,6 +463,32 @@ func TestPatchGroup(t *testing.T) {`
`463`	`463`	`require.Equal(t,http.StatusBadRequest,cerr.StatusCode())`
`464`	`464`	`})`
`465`	`465`
	`466`	`+// For quotas to work with prebuilds, it's currently required to add the`
	`467`	`+// prebuilds user into a group with a quota allowance.`
	`468`	`+// See: docs/admin/templates/extending-templates/prebuilt-workspaces.md`
	`469`	`+t.Run("PrebuildsUser",func(t*testing.T) {`
	`470`	`+t.Parallel()`
	`471`	`+`
	`472`	`+client,user:=coderdenttest.New(t,&coderdenttest.Options{LicenseOptions:&coderdenttest.LicenseOptions{`
	`473`	`+Features: license.Features{`
	`474`	`+codersdk.FeatureTemplateRBAC:1,`
	`475`	`+},`
	`476`	`+}})`
	`477`	`+userAdminClient,_:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID,rbac.RoleUserAdmin())`
	`478`	`+ctx:=testutil.Context(t,testutil.WaitLong)`
	`479`	`+group,err:=userAdminClient.CreateGroup(ctx,user.OrganizationID, codersdk.CreateGroupRequest{`
	`480`	`+Name:"prebuilds",`
	`481`	`+QuotaAllowance:123,`
	`482`	`+})`
	`483`	`+require.NoError(t,err)`
	`484`	`+`
	`485`	`+group,err=userAdminClient.PatchGroup(ctx,group.ID, codersdk.PatchGroupRequest{`
	`486`	`+Name:"prebuilds",`
	`487`	`+AddUsers: []string{prebuilds.SystemUserID.String()},`
	`488`	`+})`
	`489`	`+require.NoError(t,err)`
	`490`	`+})`
	`491`	`+`
`466`	`492`	`t.Run("Everyone",func(t*testing.T) {`
`467`	`493`	`t.Parallel()`
`468`	`494`	`t.Run("NoUpdateName",func(t*testing.T) {`

Comments

(0)