mirror of
https://github.com/rancher/norman.git
synced 2025-08-01 23:41:24 +00:00
Return 404 when no store is configured (not 200)
This commit is contained in:
parent
c814e62e43
commit
45214c311d
@ -3,6 +3,7 @@ package handler
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/rancher/norman/httperror"
|
||||
"github.com/rancher/norman/types"
|
||||
)
|
||||
|
||||
@ -15,11 +16,13 @@ func CreateHandler(apiContext *types.APIContext, next types.RequestHandler) erro
|
||||
}
|
||||
|
||||
store := apiContext.Schema.Store
|
||||
if store != nil {
|
||||
data, err = store.Create(apiContext, apiContext.Schema, data)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if store == nil {
|
||||
return httperror.NewAPIError(httperror.NotFound, "no store found")
|
||||
}
|
||||
|
||||
data, err = store.Create(apiContext, apiContext.Schema, data)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
apiContext.WriteResponse(http.StatusCreated, data)
|
||||
|
@ -3,14 +3,14 @@ package handler
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/rancher/norman/httperror"
|
||||
"github.com/rancher/norman/types"
|
||||
)
|
||||
|
||||
func DeleteHandler(request *types.APIContext, next types.RequestHandler) error {
|
||||
store := request.Schema.Store
|
||||
if store == nil {
|
||||
request.WriteResponse(http.StatusNoContent, nil)
|
||||
return nil
|
||||
return httperror.NewAPIError(httperror.NotFound, "no store found")
|
||||
}
|
||||
|
||||
obj, err := store.Delete(request, request.Schema, request.ID)
|
||||
|
@ -3,6 +3,7 @@ package handler
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/rancher/norman/httperror"
|
||||
"github.com/rancher/norman/parse"
|
||||
"github.com/rancher/norman/types"
|
||||
)
|
||||
@ -15,7 +16,7 @@ func ListHandler(request *types.APIContext, next types.RequestHandler) error {
|
||||
|
||||
store := request.Schema.Store
|
||||
if store == nil {
|
||||
return nil
|
||||
return httperror.NewAPIError(httperror.NotFound, "no store found")
|
||||
}
|
||||
|
||||
if request.ID == "" {
|
||||
|
@ -3,6 +3,7 @@ package handler
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/rancher/norman/httperror"
|
||||
"github.com/rancher/norman/types"
|
||||
)
|
||||
|
||||
@ -13,11 +14,13 @@ func UpdateHandler(apiContext *types.APIContext, next types.RequestHandler) erro
|
||||
}
|
||||
|
||||
store := apiContext.Schema.Store
|
||||
if store != nil {
|
||||
data, err = store.Update(apiContext, apiContext.Schema, data, apiContext.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if store == nil {
|
||||
return httperror.NewAPIError(httperror.NotFound, "no store found")
|
||||
}
|
||||
|
||||
data, err = store.Update(apiContext, apiContext.Schema, data, apiContext.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
apiContext.WriteResponse(http.StatusOK, data)
|
||||
|
Loading…
Reference in New Issue
Block a user