Browse Source

Revert "return {} if no records found for acls/metrics"

pushed to wrong branch
This reverts commit 7602e97950a178b141a46bb872dd43e200951e08.
Matthew R Kasun 2 years ago
parent
commit
676e9b35f9
2 changed files with 0 additions and 13 deletions
  1. 0 6
      controllers/network.go
  2. 0 7
      ee/ee_controllers/metrics.go

+ 0 - 6
controllers/network.go

@@ -170,12 +170,6 @@ func getNetworkACL(w http.ResponseWriter, r *http.Request) {
 	var networkACL acls.ACLContainer
 	var networkACL acls.ACLContainer
 	networkACL, err := networkACL.Get(acls.ContainerID(netname))
 	networkACL, err := networkACL.Get(acls.ContainerID(netname))
 	if err != nil {
 	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"),
 		logger.Log(0, r.Header.Get("user"),
 			fmt.Sprintf("failed to fetch ACLs for network [%s]: %v", netname, err))
 			fmt.Sprintf("failed to fetch ACLs for network [%s]: %v", netname, err))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))

+ 0 - 7
ee/ee_controllers/metrics.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"net/http"
 
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/mux"
-	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/models"
@@ -92,12 +91,6 @@ func getNetworkExtMetrics(w http.ResponseWriter, r *http.Request) {
 
 
 	clients, err := logic.GetNetworkExtClients(network) // grab all the network ext clients
 	clients, err := logic.GetNetworkExtClients(network) // grab all the network ext clients
 	if err != nil {
 	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())
 		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"))
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
 		return
 		return