mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
* 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
140 lines
2.8 KiB
Go
140 lines
2.8 KiB
Go
package fnext
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/fnproject/fn/api/models"
|
|
)
|
|
|
|
func NewDatastore(ds models.Datastore, al AppListener, rl RouteListener) models.Datastore {
|
|
return &extds{
|
|
Datastore: ds,
|
|
al: al,
|
|
rl: rl,
|
|
}
|
|
}
|
|
|
|
type extds struct {
|
|
models.Datastore
|
|
al AppListener
|
|
rl RouteListener
|
|
}
|
|
|
|
func (e *extds) GetAppByID(ctx context.Context, appID string) (*models.App, error) {
|
|
err := e.al.BeforeAppGet(ctx, appID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
app, err := e.Datastore.GetAppByID(ctx, appID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = e.al.AfterAppGet(ctx, app)
|
|
return app, err
|
|
}
|
|
|
|
func (e *extds) InsertApp(ctx context.Context, app *models.App) (*models.App, error) {
|
|
err := e.al.BeforeAppCreate(ctx, app)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
app, err = e.Datastore.InsertApp(ctx, app)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = e.al.AfterAppCreate(ctx, app)
|
|
return app, err
|
|
}
|
|
|
|
func (e *extds) UpdateApp(ctx context.Context, app *models.App) (*models.App, error) {
|
|
err := e.al.BeforeAppUpdate(ctx, app)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
app, err = e.Datastore.UpdateApp(ctx, app)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = e.al.AfterAppUpdate(ctx, app)
|
|
return app, err
|
|
}
|
|
|
|
func (e *extds) RemoveApp(ctx context.Context, appName string) error {
|
|
var app models.App
|
|
app.Name = appName
|
|
err := e.al.BeforeAppDelete(ctx, &app)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = e.Datastore.RemoveApp(ctx, appName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return e.al.AfterAppDelete(ctx, &app)
|
|
}
|
|
|
|
func (e *extds) GetApps(ctx context.Context, filter *models.AppFilter) ([]*models.App, error) {
|
|
err := e.al.BeforeAppsList(ctx, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
apps, err := e.Datastore.GetApps(ctx, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = e.al.AfterAppsList(ctx, apps)
|
|
return apps, err
|
|
}
|
|
|
|
func (e *extds) InsertRoute(ctx context.Context, route *models.Route) (*models.Route, error) {
|
|
err := e.rl.BeforeRouteCreate(ctx, route)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
route, err = e.Datastore.InsertRoute(ctx, route)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = e.rl.AfterRouteCreate(ctx, route)
|
|
return route, err
|
|
}
|
|
|
|
func (e *extds) UpdateRoute(ctx context.Context, route *models.Route) (*models.Route, error) {
|
|
err := e.rl.BeforeRouteUpdate(ctx, route)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
route, err = e.Datastore.UpdateRoute(ctx, route)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
err = e.rl.AfterRouteUpdate(ctx, route)
|
|
return route, err
|
|
}
|
|
|
|
func (e *extds) RemoveRoute(ctx context.Context, appName string, routePath string) error {
|
|
err := e.rl.BeforeRouteDelete(ctx, appName, routePath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = e.Datastore.RemoveRoute(ctx, appName, routePath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return e.rl.AfterRouteDelete(ctx, appName, routePath)
|
|
}
|