diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2022-12-31 12:49:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-31 12:49:37 +0100 |
| commit | 3fef47b41c98392865d13fd21bbcec34236daf4f (patch) | |
| tree | 16808c6ea9ffd2cc0438d11831fd3a7503d15056 /modules/packages/npm | |
| parent | dce8887494268c99ba5da8d5152b5d1cc03cfb83 (diff) | |
| download | gitea-3fef47b41c98392865d13fd21bbcec34236daf4f.tar.gz gitea-3fef47b41c98392865d13fd21bbcec34236daf4f.zip | |
Use ErrInvalidArgument in packages (#22268)
Related to
https://github.com/go-gitea/gitea/pull/22262#discussion_r1059010774
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'modules/packages/npm')
| -rw-r--r-- | modules/packages/npm/creator.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/packages/npm/creator.go b/modules/packages/npm/creator.go index 02f6724812..548d7ed9e5 100644 --- a/modules/packages/npm/creator.go +++ b/modules/packages/npm/creator.go @@ -8,7 +8,6 @@ import ( "crypto/sha1" "crypto/sha512" "encoding/base64" - "errors" "fmt" "io" "regexp" @@ -16,6 +15,7 @@ import ( "time" "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/validation" "github.com/hashicorp/go-version" @@ -23,15 +23,15 @@ import ( var ( // ErrInvalidPackage indicates an invalid package - ErrInvalidPackage = errors.New("The package is invalid") + ErrInvalidPackage = util.NewInvalidArgumentErrorf("package is invalid") // ErrInvalidPackageName indicates an invalid name - ErrInvalidPackageName = errors.New("The package name is invalid") + ErrInvalidPackageName = util.NewInvalidArgumentErrorf("package name is invalid") // ErrInvalidPackageVersion indicates an invalid version - ErrInvalidPackageVersion = errors.New("The package version is invalid") + ErrInvalidPackageVersion = util.NewInvalidArgumentErrorf("package version is invalid") // ErrInvalidAttachment indicates a invalid attachment - ErrInvalidAttachment = errors.New("The package attachment is invalid") + ErrInvalidAttachment = util.NewInvalidArgumentErrorf("package attachment is invalid") // ErrInvalidIntegrity indicates an integrity validation error - ErrInvalidIntegrity = errors.New("Failed to validate integrity") + ErrInvalidIntegrity = util.NewInvalidArgumentErrorf("failed to validate integrity") ) var nameMatch = regexp.MustCompile(`\A((@[^\s\/~'!\(\)\*]+?)[\/])?([^_.][^\s\/~'!\(\)\*]+)\z`) |