restore `MetaClient`, which is needed by store

* Switch from an anonymous type to avoid false positives with
  `megacheck`

cmd/influxd/run/server.go

@@ -271,6 +271,7 @@ func (s *Server) appendStorageService(c storage.Config) {
 		return
 	}
 	srv := storage.NewService(c)
+	srv.MetaClient = s.MetaClient
 	srv.TSDBStore = s.TSDBStore
 
 	s.Services = append(s.Services, srv)

services/storage/service.go

@@ -1,10 +1,18 @@
 package storage
 
 import (
+	"time"
+
+	"github.com/influxdata/influxdb/services/meta"
 	"github.com/influxdata/influxdb/tsdb"
 	"go.uber.org/zap"
 )
 
+type StorageMetaClient interface {
+	Database(name string) *meta.DatabaseInfo
+	ShardGroupsByTimeRange(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error)
+}
+
 // Service manages the listener and handler for an HTTP endpoint.
 type Service struct {
 	addr           string
@@ -12,8 +20,9 @@ type Service struct {
 	loggingEnabled bool
 	logger         *zap.Logger
 
-	Store     *Store
-	TSDBStore *tsdb.Store
+	Store      *Store
+	TSDBStore  *tsdb.Store
+	MetaClient StorageMetaClient
 }
 
 // NewService returns a new instance of Service.
@@ -38,6 +47,7 @@ func (s *Service) Open() error {
 
 	store := NewStore()
 	store.TSDBStore = s.TSDBStore
+	store.MetaClient = s.MetaClient
 	store.Logger = s.logger
 
 	yarpc := &yarpcServer{

services/storage/store.go

@@ -14,14 +14,9 @@ import (
 )
 
 type Store struct {
-	TSDBStore *tsdb.Store
-
-	MetaClient interface {
-		Database(name string) *meta.DatabaseInfo
-		ShardGroupsByTimeRange(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error)
-	}
-
-	Logger *zap.Logger
+	TSDBStore  *tsdb.Store
+	MetaClient StorageMetaClient
+	Logger     *zap.Logger
 }
 
 func NewStore() *Store {