fix: the merge cluster topologies function and add panic handler in the HTTP server

kontrol-service/engine/flow/merger.go

@@ -1,13 +1,14 @@
 package flow
 
 import (
+	"encoding/json"
 	"github.com/samber/lo"
 	v1 "k8s.io/api/networking/v1"
 	"kardinal.kontrol-service/types/cluster_topology/resolved"
 )
 
-func MergeClusterTopologies(baseTopology resolved.ClusterTopology, clusterTopologies []resolved.ClusterTopology) *resolved.ClusterTopology {
-	mergedTopology := &resolved.ClusterTopology{
+func MergeClusterTopologies(baseTopology resolved.ClusterTopology, clusterTopologies []resolved.ClusterTopology) (mergedTopology *resolved.ClusterTopology) {
+	mergedTopology = &resolved.ClusterTopology{
 		FlowID:              "all",
 		Services:            deepCopySlice(baseTopology.Services),
 		ServiceDependencies: deepCopySlice(baseTopology.ServiceDependencies),
@@ -19,11 +20,10 @@ func MergeClusterTopologies(baseTopology resolved.ClusterTopology, clusterTopolo
 		mergedTopology.Ingresses = append(mergedTopology.Ingresses, topology.Ingresses...)
 	}
 
-	mergedTopology.Services = lo.Uniq(mergedTopology.Services)
-	mergedTopology.ServiceDependencies = lo.Uniq(mergedTopology.ServiceDependencies)
+	mergedTopology.Services = lo.UniqBy(mergedTopology.Services, MustGetMarshalledKey[*resolved.Service])
+	mergedTopology.ServiceDependencies = lo.UniqBy(mergedTopology.ServiceDependencies, MustGetMarshalledKey[resolved.ServiceDependency])
 	mergedTopology.Ingresses = foldAllIngress(mergedTopology.Ingresses)
 
-	// fmt.Printf("topology: %s\n", SPrintJSONClusterTopology(mergedTopology))
 	return mergedTopology
 }
 
@@ -39,3 +39,11 @@ func foldAllIngress(ingresses []*resolved.Ingress) []*resolved.Ingress {
 		return &merged
 	})
 }
+
+func MustGetMarshalledKey[T any](resource T) string {
+	bytes, err := json.Marshal(resource)
+	if err != nil {
+		panic("Failed to marshal resource")
+	}
+	return string(bytes)
+}

kontrol-service/main.go

@@ -2,9 +2,11 @@ package main
 
 import (
 	"flag"
+	"net/http"
 	"os"
 	"strconv"
 
+	cli_api "github.com/kurtosis-tech/kardinal/libs/cli-kontrol-api/api/golang/server"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/sirupsen/logrus"
@@ -87,6 +89,34 @@ func startServer(isDevMode bool) {
 		},
 	}))
 
+	// Panic handler
+	e.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
+		return func(c echo.Context) error {
+			defer func() {
+				if r := recover(); r != nil {
+
+					internalServerErrorResponse := cli_api.ErrorJSONResponse{
+						Error: "internal server error",
+					}
+
+					// Handle the panic and return a 500 error response
+					c.JSON(http.StatusInternalServerError, internalServerErrorResponse)
+					var debugMsg string
+					switch recoverErr := r.(type) {
+					case string:
+						debugMsg = recoverErr
+					case error:
+						debugMsg = recoverErr.Error()
+					default:
+						debugMsg = "recover didn't get error msg"
+					}
+					logrus.Errorf("HTTP server handle this internal panic: %s", debugMsg)
+				}
+			}()
+			return next(c)
+		}
+	})
+
 	server.RegisterExternalAndInternalApi(e)
 
 	// And we serve HTTP until the world ends.