mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
Check both errors
This commit is contained in:
@@ -31,15 +31,15 @@ func (s *Server) handleRouteCreateOrUpdate(c *gin.Context) {
|
|||||||
var wroute models.RouteWrapper
|
var wroute models.RouteWrapper
|
||||||
|
|
||||||
err, resperr := s.bindAndValidate(ctx, c, method, &wroute)
|
err, resperr := s.bindAndValidate(ctx, c, method, &wroute)
|
||||||
if err != nil {
|
if err != nil || resperr != nil {
|
||||||
log.WithError(err).Debug(resperr)
|
log.WithError(err).Debug(resperr)
|
||||||
c.JSON(http.StatusBadRequest, simpleError(resperr))
|
c.JSON(http.StatusBadRequest, simpleError(resperr))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create the app if it does not exist.
|
// Create the app if it does not exist.
|
||||||
err, resperr = s.ensureApp(ctx, c, wroute, method)
|
err, resperr = s.ensureApp(ctx, c, &wroute, method)
|
||||||
if err != nil {
|
if err != nil || resperr != nil {
|
||||||
log.WithError(err).Debug(resperr)
|
log.WithError(err).Debug(resperr)
|
||||||
handleErrorResponse(c, resperr)
|
handleErrorResponse(c, resperr)
|
||||||
return
|
return
|
||||||
@@ -57,7 +57,7 @@ func (s *Server) handleRouteCreateOrUpdate(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ensureApp will only execute if it is on post or put. Patch is not allowed to create apps.
|
// ensureApp will only execute if it is on post or put. Patch is not allowed to create apps.
|
||||||
func (s *Server) ensureApp(ctx context.Context, c *gin.Context, wroute models.RouteWrapper, method string) (error, error) {
|
func (s *Server) ensureApp(ctx context.Context, c *gin.Context, wroute *models.RouteWrapper, method string) (error, error) {
|
||||||
if !(method == http.MethodPost || method == http.MethodPut) {
|
if !(method == http.MethodPost || method == http.MethodPut) {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user