[ISSUE #371] 补充单元测试 & 修复boltdb问题

.gitignore

@@ -13,7 +13,8 @@ polaris-server-release.tar.gz
 *.swp
 *.code-workspace
 
-.vscode/*
+.vscode
 *.bolt
 *.bolt.lock
 /vendor
+.codecc

apiserver/eurekaserver/default.go

@@ -25,5 +25,5 @@ import (
  * @brief 自注册到API服务器插槽
  */
 func init() {
-	_ = apiserver.Register("eurekaserver", &EurekaServer{})
+	_ = apiserver.Register("service-eureka", &EurekaServer{})
 }

apiserver/grpcserver/config/config_client_access.go → apiserver/grpcserver/config/client_access.go

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package configgrpcserver
+package config
 
 import (
 	"context"

apiserver/grpcserver/config/default.go

@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package configgrpcserver
+package config
 
 import (
 	"github.com/polarismesh/polaris-server/apiserver"
 )
 
 // init 自注册到API服务器插槽
 func init() {
-	_ = apiserver.Register("configgrpcserver", &ConfigGRPCServer{})
+	_ = apiserver.Register("config-grpc", &ConfigGRPCServer{})
 }

apiserver/grpcserver/config/config_server.go → apiserver/grpcserver/config/server.go

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package configgrpcserver
+package config
 
 import (
 	"context"
@@ -61,7 +61,7 @@ func (g *ConfigGRPCServer) Run(errCh chan error) {
 	g.BaseGrpcServer.Run(errCh, g.GetProtocol(), func(server *grpc.Server) error {
 		for name, apiConfig := range g.openAPI {
 			switch name {
-			case "configClient":
+			case "client":
 				if apiConfig.Enable {
 					api.RegisterPolarisConfigGRPCServer(server, g)
 					openMethod, getErr := getConfigClientOpenMethod(g.GetProtocol())
@@ -82,7 +82,7 @@ func (g *ConfigGRPCServer) Run(errCh chan error) {
 			}
 		}
 		var err error
-		if g.configServer, err = config.GetConfigServer(); err != nil {
+		if g.configServer, err = config.GetServer(); err != nil {
 			log.Errorf("[Config] %v", err)
 			return err
 		}

apiserver/grpcserver/client_access.go → apiserver/grpcserver/discover/client_access.go

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package grpcserver
+package discover
 
 import (
 	"context"
@@ -27,19 +27,21 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/peer"
 
+	"github.com/polarismesh/polaris-server/apiserver/grpcserver"
 	api "github.com/polarismesh/polaris-server/common/api/v1"
+	"github.com/polarismesh/polaris-server/common/log"
 	"github.com/polarismesh/polaris-server/common/utils"
 )
 
 // ReportClient 客户端上报
 func (g *GRPCServer) ReportClient(ctx context.Context, in *api.Client) (*api.Response, error) {
-	return g.namingServer.ReportClient(ConvertContext(ctx), in), nil
+	return g.namingServer.ReportClient(grpcserver.ConvertContext(ctx), in), nil
 }
 
 // RegisterInstance 注册服务实例
 func (g *GRPCServer) RegisterInstance(ctx context.Context, in *api.Instance) (*api.Response, error) {
 	// 需要记录操作来源，提高效率，只针对特殊接口添加operator
-	rCtx := ConvertContext(ctx)
+	rCtx := grpcserver.ConvertContext(ctx)
 	rCtx = context.WithValue(rCtx, utils.StringContext("operator"), ParseGrpcOperator(ctx))
 
 	// 客户端请求中带了 token 的，优先已请求中的为准
@@ -54,7 +56,7 @@ func (g *GRPCServer) RegisterInstance(ctx context.Context, in *api.Instance) (*a
 // DeregisterInstance 反注册服务实例
 func (g *GRPCServer) DeregisterInstance(ctx context.Context, in *api.Instance) (*api.Response, error) {
 	// 需要记录操作来源，提高效率，只针对特殊接口添加operator
-	rCtx := ConvertContext(ctx)
+	rCtx := grpcserver.ConvertContext(ctx)
 	rCtx = context.WithValue(rCtx, utils.StringContext("operator"), ParseGrpcOperator(ctx))
 
 	// 客户端请求中带了 token 的，优先已请求中的为准
@@ -68,7 +70,7 @@ func (g *GRPCServer) DeregisterInstance(ctx context.Context, in *api.Instance) (
 
 // Discover 统一发现接口
 func (g *GRPCServer) Discover(server api.PolarisGRPC_DiscoverServer) error {
-	ctx := ConvertContext(server.Context())
+	ctx := grpcserver.ConvertContext(server.Context())
 	clientIP, _ := ctx.Value(utils.StringContext("client-ip")).(string)
 	clientAddress, _ := ctx.Value(utils.StringContext("client-address")).(string)
 	requestID, _ := ctx.Value(utils.StringContext("request-id")).(string)
@@ -135,7 +137,7 @@ func (g *GRPCServer) Discover(server api.PolarisGRPC_DiscoverServer) error {
 
 // Heartbeat 上报心跳
 func (g *GRPCServer) Heartbeat(ctx context.Context, in *api.Instance) (*api.Response, error) {
-	return g.healthCheckServer.Report(ConvertContext(ctx), in), nil
+	return g.healthCheckServer.Report(grpcserver.ConvertContext(ctx), in), nil
 }
 
 // ParseGrpcOperator 构造请求源

apiserver/grpcserver/default.go → apiserver/grpcserver/discover/default.go

@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package grpcserver
+package discover
 
 import (
 	"github.com/polarismesh/polaris-server/apiserver"
 )
 
 // init 自注册到API服务器插槽
 func init() {
-	_ = apiserver.Register("grpcserver", &GRPCServer{})
+	_ = apiserver.Register("service-grpc", &GRPCServer{})
 }

apiserver/grpcserver/server.go → apiserver/grpcserver/discover/server.go

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package grpcserver
+package discover
 
 import (
 	"context"
@@ -24,14 +24,16 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/polarismesh/polaris-server/apiserver"
+	"github.com/polarismesh/polaris-server/apiserver/grpcserver"
 	api "github.com/polarismesh/polaris-server/common/api/v1"
+	"github.com/polarismesh/polaris-server/common/log"
 	"github.com/polarismesh/polaris-server/service"
 	"github.com/polarismesh/polaris-server/service/healthcheck"
 )
 
 // GRPCServer GRPC API服务器
 type GRPCServer struct {
-	BaseGrpcServer
+	grpcserver.BaseGrpcServer
 	namingServer      service.DiscoverServer
 	healthCheckServer *healthcheck.Server
 	openAPI           map[string]apiserver.APIConfig

apiserver/httpserver/default.go

@@ -23,5 +23,5 @@ import (
 
 // init 自注册到API服务器插槽
 func init() {
-	_ = apiserver.Register("httpserver", &HTTPServer{})
+	_ = apiserver.Register("api-http", &HTTPServer{})
 }

apiserver/httpserver/server.go

@@ -167,7 +167,7 @@ func (h *HTTPServer) Run(errCh chan error) {
 	h.statis = plugin.GetStatis()
 
 	// 初始化配置中心模块
-	h.configServer, err = config.GetConfigServer()
+	h.configServer, err = config.GetServer()
 	if err != nil {
 		log.Errorf("set config server to http server error. %v", err)
 		errCh <- err

apiserver/l5pbserver/default.go

@@ -23,5 +23,5 @@ import (
 
 // init 自注册到API服务器插槽
 func init() {
-	_ = apiserver.Register("l5pbserver", &L5pbserver{})
+	_ = apiserver.Register("service-l5", &L5pbserver{})
 }

apiserver/prometheusserver/default.go → apiserver/prometheussd/default.go

@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package prometheusserver
+package prometheussd
 
 import (
 	"github.com/polarismesh/polaris-server/apiserver"
 )
 
 // init 自注册到API服务器插槽
 func init() {
-	_ = apiserver.Register("prometheusserver", &PrometheusServer{})
+	_ = apiserver.Register("prometheus-sd", &PrometheusServer{})
 }

apiserver/prometheusserver/prometheus_access.go → apiserver/prometheussd/prometheus_access.go

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package prometheusserver
+package prometheussd
 
 import (
 	"github.com/emicklei/go-restful"

apiserver/prometheusserver/server.go → apiserver/prometheussd/server.go

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package prometheusserver
+package prometheussd
 
 import (
 	"context"

apiserver/xdsserverv3/default.go

@@ -23,5 +23,5 @@ import (
 
 // init 自注册到API服务器插槽
 func init() {
-	_ = apiserver.Register("xdsserverv3", &XDSServer{})
+	_ = apiserver.Register("xds-v3", &XDSServer{})
 }

apiserver/xdsserverv3/server.go

@@ -649,8 +649,8 @@ func (x *XDSServer) getRegistryInfoWithCache(ctx context.Context, registryInfo m
 
 			routeResp := x.namingServer.GetRoutingConfigWithCache(ctx, s)
 			if routeResp.GetCode().Value != api.ExecuteSuccess {
-				log.Errorf("error sync instances for %s", svc.Name)
-				return fmt.Errorf("error sync instances for %s", svc.Name)
+				log.Errorf("error sync routing for %s, info : %s", svc.Name, routeResp.Info.GetValue())
+				return fmt.Errorf("error sync routing for %s", svc.Name)
 			}
 
 			if routeResp.Routing != nil {
@@ -660,7 +660,7 @@ func (x *XDSServer) getRegistryInfoWithCache(ctx context.Context, registryInfo m
 
 			resp := x.namingServer.ServiceInstancesCache(nil, s)
 			if resp.GetCode().Value != api.ExecuteSuccess {
-				log.Errorf("error sync instances for %s", svc.Name)
+				log.Errorf("error sync instances for %s, info : %s", svc.Name, resp.Info.GetValue())
 				return fmt.Errorf("error sync instances for %s", svc.Name)
 			}
 

auth/defaultauth/group.go

@@ -263,7 +263,7 @@ func (svr *server) GetGroup(ctx context.Context, req *api.UserGroup) *api.Respon
 		isGroupOwner := group.Owner == userID
 		_, find := group.UserIds[userID]
 		if !isGroupOwner && !find {
-			log.AuthScope().Error("can't see group token", zap.String("user", userID),
+			log.AuthScope().Error("can't see group info", zap.String("user", userID),
 				zap.String("group", req.GetId().GetValue()), zap.Bool("group-owner", isGroupOwner),
 				zap.Bool("in-group", find))
 			return api.NewResponse(api.NotAllowedAccess)
@@ -343,7 +343,7 @@ func (svr *server) UpdateGroupToken(ctx context.Context, req *api.UserGroup) *ap
 	return api.NewGroupResponse(api.ExecuteSuccess, req)
 }
 
-// ResetGroupToken 刷新用户组的token，刷新时会重置 token 的状态为 enable
+// ResetGroupToken 刷新用户组的token
 func (svr *server) ResetGroupToken(ctx context.Context, req *api.UserGroup) *api.Response {
 	var (
 		requestID      = utils.ParseRequestID(ctx)