mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
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:
@@ -21,6 +21,7 @@ import (
|
||||
"github.com/aws/aws-sdk-go/service/s3/s3manager"
|
||||
"github.com/fnproject/fn/api/common"
|
||||
"github.com/fnproject/fn/api/id"
|
||||
"github.com/fnproject/fn/api/logs"
|
||||
"github.com/fnproject/fn/api/models"
|
||||
"github.com/sirupsen/logrus"
|
||||
"go.opencensus.io/stats"
|
||||
@@ -49,6 +50,8 @@ type store struct {
|
||||
bucket string
|
||||
}
|
||||
|
||||
type s3StoreProvider int
|
||||
|
||||
// decorator around the Reader interface that keeps track of the number of bytes read
|
||||
// in order to avoid double buffering and track Reader size
|
||||
type countingReader struct {
|
||||
@@ -80,10 +83,18 @@ func createStore(bucketName, endpoint, region, accessKeyID, secretAccessKey stri
|
||||
}
|
||||
}
|
||||
|
||||
func (s3StoreProvider) String() string {
|
||||
return "s3"
|
||||
}
|
||||
|
||||
func (s3StoreProvider) Supports(u *url.URL) bool {
|
||||
return u.Scheme == "s3"
|
||||
}
|
||||
|
||||
// New returns an s3 api compatible log store.
|
||||
// url format: s3://access_key_id:secret_access_key@host/region/bucket_name?ssl=true
|
||||
// Note that access_key_id and secret_access_key must be URL encoded if they contain unsafe characters!
|
||||
func New(u *url.URL) (models.LogStore, error) {
|
||||
func (s3StoreProvider) New(ctx context.Context, u *url.URL) (models.LogStore, error) {
|
||||
endpoint := u.Host
|
||||
|
||||
var accessKeyID, secretAccessKey string
|
||||
@@ -464,3 +475,7 @@ func init() {
|
||||
func (s *store) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func init() {
|
||||
logs.AddProvider(s3StoreProvider(0))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user