Commitb030d47

committed

Fix tests

1 parent2c61e81 commitb030d47Copy full SHA for b030d47

File tree

+20

-3

lines changed

coderd
- database/queries
  - quota.sql
- provisionerdserver
  - provisionerdserver.go
codersdk
- quota.go
enterprise/coderd
- coderd.go
- workspacequota.go

+20

-3

lines changed

File renamed without changes.

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,23 @@ func (server Server) AcquireJob(ctx context.Context, _ proto.Empty) (*proto.Ac`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`func (serverServer)CommitQuota(ctx context.Context,requestproto.CommitQuotaRequest) (*proto.CommitQuotaResponse,error) {`
	`258`	`+jobID,err:=uuid.Parse(request.JobId)`
	`259`	`+iferr!=nil {`
	`260`	`+returnnil,xerrors.Errorf("parse job id: %w",err)`
	`261`	`+}`
	`262`	`+`
	`263`	`+job,err:=server.Database.GetProvisionerJobByID(ctx,jobID)`
	`264`	`+iferr!=nil {`
	`265`	`+returnnil,xerrors.Errorf("get job: %w",err)`
	`266`	`+}`
	`267`	`+if!job.WorkerID.Valid {`
	`268`	`+returnnil,xerrors.New("job isn't running yet")`
	`269`	`+}`
	`270`	`+`
	`271`	`+ifjob.WorkerID.UUID.String()!=server.ID.String() {`
	`272`	`+returnnil,xerrors.New("you don't own this job")`
	`273`	`+}`
	`274`	`+`
`258`	`275`	`q:=server.QuotaCommitter.Load()`
`259`	`276`	`ifq==nil {`
`260`	`277`	`// We're probably in community edition or a test.`

File renamed without changes.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`264`	`264`
`265`	`265`	`ifchanged,enabled:=featureChanged(codersdk.FeatureTemplateRBAC);changed {`
`266`	`266`	`ifenabled {`
`267`		`-committer:=Committer{Database:api.Database}`
	`267`	`+committer:=committer{Database:api.Database}`
`268`	`268`	`ptr:=proto.QuotaCommitter(&committer)`
`269`	`269`	`api.AGPL.QuotaCommitter.Store(&ptr)`
`270`	`270`	`}else {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ import (`
`16`	`16`	`"github.com/coder/coder/provisionerd/proto"`
`17`	`17`	`)`
`18`	`18`
`19`		`-typeCommitterstruct {`
	`19`	`+typecommitterstruct {`
`20`	`20`	`Database database.Store`
`21`	`21`	`}`
`22`	`22`
`23`		`-func (c*Committer)CommitQuota(`
	`23`	`+func (c*committer)CommitQuota(`
`24`	`24`	`ctx context.Context,request*proto.CommitQuotaRequest,`
`25`	`25`	`) (*proto.CommitQuotaResponse,error) {`
`26`	`26`	`jobID,err:=uuid.Parse(request.JobId)`

Comments

(0)