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
125 lines
3.8 KiB
Go
125 lines
3.8 KiB
Go
package datastoreutil
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
|
|
"go.opencensus.io/trace"
|
|
|
|
"github.com/fnproject/fn/api/models"
|
|
"github.com/jmoiron/sqlx"
|
|
)
|
|
|
|
func MetricDS(ds models.Datastore) models.Datastore {
|
|
return &metricds{ds}
|
|
}
|
|
|
|
type metricds struct {
|
|
ds models.Datastore
|
|
}
|
|
|
|
func (m *metricds) GetAppID(ctx context.Context, appName string) (string, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_app_id")
|
|
defer span.End()
|
|
return m.ds.GetAppID(ctx, appName)
|
|
}
|
|
|
|
func (m *metricds) GetAppByID(ctx context.Context, appID string) (*models.App, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_app_by_id")
|
|
defer span.End()
|
|
return m.ds.GetAppByID(ctx, appID)
|
|
}
|
|
|
|
func (m *metricds) GetApps(ctx context.Context, filter *models.AppFilter) ([]*models.App, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_apps")
|
|
defer span.End()
|
|
return m.ds.GetApps(ctx, filter)
|
|
}
|
|
|
|
func (m *metricds) InsertApp(ctx context.Context, app *models.App) (*models.App, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_insert_app")
|
|
defer span.End()
|
|
return m.ds.InsertApp(ctx, app)
|
|
}
|
|
|
|
func (m *metricds) UpdateApp(ctx context.Context, app *models.App) (*models.App, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_update_app")
|
|
defer span.End()
|
|
return m.ds.UpdateApp(ctx, app)
|
|
}
|
|
|
|
func (m *metricds) RemoveApp(ctx context.Context, appID string) error {
|
|
ctx, span := trace.StartSpan(ctx, "ds_remove_app")
|
|
defer span.End()
|
|
return m.ds.RemoveApp(ctx, appID)
|
|
}
|
|
|
|
func (m *metricds) GetRoute(ctx context.Context, appID, routePath string) (*models.Route, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_route")
|
|
defer span.End()
|
|
return m.ds.GetRoute(ctx, appID, routePath)
|
|
}
|
|
|
|
func (m *metricds) GetRoutesByApp(ctx context.Context, appID string, filter *models.RouteFilter) (routes []*models.Route, err error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_routes_by_app")
|
|
defer span.End()
|
|
return m.ds.GetRoutesByApp(ctx, appID, filter)
|
|
}
|
|
|
|
func (m *metricds) InsertRoute(ctx context.Context, route *models.Route) (*models.Route, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_insert_route")
|
|
defer span.End()
|
|
return m.ds.InsertRoute(ctx, route)
|
|
}
|
|
|
|
func (m *metricds) UpdateRoute(ctx context.Context, route *models.Route) (*models.Route, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_update_route")
|
|
defer span.End()
|
|
return m.ds.UpdateRoute(ctx, route)
|
|
}
|
|
|
|
func (m *metricds) RemoveRoute(ctx context.Context, appID string, routePath string) error {
|
|
ctx, span := trace.StartSpan(ctx, "ds_remove_route")
|
|
defer span.End()
|
|
return m.ds.RemoveRoute(ctx, appID, routePath)
|
|
}
|
|
|
|
func (m *metricds) InsertCall(ctx context.Context, call *models.Call) error {
|
|
ctx, span := trace.StartSpan(ctx, "ds_insert_call")
|
|
defer span.End()
|
|
return m.ds.InsertCall(ctx, call)
|
|
}
|
|
|
|
func (m *metricds) UpdateCall(ctx context.Context, from *models.Call, to *models.Call) error {
|
|
ctx, span := trace.StartSpan(ctx, "ds_update_call")
|
|
defer span.End()
|
|
return m.ds.UpdateCall(ctx, from, to)
|
|
}
|
|
|
|
func (m *metricds) GetCall(ctx context.Context, appName, callID string) (*models.Call, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_call")
|
|
defer span.End()
|
|
return m.ds.GetCall(ctx, appName, callID)
|
|
}
|
|
|
|
func (m *metricds) GetCalls(ctx context.Context, filter *models.CallFilter) ([]*models.Call, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_calls")
|
|
defer span.End()
|
|
return m.ds.GetCalls(ctx, filter)
|
|
}
|
|
|
|
func (m *metricds) InsertLog(ctx context.Context, appName, callID string, callLog io.Reader) error {
|
|
ctx, span := trace.StartSpan(ctx, "ds_insert_log")
|
|
defer span.End()
|
|
return m.ds.InsertLog(ctx, appName, callID, callLog)
|
|
}
|
|
|
|
func (m *metricds) GetLog(ctx context.Context, appName, callID string) (io.Reader, error) {
|
|
ctx, span := trace.StartSpan(ctx, "ds_get_log")
|
|
defer span.End()
|
|
return m.ds.GetLog(ctx, appName, callID)
|
|
}
|
|
|
|
// instant & no context ;)
|
|
func (m *metricds) GetDatabase() *sqlx.DB { return m.ds.GetDatabase() }
|