alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor tests to use testRoute case struct. Use one method for tests. Fix logic for when to skipzero

Browse Source
This commit is contained in:
James Jeffrey
2017-07-06 10:35:44 -07:00
parent a37abfd9d5
commit 021bb32a22
2 changed files with 98 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/server/routes_create_update.go
View File

@@ -28,7 +28,7 @@ func (s *Server) handleRouteCreateOrUpdate(c *gin.Context) {
var wroute models.RouteWrapper
err := bindAndValidate(c, log, method, &wroute)
err := s.bindAndValidate(ctx, c, log, method, &wroute)
if err != nil {
c.JSON(http.StatusBadRequest, simpleError(err))
return
@@ -92,7 +92,7 @@ func (s *Server) createApp(ctx context.Context, c *gin.Context, log logrus.Field
return nil
}
func bindAndValidate(c *gin.Context, log logrus.FieldLogger, method string, wroute *models.RouteWrapper) error {
func (s *Server) bindAndValidate(ctx context.Context, c *gin.Context, log logrus.FieldLogger, method string, wroute *models.RouteWrapper) error {
err := c.BindJSON(wroute)
if err != nil {
log.WithError(err).Debug(models.ErrInvalidJSON)
@@ -118,7 +118,7 @@ func bindAndValidate(c *gin.Context, log logrus.FieldLogger, method string, wrou
wroute.Route.SetDefaults()
if err = wroute.Validate(method != http.MethodPost); err != nil {
if err = wroute.Validate(method == http.MethodPatch); err != nil {
log.WithError(err).Debug(models.ErrRoutesCreate)
return err
}