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

Simplifying app delete per review comments

Browse Source
This commit is contained in:
Denis Makogon
2017-09-11 23:15:01 +03:00
parent 78f2d51bfa
commit 6b7accd3c6
6 changed files with 3 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/server/apps_delete.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/fnproject/fn/api/common"
"github.com/fnproject/fn/api/models"
"github.com/gin-gonic/gin"
"strconv"
)
func (s *Server) handleAppDelete(c *gin.Context) {
@@ -16,32 +15,7 @@ func (s *Server) handleAppDelete(c *gin.Context) {
app := &models.App{Name: c.MustGet(api.AppName).(string)}
routes, err := s.Datastore.GetRoutesByApp(ctx, app.Name, &models.RouteFilter{})
if err != nil {
log.WithError(err).Error("error getting route in app delete")
handleErrorResponse(c, err)
return
}
forceDelete, _ := strconv.ParseBool(c.Query("force"))
if !forceDelete {
if len(routes) > 0 {
handleErrorResponse(c, models.ErrDeleteAppsWithRoutes)
return
}
} else {
s.Datastore.BatchDeleteLogs(ctx, app.Name)
s.Datastore.BatchDeleteCalls(ctx, app.Name)
s.Datastore.BatchDeleteRoutes(ctx, app.Name)
}
err = s.FireBeforeAppDelete(ctx, app)
if err != nil {
log.WithError(err).Error("error firing before app delete")
handleErrorResponse(c, err)
return
}
app, err = s.Datastore.GetApp(ctx, app.Name)
app, err := s.Datastore.GetApp(ctx, app.Name)
if err != nil {
handleErrorResponse(c, err)
return