Mercurial > gemma
changeset 4506:e020e6e34ad7
Made 'go vet' happy again.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Wed, 02 Oct 2019 16:09:10 +0200 |
parents | 30c499f996d7 |
children | a912b1458834 81b0f1cf2d41 |
files | pkg/controllers/search.go pkg/controllers/system.go pkg/controllers/user.go pkg/imports/stsh.go |
diffstat | 4 files changed, 37 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/search.go Wed Oct 02 16:00:42 2019 +0200 +++ b/pkg/controllers/search.go Wed Oct 02 16:09:10 2019 +0200 @@ -45,8 +45,10 @@ s := mw.JSONInput(req).(*models.SearchRequest) if len(s.SearchString) == 0 { - err = mw.JSONError{http.StatusBadRequest, - "error: empty search string"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: empty search string", + } return }
--- a/pkg/controllers/system.go Wed Oct 02 16:00:42 2019 +0200 +++ b/pkg/controllers/system.go Wed Oct 02 16:09:10 2019 +0200 @@ -68,8 +68,10 @@ // able to inject a verbatim '/' via the middleware, but better be on // the safe site... if strings.Contains(fileName, "/") { - err = mw.JSONError{http.StatusBadRequest, - "error: no slashes allowed in file name"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: no slashes allowed in file name", + } return } @@ -79,8 +81,10 @@ case "apache2", "postgresql": path = "/var/log/" + serviceName + "/" + fileName default: - err = mw.JSONError{http.StatusBadRequest, - "error: invalid service: " + serviceName} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: invalid service: " + serviceName, + } return }
--- a/pkg/controllers/user.go Wed Oct 02 16:00:42 2019 +0200 +++ b/pkg/controllers/user.go Wed Oct 02 16:09:10 2019 +0200 @@ -103,13 +103,19 @@ user := mux.Vars(req)["user"] if !models.UserName(user).IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return } session, _ := auth.GetSession(req) if session.User == user { - err = mw.JSONError{http.StatusBadRequest, "error: cannot delete yourself"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: cannot delete yourself", + } return } @@ -152,7 +158,10 @@ user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return } @@ -189,7 +198,10 @@ } } else { if newUser.Extent == nil { - err = mw.JSONError{http.StatusBadRequest, "extent is mandatory"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "extent is mandatory", + } return } res, err = db.ExecContext( @@ -313,7 +325,10 @@ user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return } @@ -349,7 +364,10 @@ user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { - err = mw.JSONError{http.StatusBadRequest, "error: user invalid"} + err = mw.JSONError{ + Code: http.StatusBadRequest, + Message: "error: user invalid", + } return }