diff --git a/controllers/network.go b/controllers/network.go index 8be03dca..5f09286f 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -170,6 +170,12 @@ func getNetworkACL(w http.ResponseWriter, r *http.Request) { var networkACL acls.ACLContainer networkACL, err := networkACL.Get(acls.ContainerID(netname)) if err != nil { + if database.IsEmptyRecord(err) { + networkACL = acls.ACLContainer{} + w.WriteHeader(http.StatusOK) + json.NewEncoder(w).Encode(networkACL) + return + } logger.Log(0, r.Header.Get("user"), fmt.Sprintf("failed to fetch ACLs for network [%s]: %v", netname, err)) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) diff --git a/ee/ee_controllers/metrics.go b/ee/ee_controllers/metrics.go index f010bf92..d2379d27 100644 --- a/ee/ee_controllers/metrics.go +++ b/ee/ee_controllers/metrics.go @@ -5,6 +5,7 @@ import ( "net/http" "github.com/gorilla/mux" + "github.com/gravitl/netmaker/database" "github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/models" @@ -91,6 +92,12 @@ func getNetworkExtMetrics(w http.ResponseWriter, r *http.Request) { clients, err := logic.GetNetworkExtClients(network) // grab all the network ext clients if err != nil { + if database.IsEmptyRecord(err) { + var metrics struct{} + w.WriteHeader(http.StatusOK) + json.NewEncoder(w).Encode(metrics) + return + } logger.Log(1, r.Header.Get("user"), "failed to fetch metrics of ext clients in network", network, err.Error()) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal")) return