From 9de443ced2c328d9b58a5e144a765f402aab859d Mon Sep 17 00:00:00 2001
From: Cheng <36215014+ChengenH@users.noreply.github.com>
Date: Mon, 22 Apr 2024 03:44:03 +0800
Subject: [PATCH] chore: use errors.New to replace fmt.Errorf with no
parameters will much better (#30621)
use errors.New to replace fmt.Errorf with no parameters will much better
---
cmd/admin_auth.go | 3 ++-
cmd/admin_auth_oauth.go | 3 ++-
cmd/admin_auth_stmp.go | 3 +--
cmd/admin_user_delete.go | 3 ++-
cmd/admin_user_generate_access_token.go | 5 +++--
cmd/embedded.go | 6 +++---
cmd/manager_logging.go | 3 ++-
models/auth/oauth2.go | 3 ++-
models/git/lfs_lock.go | 4 ++--
models/repo_transfer.go | 3 ++-
10 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go
index ec92e342d4..4777a92908 100644
--- a/cmd/admin_auth.go
+++ b/cmd/admin_auth.go
@@ -4,6 +4,7 @@
package cmd
import (
+ "errors"
"fmt"
"os"
"text/tabwriter"
@@ -91,7 +92,7 @@ func runListAuth(c *cli.Context) error {
func runDeleteAuth(c *cli.Context) error {
if !c.IsSet("id") {
- return fmt.Errorf("--id flag is missing")
+ return errors.New("--id flag is missing")
}
ctx, cancel := installSignals()
diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go
index c151c0af27..8e6239ac33 100644
--- a/cmd/admin_auth_oauth.go
+++ b/cmd/admin_auth_oauth.go
@@ -4,6 +4,7 @@
package cmd
import (
+ "errors"
"fmt"
"net/url"
@@ -193,7 +194,7 @@ func runAddOauth(c *cli.Context) error {
func runUpdateOauth(c *cli.Context) error {
if !c.IsSet("id") {
- return fmt.Errorf("--id flag is missing")
+ return errors.New("--id flag is missing")
}
ctx, cancel := installSignals()
diff --git a/cmd/admin_auth_stmp.go b/cmd/admin_auth_stmp.go
index 58a6e2ac22..d724746905 100644
--- a/cmd/admin_auth_stmp.go
+++ b/cmd/admin_auth_stmp.go
@@ -5,7 +5,6 @@ package cmd
import (
"errors"
- "fmt"
"strings"
auth_model "code.gitea.io/gitea/models/auth"
@@ -166,7 +165,7 @@ func runAddSMTP(c *cli.Context) error {
func runUpdateSMTP(c *cli.Context) error {
if !c.IsSet("id") {
- return fmt.Errorf("--id flag is missing")
+ return errors.New("--id flag is missing")
}
ctx, cancel := installSignals()
diff --git a/cmd/admin_user_delete.go b/cmd/admin_user_delete.go
index 1cbc6f7527..520557554a 100644
--- a/cmd/admin_user_delete.go
+++ b/cmd/admin_user_delete.go
@@ -4,6 +4,7 @@
package cmd
import (
+ "errors"
"fmt"
"strings"
@@ -42,7 +43,7 @@ var microcmdUserDelete = &cli.Command{
func runDeleteUser(c *cli.Context) error {
if !c.IsSet("id") && !c.IsSet("username") && !c.IsSet("email") {
- return fmt.Errorf("You must provide the id, username or email of a user to delete")
+ return errors.New("You must provide the id, username or email of a user to delete")
}
ctx, cancel := installSignals()
diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go
index 6e78939680..6c2c10494e 100644
--- a/cmd/admin_user_generate_access_token.go
+++ b/cmd/admin_user_generate_access_token.go
@@ -4,6 +4,7 @@
package cmd
import (
+ "errors"
"fmt"
auth_model "code.gitea.io/gitea/models/auth"
@@ -42,7 +43,7 @@ var microcmdUserGenerateAccessToken = &cli.Command{
func runGenerateAccessToken(c *cli.Context) error {
if !c.IsSet("username") {
- return fmt.Errorf("You must provide a username to generate a token for")
+ return errors.New("You must provide a username to generate a token for")
}
ctx, cancel := installSignals()
@@ -68,7 +69,7 @@ func runGenerateAccessToken(c *cli.Context) error {
return err
}
if exist {
- return fmt.Errorf("access token name has been used already")
+ return errors.New("access token name has been used already")
}
// make sure the scopes are valid
diff --git a/cmd/embedded.go b/cmd/embedded.go
index 71d483d11c..9f03f7be7c 100644
--- a/cmd/embedded.go
+++ b/cmd/embedded.go
@@ -157,9 +157,9 @@ func runViewDo(c *cli.Context) error {
}
if len(matchedAssetFiles) == 0 {
- return fmt.Errorf("no files matched the given pattern")
+ return errors.New("no files matched the given pattern")
} else if len(matchedAssetFiles) > 1 {
- return fmt.Errorf("too many files matched the given pattern, try to be more specific")
+ return errors.New("too many files matched the given pattern, try to be more specific")
}
data, err := matchedAssetFiles[0].fs.ReadFile(matchedAssetFiles[0].name)
@@ -180,7 +180,7 @@ func runExtractDo(c *cli.Context) error {
}
if c.NArg() == 0 {
- return fmt.Errorf("a list of pattern of files to extract is mandatory (e.g. '**' for all)")
+ return errors.New("a list of pattern of files to extract is mandatory (e.g. '**' for all)")
}
destdir := "."
diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go
index 7d34fc9ac2..c2ae25ec57 100644
--- a/cmd/manager_logging.go
+++ b/cmd/manager_logging.go
@@ -4,6 +4,7 @@
package cmd
import (
+ "errors"
"fmt"
"os"
@@ -249,7 +250,7 @@ func runAddFileLogger(c *cli.Context) error {
if c.IsSet("filename") {
vals["filename"] = c.String("filename")
} else {
- return fmt.Errorf("filename must be set when creating a file logger")
+ return errors.New("filename must be set when creating a file logger")
}
if c.IsSet("rotate") {
vals["rotate"] = c.Bool("rotate")
diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go
index bc1bcaef63..7dca378e5d 100644
--- a/models/auth/oauth2.go
+++ b/models/auth/oauth2.go
@@ -8,6 +8,7 @@ import (
"crypto/sha256"
"encoding/base32"
"encoding/base64"
+ "errors"
"fmt"
"net"
"net/url"
@@ -294,7 +295,7 @@ func UpdateOAuth2Application(ctx context.Context, opts UpdateOAuth2ApplicationOp
return nil, err
}
if app.UID != opts.UserID {
- return nil, fmt.Errorf("UID mismatch")
+ return nil, errors.New("UID mismatch")
}
builtinApps := BuiltinApplications()
if _, builtin := builtinApps[app.ClientID]; builtin {
diff --git a/models/git/lfs_lock.go b/models/git/lfs_lock.go
index 261c73032a..2f65833fe3 100644
--- a/models/git/lfs_lock.go
+++ b/models/git/lfs_lock.go
@@ -5,7 +5,7 @@ package git
import (
"context"
- "fmt"
+ "errors"
"strings"
"time"
@@ -148,7 +148,7 @@ func DeleteLFSLockByID(ctx context.Context, id int64, repo *repo_model.Repositor
}
if !force && u.ID != lock.OwnerID {
- return nil, fmt.Errorf("user doesn't own lock and force flag is not set")
+ return nil, errors.New("user doesn't own lock and force flag is not set")
}
if _, err := db.GetEngine(dbCtx).ID(id).Delete(new(LFSLock)); err != nil {
diff --git a/models/repo_transfer.go b/models/repo_transfer.go
index 747ec2f248..37f591f65d 100644
--- a/models/repo_transfer.go
+++ b/models/repo_transfer.go
@@ -5,6 +5,7 @@ package models
import (
"context"
+ "errors"
"fmt"
"code.gitea.io/gitea/models/db"
@@ -147,7 +148,7 @@ func DeleteRepositoryTransfer(ctx context.Context, repoID int64) error {
func TestRepositoryReadyForTransfer(status repo_model.RepositoryStatus) error {
switch status {
case repo_model.RepositoryBeingMigrated:
- return fmt.Errorf("repo is not ready, currently migrating")
+ return errors.New("repo is not ready, currently migrating")
case repo_model.RepositoryPendingTransfer:
return ErrRepoTransferInProgress{}
}