revert some changes

Emyrk · Emyrk · commit b69dd0f0974a · 2024-10-28T19:13:06.000-04:00
diff --git a/coderd/database/dbtestutil/tx.go b/coderd/database/dbtestutil/tx.go
@@ -10,13 +10,21 @@ import (
 type DBTx struct {
 	database.Store
 	mu       sync.Mutex
-	err      error
-	errC     chan error
+	done     chan error
 	finalErr chan error
 }
 
 // StartTx starts a transaction and returns a DBTx object. This allows running
 // 2 transactions concurrently in a test more easily.
+// Example:
+//
+//	a := StartTx(t, db, opts)
+//	b := StartTx(t, db, opts)
+//
+//	a.GetUsers(...)
+//	b.GetUsers(...)
+//
+//	require.NoError(t, a.Done()
 func StartTx(t *testing.T, db database.Store, opts *database.TxOptions) *DBTx {
 	errC := make(chan error)
 	finalErr := make(chan error)
@@ -34,31 +42,31 @@ func StartTx(t *testing.T, db database.Store, opts *database.TxOptions) *DBTx {
 			})
 			count++
 			if count > 1 {
+				// If you recursively call InTx, then don't use this.
 				t.Logf("InTx called more than once: %d", count)
+				t.Fatal("InTx called more than once, this is not allowed with the StartTx helper")
 			}
-			return <-errC
+
+			select {
+			case _, _ = <-errC:
+			}
+			// Just return nil. The caller should be checking their own errors.
+			return nil
 		}, opts)
 		finalErr <- err
 	}()
 
 	txStore := <-txC
 	close(txC)
 
-	return &DBTx{Store: txStore, errC: errC, finalErr: finalErr}
-}
-
-func (tx *DBTx) SetError(err error) {
-	tx.mu.Lock()
-	defer tx.mu.Unlock()
-	tx.err = err
+	return &DBTx{Store: txStore, done: errC, finalErr: finalErr}
 }
 
 // Done can only be called once. If you call it twice, it will panic.
 func (tx *DBTx) Done() error {
 	tx.mu.Lock()
 	defer tx.mu.Unlock()
 
-	tx.errC <- tx.err
-	close(tx.errC)
+	close(tx.done)
 	return <-tx.finalErr
 }
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -701,7 +701,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 
 		if initial, changed, enabled := featureChanged(codersdk.FeatureTemplateRBAC); shouldUpdate(initial, changed, enabled) {
 			if enabled {
-				committer := Committer{
+				committer := committer{
 					Log:      api.Logger.Named("quota_committer"),
 					Database: api.Database,
 				}
diff --git a/enterprise/coderd/workspacequota.go b/enterprise/coderd/workspacequota.go
@@ -18,12 +18,12 @@ import (
 	"github.com/coder/coder/v2/provisionerd/proto"
 )
 
-type Committer struct {
+type committer struct {
 	Log      slog.Logger
 	Database database.Store
 }
 
-func (c *Committer) CommitQuota(
+func (c *committer) CommitQuota(
 	ctx context.Context, request *proto.CommitQuotaRequest,
 ) (*proto.CommitQuotaResponse, error) {
 	jobID, err := uuid.Parse(request.JobId)

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`701`	`701`
`702`	`702`	`if initial, changed, enabled := featureChanged(codersdk.FeatureTemplateRBAC); shouldUpdate(initial, changed, enabled) {`
`703`	`703`	`if enabled {`
`704`		`- committer := Committer{`
	`704`	`+ committer := committer{`
`705`	`705`	`Log: api.Logger.Named("quota_committer"),`
`706`	`706`	`Database: api.Database,`
`707`	`707`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ import (`
`18`	`18`	`"github.com/coder/coder/v2/provisionerd/proto"`
`19`	`19`	`)`
`20`	`20`
`21`		`-type Committer struct {`
	`21`	`+type committer struct {`
`22`	`22`	`Log slog.Logger`
`23`	`23`	`Database database.Store`
`24`	`24`	`}`
`25`	`25`
`26`		`-func (c *Committer) CommitQuota(`
	`26`	`+func (c *committer) CommitQuota(`
`27`	`27`	`ctx context.Context, request *proto.CommitQuotaRequest,`
`28`	`28`	`) (*proto.CommitQuotaResponse, error) {`
`29`	`29`	`jobID, err := uuid.Parse(request.JobId)`