Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

fix(errors): wrap db errors, improve error handling (#8859)

Browse source 
* use error check func, wrap db object not found

* add errorlint and fix all the linting errors

* add exportloopref linter and fix errors

* fix incorrect error details returned on an api

* fix new errors

* increase linter timeout

* increase timeout to 10minutes

* increase timeout to 10minutes

* rebase and fix new lint errors

* make CE match EE

* fix govet issue
This commit is contained in:
Matt Hook 2023-05-05 12:19:47 +12:00 • committed by GitHub
parent 550e235d59
commit 334eee0c8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 158 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/http/handler/edgejobs/edgejob_delete.go
View file

@ -1,6 +1,7 @@
package edgejobs
import (
"errors"
"net/http"
"strconv"
@ -42,8 +43,9 @@ func (handler *Handler) edgeJobDelete(w http.ResponseWriter, r *http.Request) *h
}
if err != nil {
if httpErr, ok := err.(*httperror.HandlerError); ok {
return httpErr
var handlerError *httperror.HandlerError
if errors.As(err, &handlerError) {
return handlerError
}
return httperror.InternalServerError("Unexpected error", err)

6
api/http/handler/edgejobs/edgejob_tasklogs_clear.go
View file

@ -1,6 +1,7 @@
package edgejobs
import (
"errors"
"net/http"
"strconv"
@ -75,8 +76,9 @@ func (handler *Handler) edgeJobTasksClear(w http.ResponseWriter, r *http.Request
}
if err != nil {
if httpErr, ok := err.(*httperror.HandlerError); ok {
return httpErr
var handlerError *httperror.HandlerError
if errors.As(err, &handlerError) {
return handlerError
}
return httperror.InternalServerError("Unexpected error", err)

6
api/http/handler/edgejobs/edgejob_tasklogs_collect.go
View file

@ -1,6 +1,7 @@
package edgejobs
import (
"errors"
"net/http"
httperror "github.com/portainer/libhttp/error"
@ -83,8 +84,9 @@ func (handler *Handler) edgeJobTasksCollect(w http.ResponseWriter, r *http.Reque
})
if err != nil {
if httpErr, ok := err.(*httperror.HandlerError); ok {
return httpErr
var handlerError *httperror.HandlerError
if errors.As(err, &handlerError) {
return handlerError
}
return httperror.InternalServerError("Unexpected error", err)

6
api/http/handler/edgejobs/handler.go
View file

@ -1,6 +1,7 @@
package edgejobs
import (
"errors"
"net/http"
httperror "github.com/portainer/libhttp/error"
@ -62,8 +63,9 @@ func convertEndpointsToMetaObject(endpoints []portainer.EndpointID) map[portaine
func txResponse(w http.ResponseWriter, r any, err error) *httperror.HandlerError {
if err != nil {
if httpErr, ok := err.(*httperror.HandlerError); ok {
return httpErr
var handlerError *httperror.HandlerError
if errors.As(err, &handlerError) {
return handlerError
}
return httperror.InternalServerError("Unexpected error", err)