Mark TemplateLoading error as "UnprocessableEntity" (#19445) (#19446)

* Mark TemplateLoading error as "UnprocessableEntity" (#19445)

- Backport #19445
  - Don't return Internal Server error if the user provide incorrect label template, instead return UnprocessableEntity.
  - Resolves #19399

- dep: upgrade: github.com/gogs/chardet

diff --git a/go.mod b/go.mod
index 92e4b20ca074b31cc9ea5647650597e7f552d785..e34a3e740c07c4377b212b62df8f6263c10c1e7d 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -37,7 +37,7 @@ require (
        github.com/go-swagger/go-swagger v0.27.0
        github.com/go-testfixtures/testfixtures/v3 v3.6.1
        github.com/gobwas/glob v0.2.3
-       github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28
+       github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
        github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
        github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
        github.com/golang-jwt/jwt/v4 v4.3.0

diff --git a/go.sum b/go.sum
index 2f6f544b6784af58f043b3f18e5b25a2a696f7bf..f6aeda9638557fb54483bae06b5d0ed78d44a464 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -649,8 +649,8 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28 h1:gBeyun7mySAKWg7Fb0GOcv0upX9bdaZScs8QcRo8mEY=
-github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
+github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs=
+github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
 github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 h1:yXtpJr/LV6PFu4nTLgfjQdcMdzjbqqXMEnHfq0Or6p8=
 github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14/go.mod h1:jPoNZLWDAqA5N3G5amEoiNbhVrmM+ZQEcnQvNQ2KaZk=
 github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:UjoPNDAQ5JPCjlxoJd6K8ALZqSDDhk2ymieAZOVaDg0=

diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index af8b06ed2a4a47f7843a37e201d0cdb818835b12..851505fe4a9641997350f16910674858328e171b 100644 (file)
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -160,7 +160,7 @@ func Search(ctx *context.APIContext) {
                opts.Collaborate = util.OptionalBoolFalse
        }
 
-       var mode = ctx.FormString("mode")
+       mode := ctx.FormString("mode")
        switch mode {
        case "source":
                opts.Fork = util.OptionalBoolFalse
@@ -186,9 +186,9 @@ func Search(ctx *context.APIContext) {
                opts.IsPrivate = util.OptionalBoolOf(ctx.FormBool("is_private"))
        }
 
-       var sortMode = ctx.FormString("sort")
+       sortMode := ctx.FormString("sort")
        if len(sortMode) > 0 {
-               var sortOrder = ctx.FormString("order")
+               sortOrder := ctx.FormString("order")
                if len(sortOrder) == 0 {
                        sortOrder = "asc"
                }
@@ -264,7 +264,8 @@ func CreateUserRepo(ctx *context.APIContext, owner *user_model.User, opt api.Cre
                if repo_model.IsErrRepoAlreadyExist(err) {
                        ctx.Error(http.StatusConflict, "", "The repository with the same name already exists.")
                } else if db.IsErrNameReserved(err) ||
-                       db.IsErrNamePatternNotAllowed(err) {
+                       db.IsErrNamePatternNotAllowed(err) ||
+                       models.IsErrIssueLabelTemplateLoad(err) {
                        ctx.Error(http.StatusUnprocessableEntity, "", err)
                } else {
                        ctx.Error(http.StatusInternalServerError, "CreateRepository", err)