fix:服务列表支持服务可见性&修复服务可见性优先级判断

Author: chuntaojun

apiserver/grpcserver/discover/v1/client_access.go

@@ -164,6 +164,9 @@ func (g *DiscoverServer) handleDiscoverRequest(ctx context.Context, in *apiservi
 	case apiservice.DiscoverRequest_ROUTING:
 		action = metrics.ActionDiscoverRouterRule
 		out = g.namingServer.GetRoutingConfigWithCache(ctx, in.Service)
+	case apiservice.DiscoverRequest_CUSTOM_ROUTE_RULE:
+		action = metrics.ActionDiscoverRouterRule
+		out = g.namingServer.GetRoutingConfigWithCache(ctx, in.Service)
 	case apiservice.DiscoverRequest_RATE_LIMIT:
 		action = metrics.ActionDiscoverRateLimit
 		out = g.namingServer.GetRateLimitWithCache(ctx, in.Service)

service/api.go

@@ -222,6 +222,8 @@ type ClientServer interface {
 	ReportServiceContract(ctx context.Context, req *apiservice.ServiceContract) *apiservice.Response
 	// GetLaneRuleWithCache fetch lane rules by client
 	GetLaneRuleWithCache(ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse
+	// GetRouterRuleWithCache fetch lane rules by client
+	GetRouterRuleWithCache(ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse
 }
 
 // L5OperateServer L5 related operations

service/client_v1.go

@@ -499,6 +499,36 @@ func (s *Server) GetLaneRuleWithCache(ctx context.Context, req *apiservice.Servi
 	return resp
 }
 
+// GetRouterRuleWithCache fetch lane rules by client
+func (s *Server) GetRouterRuleWithCache(ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse {
+	resp := createCommonDiscoverResponse(req, apiservice.DiscoverResponse_CUSTOM_ROUTE_RULE)
+	aliasFor := s.findServiceAlias(req)
+
+	out, err := s.caches.RoutingConfig().GetRouterConfigV2(aliasFor.ID, aliasFor.Name, aliasFor.Namespace)
+	if err != nil {
+		log.Error("[Server][Service][Routing] discover routing", utils.RequestID(ctx), zap.Error(err))
+		return api.NewDiscoverRoutingResponse(apimodel.Code_ExecuteException, req)
+	}
+	if out == nil {
+		return resp
+	}
+
+	// 获取路由数据，并对比revision
+	if out.GetRevision().GetValue() == req.GetRevision().GetValue() {
+		return api.NewDiscoverRoutingResponse(apimodel.Code_DataNoChange, req)
+	}
+
+	// 数据不一致，发生了改变
+	// 数据格式转换，service只需要返回二元组与routing的revision
+	resp.Service.Revision = out.GetRevision()
+	resp.CustomRouteRules = out.Rules
+	resp.AliasFor = &apiservice.Service{
+		Name:      utils.NewStringValue(aliasFor.Name),
+		Namespace: utils.NewStringValue(aliasFor.Namespace),
+	}
+	return resp
+}
+
 func (s *Server) findServiceAlias(req *apiservice.Service) *model.Service {
 	// 获取源服务
 	aliasFor := s.getServiceCache(req.GetName().GetValue(), req.GetNamespace().GetValue())

service/interceptor/auth/client_v1.go

@@ -236,3 +236,16 @@ func (svr *Server) GetLaneRuleWithCache(ctx context.Context, req *apiservice.Ser
 
 	return svr.nextSvr.GetLaneRuleWithCache(ctx, req)
 }
+
+// GetRouterRuleWithCache .
+func (svr *Server) GetRouterRuleWithCache(ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse {
+	authCtx := svr.collectServiceAuthContext(
+		ctx, []*apiservice.Service{req}, authcommon.Read, authcommon.DiscoverRouterRule)
+	if _, err := svr.policySvr.GetAuthChecker().CheckClientPermission(authCtx); err != nil {
+		return api.NewDiscoverResponse(authcommon.ConvertToErrCode(err))
+	}
+	ctx = authCtx.GetRequestContext()
+	ctx = context.WithValue(ctx, utils.ContextAuthContextKey, authCtx)
+
+	return svr.nextSvr.GetRouterRuleWithCache(ctx, req)
+}

service/interceptor/paramcheck/client.go

@@ -162,6 +162,15 @@ func (s *Server) GetLaneRuleWithCache(ctx context.Context, req *apiservice.Servi
 	return s.nextSvr.GetLaneRuleWithCache(ctx, req)
 }
 
+// GetRouterRuleWithCache .
+func (s *Server) GetRouterRuleWithCache(ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse {
+	resp := service.CreateCommonDiscoverResponse(req, apiservice.DiscoverResponse_CUSTOM_ROUTE_RULE)
+	if !s.commonCheckDiscoverRequest(req, resp) {
+		return resp
+	}
+	return s.nextSvr.GetRouterRuleWithCache(ctx, req)
+}
+
 // UpdateInstance update one instance by client
 func (s *Server) UpdateInstance(ctx context.Context, req *apiservice.Instance) *apiservice.Response {
 	// 参数检查