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
147 lines
3.8 KiB
Go
147 lines
3.8 KiB
Go
package datastoreutil
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/jmoiron/sqlx"
|
|
|
|
"github.com/fnproject/fn/api/models"
|
|
)
|
|
|
|
// NewValidator returns a models.Datastore which validates certain arguments before delegating to ds.
|
|
func NewValidator(ds models.Datastore) models.Datastore {
|
|
return &validator{ds}
|
|
}
|
|
|
|
type validator struct {
|
|
models.Datastore
|
|
}
|
|
|
|
func (v *validator) GetAppID(ctx context.Context, appName string) (string, error) {
|
|
if appName == "" {
|
|
return "", models.ErrAppsMissingName
|
|
}
|
|
return v.Datastore.GetAppID(ctx, appName)
|
|
}
|
|
|
|
func (v *validator) GetAppByID(ctx context.Context, appID string) (*models.App, error) {
|
|
if appID == "" {
|
|
return nil, models.ErrDatastoreEmptyAppID
|
|
}
|
|
|
|
return v.Datastore.GetAppByID(ctx, appID)
|
|
}
|
|
|
|
func (v *validator) GetApps(ctx context.Context, appFilter *models.AppFilter) ([]*models.App, error) {
|
|
return v.Datastore.GetApps(ctx, appFilter)
|
|
}
|
|
|
|
// app and app.Name will never be nil/empty.
|
|
func (v *validator) InsertApp(ctx context.Context, app *models.App) (*models.App, error) {
|
|
if app == nil {
|
|
return nil, models.ErrDatastoreEmptyApp
|
|
}
|
|
|
|
app.SetDefaults()
|
|
if err := app.Validate(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return v.Datastore.InsertApp(ctx, app)
|
|
}
|
|
|
|
// app and app.Name will never be nil/empty.
|
|
func (v *validator) UpdateApp(ctx context.Context, app *models.App) (*models.App, error) {
|
|
if app == nil {
|
|
return nil, models.ErrDatastoreEmptyApp
|
|
}
|
|
if app.ID == "" {
|
|
return nil, models.ErrDatastoreEmptyAppID
|
|
}
|
|
|
|
return v.Datastore.UpdateApp(ctx, app)
|
|
}
|
|
|
|
// name will never be empty.
|
|
func (v *validator) RemoveApp(ctx context.Context, appID string) error {
|
|
if appID == "" {
|
|
return models.ErrDatastoreEmptyAppID
|
|
}
|
|
|
|
return v.Datastore.RemoveApp(ctx, appID)
|
|
}
|
|
|
|
// appName and routePath will never be empty.
|
|
func (v *validator) GetRoute(ctx context.Context, appID, routePath string) (*models.Route, error) {
|
|
if appID == "" {
|
|
return nil, models.ErrDatastoreEmptyAppID
|
|
}
|
|
if routePath == "" {
|
|
return nil, models.ErrRoutesMissingPath
|
|
}
|
|
|
|
return v.Datastore.GetRoute(ctx, appID, routePath)
|
|
}
|
|
|
|
// appName will never be empty
|
|
func (v *validator) GetRoutesByApp(ctx context.Context, appID string, routeFilter *models.RouteFilter) (routes []*models.Route, err error) {
|
|
if appID == "" {
|
|
return nil, models.ErrDatastoreEmptyAppID
|
|
}
|
|
|
|
return v.Datastore.GetRoutesByApp(ctx, appID, routeFilter)
|
|
}
|
|
|
|
// route will never be nil and route's AppName and Path will never be empty.
|
|
func (v *validator) InsertRoute(ctx context.Context, route *models.Route) (*models.Route, error) {
|
|
if route == nil {
|
|
return nil, models.ErrDatastoreEmptyRoute
|
|
}
|
|
|
|
route.SetDefaults()
|
|
if err := route.Validate(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return v.Datastore.InsertRoute(ctx, route)
|
|
}
|
|
|
|
// route will never be nil and route's AppName and Path will never be empty.
|
|
func (v *validator) UpdateRoute(ctx context.Context, newroute *models.Route) (*models.Route, error) {
|
|
if newroute == nil {
|
|
return nil, models.ErrDatastoreEmptyRoute
|
|
}
|
|
if newroute.AppID == "" {
|
|
return nil, models.ErrRoutesMissingAppID
|
|
}
|
|
if newroute.Path == "" {
|
|
return nil, models.ErrRoutesMissingPath
|
|
}
|
|
return v.Datastore.UpdateRoute(ctx, newroute)
|
|
}
|
|
|
|
// appName and routePath will never be empty.
|
|
func (v *validator) RemoveRoute(ctx context.Context, appID string, routePath string) error {
|
|
if appID == "" {
|
|
return models.ErrDatastoreEmptyAppID
|
|
}
|
|
if routePath == "" {
|
|
return models.ErrRoutesMissingPath
|
|
}
|
|
|
|
return v.Datastore.RemoveRoute(ctx, appID, routePath)
|
|
}
|
|
|
|
// callID will never be empty.
|
|
func (v *validator) GetCall(ctx context.Context, appName, callID string) (*models.Call, error) {
|
|
if callID == "" {
|
|
return nil, models.ErrDatastoreEmptyCallID
|
|
}
|
|
return v.Datastore.GetCall(ctx, appName, callID)
|
|
}
|
|
|
|
// GetDatabase returns the underlying sqlx database implementation
|
|
func (v *validator) GetDatabase() *sqlx.DB {
|
|
return v.Datastore.GetDatabase()
|
|
}
|