Commit876ee58

committed

fix tests

1 parentf7bc2ec commit876ee58Copy full SHA for 876ee58

File tree

-4

lines changed

coderd
- database/dbauthz
  - dbauthz.go
- provisionerdserver
  - provisionerdserver.go

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ var (`
`228`	`228`	`rbac.ResourceOrganization.Type: {rbac.ActionCreate},`
`229`	`229`	`rbac.ResourceOrganizationMember.Type: {rbac.ActionCreate},`
`230`	`230`	`rbac.ResourceOrgRoleAssignment.Type: {rbac.ActionCreate},`
`231`		`-rbac.ResourceProvisionerDaemon.Type: {rbac.ActionCreate},`
	`231`	`+rbac.ResourceProvisionerDaemon.Type: {rbac.ActionCreate,rbac.ActionUpdate},`
`232`	`232`	`rbac.ResourceUser.Type: {rbac.ActionCreate,rbac.ActionUpdate,rbac.ActionDelete},`
`233`	`233`	`rbac.ResourceUserData.Type: {rbac.ActionCreate,rbac.ActionUpdate},`
`234`	`234`	`rbac.ResourceWorkspace.Type: {rbac.ActionUpdate},`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,9 @@ func (s *server) heartbeat() {`
`233`	`233`	`case<-tick.C:`
`234`	`234`	`hbCtx,hbCancel:=context.WithTimeout(s.lifecycleCtx,s.HeartbeatInterval)`
`235`	`235`	`iferr:=s.heartbeatOnce(hbCtx);err!=nil {`
`236`		`-s.Logger.Error(hbCtx,"heartbeat failed",slog.Error(err))`
	`236`	`+if!xerrors.Is(err,context.DeadlineExceeded)&&!xerrors.Is(err,context.Canceled) {`
	`237`	`+s.Logger.Error(hbCtx,"heartbeat failed",slog.Error(err))`
	`238`	`+}`
`237`	`239`	`}`
`238`	`240`	`hbCancel()`
`239`	`241`	`tick.Reset(s.HeartbeatInterval)`
`@@ -252,8 +254,8 @@ func (s *server) heartbeatOnce(ctx context.Context) error {`
`252`	`254`	`returnnil`
`253`	`255`	`}`
`254`	`256`
`255`		`-//nolint:gocritic //Provisionerd has specific authz rules.`
`256`		`-returns.Database.UpdateProvisionerDaemonLastSeenAt(dbauthz.AsProvisionerd(ctx), database.UpdateProvisionerDaemonLastSeenAtParams{`
	`257`	`+//nolint:gocritic //This is specifically for updating the last seen at timestamp.`
	`258`	`+returns.Database.UpdateProvisionerDaemonLastSeenAt(dbauthz.AsSystemRestricted(ctx), database.UpdateProvisionerDaemonLastSeenAtParams{`
`257`	`259`	`ID:s.ID,`
`258`	`260`	`LastSeenAt: sql.NullTime{Time:s.timeNow(),Valid:true},`
`259`	`261`	`})`

Comments

(0)