Sfoglia il codice sorgente

Fix: tighten revive exit code & make it happy (#17127)

* Revive should fail the build

* Fix the associated errors
Oleg Gaidarenko 6 anni fa
parent
commit
756da8a134
2 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. 5 5
      pkg/services/sqlstore/transactions.go
  2. 1 1
      scripts/go/configs/revive.toml

+ 5 - 5
pkg/services/sqlstore/transactions.go

@@ -12,7 +12,7 @@ import (
 
 // WithTransactionalDbSession calls the callback with an session within a transaction
 func (ss *SqlStore) WithTransactionalDbSession(ctx context.Context, callback dbTransactionFunc) error {
-	return inTransactionWithRetryCtx(ss.engine, ctx, callback, 0)
+	return inTransactionWithRetryCtx(ctx, ss.engine, callback, 0)
 }
 
 func (ss *SqlStore) InTransaction(ctx context.Context, fn func(ctx context.Context) error) error {
@@ -20,17 +20,17 @@ func (ss *SqlStore) InTransaction(ctx context.Context, fn func(ctx context.Conte
 }
 
 func (ss *SqlStore) inTransactionWithRetry(ctx context.Context, fn func(ctx context.Context) error, retry int) error {
-	return inTransactionWithRetryCtx(ss.engine, ctx, func(sess *DBSession) error {
+	return inTransactionWithRetryCtx(ctx, ss.engine, func(sess *DBSession) error {
 		withValue := context.WithValue(ctx, ContextSessionName, sess)
 		return fn(withValue)
 	}, retry)
 }
 
 func inTransactionWithRetry(callback dbTransactionFunc, retry int) error {
-	return inTransactionWithRetryCtx(x, context.Background(), callback, retry)
+	return inTransactionWithRetryCtx(context.Background(), x, callback, retry)
 }
 
-func inTransactionWithRetryCtx(engine *xorm.Engine, ctx context.Context, callback dbTransactionFunc, retry int) error {
+func inTransactionWithRetryCtx(ctx context.Context, engine *xorm.Engine, callback dbTransactionFunc, retry int) error {
 	sess, err := startSession(ctx, engine, true)
 	if err != nil {
 		return err
@@ -73,5 +73,5 @@ func inTransaction(callback dbTransactionFunc) error {
 }
 
 func inTransactionCtx(ctx context.Context, callback dbTransactionFunc) error {
-	return inTransactionWithRetryCtx(x, ctx, callback, 0)
+	return inTransactionWithRetryCtx(ctx, x, callback, 0)
 }

+ 1 - 1
scripts/go/configs/revive.toml

@@ -1,7 +1,7 @@
 ignoreGeneratedHeader = false
 severity = "error"
 confidence = 0.8
-errorCode = 0
+errorCode = 1
 
 [rule.context-as-argument]
 [rule.error-return]