fixes

Emyrk · Emyrk · commit 58288de464e7 · 2024-10-24T13:45:50.000-04:00
diff --git a/coderd/cryptokeys/rotate.go b/coderd/cryptokeys/rotate.go
@@ -161,7 +161,7 @@ func (k *rotator) rotateKeys(ctx context.Context) error {
 				}
 			}
 			return nil
-		}, &sql.TxOptions{
+		}, &database.TxOptions{
 			Isolation: sql.LevelRepeatableRead,
 		})
 }
diff --git a/coderd/database/dbrollup/dbrollup_test.go b/coderd/database/dbrollup/dbrollup_test.go
@@ -38,7 +38,7 @@ type wrapUpsertDB struct {
 	resume <-chan struct{}
 }
 
-func (w *wrapUpsertDB) InTx(fn func(database.Store) error, opts *sql.TxOptions) error {
+func (w *wrapUpsertDB) InTx(fn func(database.Store) error, opts *database.TxOptions) error {
 	return w.Store.InTx(func(tx database.Store) error {
 		return fn(&wrapUpsertDB{Store: tx, resume: w.resume})
 	}, opts)
diff --git a/coderd/wsbuilder/wsbuilder_test.go b/coderd/wsbuilder/wsbuilder_test.go
@@ -735,7 +735,7 @@ func expectDB(t *testing.T, opts ...txExpect) *dbmock.MockStore {
 	// we expect to be run in a transaction; we use mTx to record the
 	// "in transaction" calls.
 	mDB.EXPECT().InTx(
-		gomock.Any(), gomock.Eq(&sql.TxOptions{Isolation: sql.LevelRepeatableRead}),
+		gomock.Any(), gomock.Eq(&database.TxOptions{Isolation: sql.LevelRepeatableRead}),
 	).
 		DoAndReturn(func(f func(database.Store) error, _ *sql.TxOptions) error {
 			err := f(mTx)
diff --git a/enterprise/dbcrypt/dbcrypt.go b/enterprise/dbcrypt/dbcrypt.go
@@ -60,7 +60,7 @@ type dbCrypt struct {
 	database.Store
 }
 
-func (db *dbCrypt) InTx(function func(database.Store) error, txOpts *sql.TxOptions) error {
+func (db *dbCrypt) InTx(function func(database.Store) error, txOpts *database.TxOptions) error {
 	return db.Store.InTx(func(s database.Store) error {
 		return function(&dbCrypt{
 			primaryCipherDigest: db.primaryCipherDigest,
@@ -445,5 +445,5 @@ func (db *dbCrypt) ensureEncrypted(ctx context.Context) error {
 			ActiveKeyDigest: db.primaryCipherDigest,
 			Test:            testValue,
 		})
-	}, &sql.TxOptions{Isolation: sql.LevelRepeatableRead})
+	}, &database.TxOptions{Isolation: sql.LevelRepeatableRead})
 }

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func (k *rotator) rotateKeys(ctx context.Context) error {`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`return nil`
`164`		`- }, &sql.TxOptions{`
	`164`	`+ }, &database.TxOptions{`
`165`	`165`	`Isolation: sql.LevelRepeatableRead,`
`166`	`166`	`})`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ type wrapUpsertDB struct {`
`38`	`38`	`resume <-chan struct{}`
`39`	`39`	`}`
`40`	`40`
`41`		`-func (w wrapUpsertDB) InTx(fn func(database.Store) error, opts sql.TxOptions) error {`
	`41`	`+func (w wrapUpsertDB) InTx(fn func(database.Store) error, opts database.TxOptions) error {`
`42`	`42`	`return w.Store.InTx(func(tx database.Store) error {`
`43`	`43`	`return fn(&wrapUpsertDB{Store: tx, resume: w.resume})`
`44`	`44`	`}, opts)`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ type dbCrypt struct {`
`60`	`60`	`database.Store`
`61`	`61`	`}`
`62`	`62`
`63`		`-func (db dbCrypt) InTx(function func(database.Store) error, txOpts sql.TxOptions) error {`
	`63`	`+func (db dbCrypt) InTx(function func(database.Store) error, txOpts database.TxOptions) error {`
`64`	`64`	`return db.Store.InTx(func(s database.Store) error {`
`65`	`65`	`return function(&dbCrypt{`
`66`	`66`	`primaryCipherDigest: db.primaryCipherDigest,`
`@@ -445,5 +445,5 @@ func (db *dbCrypt) ensureEncrypted(ctx context.Context) error {`
`445`	`445`	`ActiveKeyDigest: db.primaryCipherDigest,`
`446`	`446`	`Test: testValue,`
`447`	`447`	`})`
`448`		`- }, &sql.TxOptions{Isolation: sql.LevelRepeatableRead})`
	`448`	`+ }, &database.TxOptions{Isolation: sql.LevelRepeatableRead})`
`449`	`449`	`}`