Skip to content

Commit d00ad4f

Browse files
committed
array handling
1 parent f548a8e commit d00ad4f

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

api/restHandler/AppListingRestHandler.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,9 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
16251625
clusterIdString := strconv.Itoa(cdPipeline.Environment.ClusterId)
16261626
validRequest := handler.k8sCommonService.FilterK8sResources(r.Context(), resourceTree, validRequests, k8sAppDetail, clusterIdString, []string{k8s.ServiceKind, k8s.EndpointsKind, k8s.IngressKind})
16271627
resp, err := handler.k8sCommonService.GetManifestsByBatch(r.Context(), validRequest)
1628-
ports := make([]int64, 0)
1628+
ports_service := make([]int64, 0)
1629+
ports_endpoint := make([]int64, 0)
1630+
port_endpointSlice := make([]int64, 0)
16291631
for _, portHolder := range resp {
16301632
if portHolder.ManifestResponse.Manifest.Object["kind"] == "Service" {
16311633
spec := portHolder.ManifestResponse.Manifest.Object["spec"].(map[string]interface{})
@@ -1636,7 +1638,7 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
16361638
_portNumber := portItem.(map[string]interface{})["port"]
16371639
portNumber := _portNumber.(int64)
16381640
if portNumber != 0 {
1639-
ports = append(ports, portNumber)
1641+
ports_service = append(ports_service, portNumber)
16401642
}
16411643
}
16421644
}
@@ -1655,7 +1657,7 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
16551657
portsIfObj := portsIf.(map[string]interface{})
16561658
if portsIfObj != nil {
16571659
port := portsIfObj["port"].(int64)
1658-
ports = append(ports, port)
1660+
ports_endpoint = append(ports_endpoint, port)
16591661
}
16601662
}
16611663
}
@@ -1669,7 +1671,7 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
16691671
_portNumber := val.(map[string]interface{})["port"]
16701672
portNumber := _portNumber.(int64)
16711673
if portNumber != 0 {
1672-
ports = append(ports, portNumber)
1674+
port_endpointSlice = append(port_endpointSlice, portNumber)
16731675
}
16741676
}
16751677
}
@@ -1684,10 +1686,13 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
16841686
_value := val.(map[string]interface{})
16851687
for key, _type := range _value {
16861688
if key == "kind" && _type == "Endpoints" {
1687-
_value["port"] = ports
1689+
_value["port"] = ports_endpoint
16881690
}
16891691
if key == "kind" && _type == "Service" {
1690-
_value["port"] = ports
1692+
_value["port"] = ports_service
1693+
}
1694+
if key == "kind" && _type == "EndpointSlice" {
1695+
_value["port"] = port_endpointSlice
16911696
}
16921697
}
16931698
}

0 commit comments

Comments
 (0)