Merge pull request #133 from mahmednabil109/refactor-storage-api

mimir-d · web-flow · commit 6d0dc8e5e589 · 2022-08-17T14:32:43.000+01:00
Refactor admin server storage api
diff --git a/cmds/admin_server/storage/mongo/mongo.go b/cmds/admin_server/storage/mongo/mongo.go
@@ -27,7 +27,7 @@ type MongoStorage struct {
 	collection *mongo.Collection
 }
 
-func NewMongoStorage(ctx xcontext.Context, uri string) (storage.Storage, error) {
+func NewMongoStorage(ctx xcontext.Context, uri string) (*MongoStorage, error) {
 	client, err := mongo.NewClient(options.Client().ApplyURI(uri))
 	if err != nil {
 		return nil, err
diff --git a/cmds/admin_server/storage/storage.go b/cmds/admin_server/storage/storage.go
@@ -21,8 +21,6 @@ var (
 type Storage interface {
 	StoreLogs(ctx xcontext.Context, logs []Log) error
 	GetLogs(ctx xcontext.Context, query Query) (*Result, error)
-
-	Close(ctx xcontext.Context) error
 }
 
 // Log defines the basic log info pushed by the server

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ type MongoStorage struct {`
`27`	`27`	`collection *mongo.Collection`
`28`	`28`	`}`
`29`	`29`
`30`		`-func NewMongoStorage(ctx xcontext.Context, uri string) (storage.Storage, error) {`
	`30`	`+func NewMongoStorage(ctx xcontext.Context, uri string) (*MongoStorage, error) {`
`31`	`31`	`client, err := mongo.NewClient(options.Client().ApplyURI(uri))`
`32`	`32`	`if err != nil {`
`33`	`33`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ var (`
`21`	`21`	`type Storage interface {`
`22`	`22`	`StoreLogs(ctx xcontext.Context, logs []Log) error`
`23`	`23`	`GetLogs(ctx xcontext.Context, query Query) (*Result, error)`
`24`		`-`
`25`		`- Close(ctx xcontext.Context) error`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`// Log defines the basic log info pushed by the server`