Removing ListSMIPolicies() and ListMonitoredNamespaces() from MeshCat…

…aloger interface (#3109)

* Removing ListSMIPolicies() and ListMonitoredNamespaces() from MeshCataloger interface

Signed-off-by: Delyan Raychev <delyan.raychev@microsoft.com>

pkg/catalog/types.go

@@ -9,9 +9,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	access "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha3"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
-	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/openservicemesh/osm/pkg/certificate"
@@ -81,9 +78,6 @@ type MeshCataloger interface {
 	// ListServiceAccountsForService lists the service accounts associated with the given service
 	ListServiceAccountsForService(service.MeshService) ([]service.K8sServiceAccount, error)
 
-	// ListSMIPolicies lists SMI policies.
-	ListSMIPolicies() ([]*split.TrafficSplit, []service.K8sServiceAccount, []*spec.HTTPRouteGroup, []*access.TrafficTarget)
-
 	// ListEndpointsForService returns the list of individual instance endpoint backing a service
 	ListEndpointsForService(service.MeshService) ([]endpoint.Endpoint, error)
 
@@ -114,15 +108,12 @@ type MeshCataloger interface {
 	// GetIngressPoliciesForService returns the inbound traffic policies associated with an ingress service
 	GetIngressPoliciesForService(service.MeshService) ([]*trafficpolicy.InboundTrafficPolicy, error)
 
-	// ListMonitoredNamespaces lists namespaces monitored by the control plane
-	ListMonitoredNamespaces() []string
-
 	// GetTargetPortToProtocolMappingForService returns a mapping of the service's ports to their corresponding application protocol.
 	// The ports returned are the actual ports on which the application exposes the service derived from the service's endpoints,
 	// ie. 'spec.ports[].targetPort' instead of 'spec.ports[].port' for a Kubernetes service.
 	GetTargetPortToProtocolMappingForService(service.MeshService) (map[uint32]string, error)
 
-	// GetTargetPortToProtocolMappingForService returns a mapping of the service's ports to their corresponding application protocol,
+	// GetPortToProtocolMappingForService returns a mapping of the service's ports to their corresponding application protocol,
 	// where the ports returned are the ones used by downstream clients in their requests. This can be different from the ports
 	// actually exposed by the application binary, ie. 'spec.ports[].port' instead of 'spec.ports[].targetPort' for a Kubernetes service.
 	GetPortToProtocolMappingForService(service.MeshService) (map[uint32]string, error)

pkg/debugger/namespace.go

@@ -13,7 +13,11 @@ type namespaces struct {
 func (ds DebugConfig) getMonitoredNamespacesHandler() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var n namespaces
-		n.Namespaces = ds.meshCatalogDebugger.ListMonitoredNamespaces()
+		var err error
+		n.Namespaces, err = ds.kubeController.ListMonitoredNamespaces()
+		if err != nil {
+			log.Error().Err(err).Msgf("Error marshalling policy %+v", n)
+		}
 
 		jsonPolicies, err := json.Marshal(n)
 		if err != nil {

pkg/debugger/namespace_test.go

@@ -4,6 +4,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	k8s "github.com/openservicemesh/osm/pkg/kubernetes"
+
 	"github.com/golang/mock/gomock"
 	tassert "github.com/stretchr/testify/assert"
 
@@ -13,11 +15,11 @@ import (
 // Tests getMonitoredNamespaces through HTTP handler returns a the list of monitored namespaces
 func TestMonitoredNamespaceHandler(t *testing.T) {
 	assert := tassert.New(t)
-	mockCtrl := gomock.NewController(t)
-	mock := NewMockMeshCatalogDebugger(mockCtrl)
+
+	mockKubeController := k8s.NewMockController(gomock.NewController(t))
 
 	ds := DebugConfig{
-		meshCatalogDebugger: mock,
+		kubeController: mockKubeController,
 	}
 	monitoredNamespacesHandler := ds.getMonitoredNamespacesHandler()
 
@@ -26,7 +28,7 @@ func TestMonitoredNamespaceHandler(t *testing.T) {
 		tests.BookstoreV1Service.Namespace, // default
 	})
 
-	mock.EXPECT().ListMonitoredNamespaces().Return(uniqueNs)
+	mockKubeController.EXPECT().ListMonitoredNamespaces().Return(uniqueNs, nil)
 
 	responseRecorder := httptest.NewRecorder()
 	monitoredNamespacesHandler.ServeHTTP(responseRecorder, nil)