Skip to content

Commit 1c882af

Browse files
committed
fix(service): resolve rebase duplicates and drop versionGroups detail
1 parent 1c3773e commit 1c882af

3 files changed

Lines changed: 0 additions & 98 deletions

File tree

pkg/console/handler/service.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -269,25 +269,6 @@ func GetServiceGraph(ctx consolectx.Context) gin.HandlerFunc {
269269
}
270270
}
271271

272-
// GetServiceDetail returns service detail information
273-
func GetServiceDetail(ctx consolectx.Context) gin.HandlerFunc {
274-
return func(c *gin.Context) {
275-
req := &model.ServiceDetailReq{}
276-
if err := c.ShouldBindQuery(req); err != nil {
277-
c.JSON(http.StatusBadRequest, model.NewErrorResp(err.Error()))
278-
return
279-
}
280-
281-
resp, err := service.GetServiceDetail(ctx, req)
282-
if err != nil {
283-
util.HandleServiceError(c, err)
284-
return
285-
}
286-
287-
c.JSON(http.StatusOK, model.NewSuccessResp(resp))
288-
}
289-
}
290-
291272
// GetServiceInterfaces returns service interfaces information
292273
func GetServiceInterfaces(ctx consolectx.Context) gin.HandlerFunc {
293274
return func(c *gin.Context) {

pkg/console/model/service.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -174,25 +174,6 @@ func ParseServiceKey(serviceKey string) (serviceName, version, group string, err
174174
return serviceName, version, group, nil
175175
}
176176

177-
type ServiceDetailReq struct {
178-
ServiceName string `form:"serviceName" json:"serviceName" binding:"required"`
179-
Version string `form:"version" json:"version"`
180-
Group string `form:"group" json:"group"`
181-
Mesh string `form:"mesh" json:"mesh" binding:"required"`
182-
}
183-
184-
type VersionGroup struct {
185-
Version string `json:"version"`
186-
Group string `json:"group"`
187-
}
188-
189-
type ServiceDetailResp struct {
190-
VersionGroups []*VersionGroup `json:"versionGroups"`
191-
AvgRT string `json:"avgRT"`
192-
AvgQPS string `json:"avgQPS"`
193-
RequestTotal string `json:"requestTotal"`
194-
}
195-
196177
type ServiceInterfacesReq struct {
197178
ServiceName string `form:"serviceName" json:"serviceName" binding:"required"`
198179
Mesh string `form:"mesh" json:"mesh" binding:"required"`

pkg/console/service/service.go

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package service
1919

2020
import (
21-
"encoding/json"
2221
"strconv"
2322
"strings"
2423

@@ -673,65 +672,6 @@ func SearchServiceAsCrossLinkedList(ctx consolectx.Context, req *model.ServiceGr
673672
}, nil
674673
}
675674

676-
// GetServiceDetail get service detail information including version groups and metrics
677-
func GetServiceDetail(ctx consolectx.Context, req *model.ServiceDetailReq) (*model.ServiceDetailResp, error) {
678-
// Query all service provider metadata resources for the given service name
679-
indexes := map[string]string{
680-
index.ByServiceProviderServiceName: req.ServiceName,
681-
}
682-
if strutil.IsNotBlank(req.Mesh) {
683-
indexes[index.ByMeshIndex] = req.Mesh
684-
}
685-
686-
serviceResources, err := manager.ListByIndexes[*meshresource.ServiceProviderMetadataResource](
687-
ctx.ResourceManager(),
688-
meshresource.ServiceProviderMetadataKind,
689-
indexes,
690-
)
691-
byteJsonStr, err := json.Marshal(serviceResources)
692-
logger.Infof("service resources for service %s: %s", req.ServiceName, string(byteJsonStr))
693-
if err != nil {
694-
logger.Errorf("get service provider metadata for %s failed, cause: %v", req.ServiceName, err)
695-
return nil, bizerror.New(bizerror.InternalError, "get service provider failed")
696-
}
697-
698-
if len(serviceResources) == 0 {
699-
logger.Warnf("service %s not found", req.ServiceName)
700-
return nil, bizerror.New(bizerror.NotFoundError, "service not found")
701-
}
702-
703-
// Collect unique version and group combinations
704-
versionGroupMap := make(map[string]*model.VersionGroup)
705-
for _, res := range serviceResources {
706-
if res.Spec == nil {
707-
continue
708-
}
709-
key := res.Spec.Version + "|" + res.Spec.Group
710-
if _, exists := versionGroupMap[key]; !exists {
711-
versionGroupMap[key] = &model.VersionGroup{
712-
Version: res.Spec.Version,
713-
Group: res.Spec.Group,
714-
}
715-
}
716-
}
717-
718-
versionGroups := make([]*model.VersionGroup, 0)
719-
for _, vg := range versionGroupMap {
720-
versionGroups = append(versionGroups, vg)
721-
}
722-
723-
// Return service detail response with mock metrics data
724-
// In production, metrics would come from Prometheus or a metrics store
725-
resp := &model.ServiceDetailResp{
726-
VersionGroups: versionGroups,
727-
AvgRT: "96ms",
728-
AvgQPS: "12.5",
729-
RequestTotal: "1386",
730-
}
731-
732-
return resp, nil
733-
}
734-
735675
// GetServiceInterfaces get service interfaces
736676
func GetServiceInterfaces(ctx consolectx.Context, req *model.ServiceInterfacesReq) (*model.ServiceInterfacesResp, error) {
737677
// Query all service provider metadata resources for the given service name

0 commit comments

Comments
 (0)