mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
3c15ca6ea6
* App ID * Clean-up * Use ID or name to reference apps * Can use app by name or ID * Get rid of AppName for routes API and model routes API is completely backwards-compatible routes API accepts both app ID and name * Get rid of AppName from calls API and model * Fixing tests * Get rid of AppName from logs API and model * Restrict API to work with app names only * Addressing review comments * Fix for hybrid mode * Fix rebase problems * Addressing review comments * Addressing review comments pt.2 * Fixing test issue * Addressing review comments pt.3 * Updated docstring * Adjust UpdateApp SQL implementation to work with app IDs instead of names * Fixing tests * fmt after rebase * Make tests green again! * Use GetAppByID wherever it is necessary - adding new v2 endpoints to keep hybrid api/runner mode working - extract CallBase from Call object to expose that to a user (it doesn't include any app reference, as we do for all other API objects) * Get rid of GetAppByName * Adjusting server router setup * Make hybrid work again * Fix datastore tests * Fixing tests * Do not ignore app_id * Resolve issues after rebase * Updating test to make it work as it was * Tabula rasa for migrations * Adding calls API test - we need to ensure we give "App not found" for the missing app and missing call in first place - making previous test work (request missing call for the existing app) * Make datastore tests work fine with correctly applied migrations * Make CallFunction middleware work again had to adjust its implementation to set app ID before proceeding * The biggest rebase ever made * Fix 8's migration * Fix tests * Fix hybrid client * Fix tests problem * Increment app ID migration version * Fixing TestAppUpdate * Fix rebase issues * Addressing review comments * Renew vendor * Updated swagger doc per recommendations
107 lines
3.3 KiB
Go
107 lines
3.3 KiB
Go
// TODO: it would be nice to move these into the top level folder so people can use these with the "functions" package, eg: functions.ApiHandler
|
|
package server
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/fnproject/fn/api"
|
|
"github.com/fnproject/fn/api/models"
|
|
"github.com/fnproject/fn/fnext"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func (s *Server) apiHandlerWrapperFunc(apiHandler fnext.ApiHandler) gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
apiHandler.ServeHTTP(c.Writer, c.Request)
|
|
}
|
|
}
|
|
|
|
func (s *Server) apiAppHandlerWrapperFunc(apiHandler fnext.ApiAppHandler) gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
// get the app
|
|
appID := c.MustGet(api.AppID).(string)
|
|
app, err := s.datastore.GetAppByID(c.Request.Context(), appID)
|
|
if err != nil {
|
|
handleErrorResponse(c, err)
|
|
c.Abort()
|
|
return
|
|
}
|
|
if app == nil {
|
|
handleErrorResponse(c, models.ErrAppsNotFound)
|
|
c.Abort()
|
|
return
|
|
}
|
|
|
|
apiHandler.ServeHTTP(c.Writer, c.Request, app)
|
|
}
|
|
}
|
|
|
|
func (s *Server) apiRouteHandlerWrapperFunc(apiHandler fnext.ApiRouteHandler) gin.HandlerFunc {
|
|
return func(c *gin.Context) {
|
|
context := c.Request.Context()
|
|
appID := c.MustGet(api.AppID).(string)
|
|
routePath := "/" + c.Param(api.CRoute)
|
|
route, err := s.datastore.GetRoute(context, appID, routePath)
|
|
if err != nil {
|
|
handleErrorResponse(c, err)
|
|
c.Abort()
|
|
return
|
|
}
|
|
if route == nil {
|
|
handleErrorResponse(c, models.ErrRoutesNotFound)
|
|
c.Abort()
|
|
return
|
|
}
|
|
|
|
app, err := s.datastore.GetAppByID(context, appID)
|
|
if err != nil {
|
|
handleErrorResponse(c, err)
|
|
c.Abort()
|
|
return
|
|
}
|
|
if app == nil {
|
|
handleErrorResponse(c, models.ErrAppsNotFound)
|
|
c.Abort()
|
|
return
|
|
}
|
|
|
|
apiHandler.ServeHTTP(c.Writer, c.Request, app, route)
|
|
}
|
|
}
|
|
|
|
// AddEndpoint adds an endpoint to /v1/x
|
|
func (s *Server) AddEndpoint(method, path string, handler fnext.ApiHandler) {
|
|
v1 := s.Router.Group("/v1")
|
|
// v1.GET("/apps/:app/log", logHandler(cfg))
|
|
v1.Handle(method, path, s.apiHandlerWrapperFunc(handler))
|
|
}
|
|
|
|
// AddEndpoint adds an endpoint to /v1/x
|
|
func (s *Server) AddEndpointFunc(method, path string, handler func(w http.ResponseWriter, r *http.Request)) {
|
|
s.AddEndpoint(method, path, fnext.ApiHandlerFunc(handler))
|
|
}
|
|
|
|
// AddAppEndpoint adds an endpoints to /v1/apps/:app/x
|
|
func (s *Server) AddAppEndpoint(method, path string, handler fnext.ApiAppHandler) {
|
|
v1 := s.Router.Group("/v1")
|
|
v1.Use(s.checkAppPresenceByName())
|
|
v1.Handle(method, "/apps/:app"+path, s.apiAppHandlerWrapperFunc(handler))
|
|
}
|
|
|
|
// AddAppEndpoint adds an endpoints to /v1/apps/:app/x
|
|
func (s *Server) AddAppEndpointFunc(method, path string, handler func(w http.ResponseWriter, r *http.Request, app *models.App)) {
|
|
s.AddAppEndpoint(method, path, fnext.ApiAppHandlerFunc(handler))
|
|
}
|
|
|
|
// AddRouteEndpoint adds an endpoints to /v1/apps/:app/routes/:route/x
|
|
func (s *Server) AddRouteEndpoint(method, path string, handler fnext.ApiRouteHandler) {
|
|
v1 := s.Router.Group("/v1")
|
|
v1.Use(s.checkAppPresenceByName())
|
|
v1.Handle(method, "/apps/:app/routes/:route"+path, s.apiRouteHandlerWrapperFunc(handler)) // conflicts with existing wildcard
|
|
}
|
|
|
|
// AddRouteEndpoint adds an endpoints to /v1/apps/:app/routes/:route/x
|
|
func (s *Server) AddRouteEndpointFunc(method, path string, handler func(w http.ResponseWriter, r *http.Request, app *models.App, route *models.Route)) {
|
|
s.AddRouteEndpoint(method, path, fnext.ApiRouteHandlerFunc(handler))
|
|
}
|