refactor: manager server new instance (#464)

Signed-off-by: Gaius <gaius.qi@gmail.com>
dragonflyoss · Jul 19, 2021 · a5e9510 · a5e9510
1 parent 7659def
commit a5e9510
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 66 deletions.
diff --git a/manager/server/server.go b/manager/server/server.go
@@ -57,17 +57,10 @@ func New(cfg *config.Config) (*Server, error) {
 	searcher := searcher.New()
 
 	// Initialize REST service
-	restService := service.NewREST(
-		service.WithDatabase(db),
-		service.WithCache(cache),
-	)
+	restService := service.NewREST(db, cache)
 
 	// Initialize GRPC service
-	grpcService := service.NewGRPC(
-		service.GRPCWithDatabase(db),
-		service.GRPCWithCache(cache),
-		service.GRPCWithSearcher(searcher),
-	)
+	grpcService := service.NewGRPC(db, cache, searcher)
 
 	// Initialize router
 	router, err := initRouter(cfg.Verbose, restService)

diff --git a/manager/service/service.go b/manager/service/service.go
@@ -64,31 +64,11 @@ type rest struct {
 	cache *cache.Cache
 }
 
-// Option is a functional option for rest
-type Option func(s *rest)
-
-// WithDatabase set the database client
-func WithDatabase(database *database.Database) Option {
-	return func(s *rest) {
-		s.db = database.DB
-		s.rdb = database.RDB
-	}
-}
-
-// WithCache set the cache client
-func WithCache(cache *cache.Cache) Option {
-	return func(s *rest) {
-		s.cache = cache
-	}
-}
-
 // NewREST returns a new REST instence
-func NewREST(options ...Option) REST {
-	s := &rest{}
-
-	for _, opt := range options {
-		opt(s)
+func NewREST(database *database.Database, cache *cache.Cache) REST {
+	return &rest{
+		db:    database.DB,
+		rdb:   database.RDB,
+		cache: cache,
 	}
-
-	return s
 }
diff --git a/manager/service/service_grpc.go b/manager/service/service_grpc.go
@@ -27,40 +27,14 @@ type GRPC struct {
 	searcher searcher.Searcher
 }
 
-// Option is a functional option for rest
-type GRPCOption func(s *GRPC)
-
-// GRPCWithDatabase set the database client
-func GRPCWithDatabase(database *database.Database) GRPCOption {
-	return func(s *GRPC) {
-		s.db = database.DB
-		s.rdb = database.RDB
-	}
-}
-
-// GRPCWithCache set the cache client
-func GRPCWithCache(cache *cache.Cache) GRPCOption {
-	return func(s *GRPC) {
-		s.cache = cache
-	}
-}
-
-// GRPCWithSearcher set search client
-func GRPCWithSearcher(searcher searcher.Searcher) GRPCOption {
-	return func(s *GRPC) {
-		s.searcher = searcher
-	}
-}
-
 // NewREST returns a new REST instence
-func NewGRPC(options ...GRPCOption) *GRPC {
-	s := &GRPC{}
-
-	for _, opt := range options {
-		opt(s)
+func NewGRPC(database *database.Database, cache *cache.Cache, searcher searcher.Searcher) *GRPC {
+	return &GRPC{
+		db:       database.DB,
+		rdb:      database.RDB,
+		cache:    cache,
+		searcher: searcher,
 	}
-
-	return s
 }
 
 func (s *GRPC) GetCDN(ctx context.Context, req *manager.GetCDNRequest) (*manager.CDN, error) {