Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2025-01-20 15:29:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor(errors): add method WriteErrorStatus

Browse Source
This commit is contained in:
fiftin 2024-04-02 23:10:42 +02:00
parent d4125e3d2b
commit 5fe5ae388d
No known key found for this signature in database
GPG Key ID: 044381366A5D4731
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/helpers/helpers.go
View File

@ -2,6 +2,7 @@ package helpers
import (
"encoding/json"
"errors"
"fmt"
"github.com/ansible-semaphore/semaphore/services/tasks"
"net/http"
@ -90,22 +91,26 @@ func WriteJSON(w http.ResponseWriter, code int, out interface{}) {
}
}
func WriteErrorStatus(w http.ResponseWriter, err string, code int) {
WriteJSON(w, code, map[string]string{
"error": err,
})
}
func WriteError(w http.ResponseWriter, err error) {
if err == db.ErrNotFound {
if errors.Is(err, db.ErrNotFound) {
w.WriteHeader(http.StatusNotFound)
return
}
if err == db.ErrInvalidOperation {
if errors.Is(err, db.ErrInvalidOperation) {
w.WriteHeader(http.StatusConflict)
return
}
switch e := err.(type) {
case *db.ValidationError:
WriteJSON(w, http.StatusBadRequest, map[string]string{
"error": e.Error(),
})
WriteErrorStatus(w, e.Error(), http.StatusBadRequest)
default:
log.Error(err)
debug.PrintStack()

19
api/projects/inventory.go
View File

@ -1,6 +1,7 @@
package projects
import (
"errors"
"github.com/ansible-semaphore/semaphore/api/helpers"
"github.com/ansible-semaphore/semaphore/db"
log "github.com/sirupsen/logrus"
@ -156,16 +157,16 @@ func UpdateInventory(w http.ResponseWriter, r *http.Request) {
}
if inventory.ID != oldInventory.ID {
helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{
"error": "Inventory ID in body and URL must be the same",
})
helpers.WriteErrorStatus(w,
"Inventory ID in body and URL must be the same",
http.StatusBadRequest)
return
}
if inventory.ProjectID != oldInventory.ProjectID {
helpers.WriteJSON(w, http.StatusBadRequest, map[string]string{
"error": "Project ID in body and URL must be the same",
})
helpers.WriteErrorStatus(w,
"project ID in body and URL must be the same",
http.StatusBadRequest)
return
}
@ -178,7 +179,9 @@ func UpdateInventory(w http.ResponseWriter, r *http.Request) {
return
}
default:
w.WriteHeader(http.StatusBadRequest)
helpers.WriteErrorStatus(w,
"unknown inventory type: %s"+string(inventory.Type),
http.StatusBadRequest)
return
}
@ -201,7 +204,7 @@ func RemoveInventory(w http.ResponseWriter, r *http.Request) {
var err error
err = helpers.Store(r).DeleteInventory(inventory.ProjectID, inventory.ID)
if err == db.ErrInvalidOperation {
if errors.Is(err, db.ErrInvalidOperation) {
helpers.WriteJSON(w, http.StatusBadRequest, map[string]interface{}{
"error": "Inventory is in use by one or more templates",
"inUse": true,