Inverting deps on SQL, Log and MQ plugins to make them optional dependencies of extended servers, Removing some dead code that brought in unused dependencies Filtering out some non-linux transitive deps. (#1057)

* initial Db helper split - make SQL and datastore packages optional

* abstracting log store

* break out DB, MQ and log drivers as extensions

* cleanup

* fewer deps

* fixing docker test

* hmm dbness

* updating db startup

* Consolidate all your extensions into one convenient package

* cleanup

* clean up dep constraints
This commit is contained in:
Owen Cliffe
2018-06-11 18:23:28 +01:00
committed by Reed Allman
parent 5b2691037e
commit 1ad27f4f0d
519 changed files with 907 additions and 91042 deletions

View File

@@ -7,14 +7,30 @@ import (
"context"
"github.com/fnproject/fn/api/common"
"github.com/fnproject/fn/api/datastore/sql"
"github.com/fnproject/fn/api/logs/metrics"
"github.com/fnproject/fn/api/logs/s3"
"github.com/fnproject/fn/api/logs/validator"
"github.com/fnproject/fn/api/models"
"github.com/sirupsen/logrus"
)
// Provider defines a source that can create log stores
type Provider interface {
fmt.Stringer
// Supports indicates if this provider can handle a specific URL scheme
Supports(url *url.URL) bool
//Create a new log store from the corresponding URL
New(ctx context.Context, url *url.URL) (models.LogStore, error)
}
var providers []Provider
// AddProvider globally registers a new LogStore provider
func AddProvider(pf Provider) {
logrus.Info("Adding log provider %s", pf)
providers = append(providers, pf)
}
// New Creates a new log store based on a given URL
func New(ctx context.Context, dbURL string) (models.LogStore, error) {
log := common.Logger(ctx)
u, err := url.Parse(dbURL)
@@ -22,17 +38,13 @@ func New(ctx context.Context, dbURL string) (models.LogStore, error) {
log.WithError(err).WithFields(logrus.Fields{"url": dbURL}).Fatal("bad DB URL")
}
log.WithFields(logrus.Fields{"db": u.Scheme}).Debug("creating log store")
var ls models.LogStore
switch u.Scheme {
case "sqlite3", "postgres", "mysql":
ls, err = sql.New(ctx, u)
case "s3":
ls, err = s3.New(u)
default:
err = fmt.Errorf("db type not supported %v", u.Scheme)
}
return ls, err
for _, p := range providers {
if p.Supports(u) {
return p.New(ctx, u)
}
}
return nil, fmt.Errorf("no log store provider available for url %s", dbURL)
}
func Wrap(ls models.LogStore) models.LogStore {