ref(tests): remove calls to NewMockMeshCatalog from tests (#5233)

Replaces calls to NewMockMeshCataloger with NewMockInterface to phase out
the mesh cataloger interface. Part of #5156

Signed-off-by: Sanya Kochhar <kochhars@microsoft.com>

Author: SanyaKochhar

mockspec/rules

@@ -5,9 +5,6 @@
 # pkg/k8s
 k8s; pkg/k8s/mock_controller_generated.go; github.com/openservicemesh/osm/pkg/k8s; Controller
 
-# pkg/catalog
-catalog; pkg/catalog/mock_catalog_generated.go; github.com/openservicemesh/osm/pkg/catalog; MeshCataloger
-
 # pkg/debugger
 debugger; pkg/debugger/mock_debugger_generated.go; github.com/openservicemesh/osm/pkg/debugger; XDSDebugger
 

pkg/catalog/mock_catalog_generated.go

@@ -15,17 +15,17 @@ import (
 func TestMonitoredNamespaceHandler(t *testing.T) {
 	assert := tassert.New(t)
 	mockCtrl := gomock.NewController(t)
-	mockCompute := compute.NewMockInterface(mockCtrl)
+	mockComputeInterface := compute.NewMockInterface(mockCtrl)
 
 	uniqueNs := tests.GetUnique([]string{
 		tests.BookbuyerService.Namespace,   // default
 		tests.BookstoreV1Service.Namespace, // default
 	})
 
-	mockCompute.EXPECT().ListNamespaces().Return(uniqueNs, nil)
+	mockComputeInterface.EXPECT().ListNamespaces().Return(uniqueNs, nil)
 
 	ds := DebugConfig{
-		computeClient: mockCompute,
+		computeClient: mockComputeInterface,
 	}
 	monitoredNamespacesHandler := ds.getMonitoredNamespacesHandler()
 

pkg/debugger/namespace_test.go

@@ -21,15 +21,15 @@ func TestGetHandlers(t *testing.T) {
 	cm := tresorFake.NewFake(time.Hour)
 	mockXdsDebugger := NewMockXDSDebugger(mockCtrl)
 	client := testclient.NewSimpleClientset()
-	mockCompute := compute.NewMockInterface(mockCtrl)
+	mockComputeInterface := compute.NewMockInterface(mockCtrl)
 	proxyRegistry := registry.NewProxyRegistry()
 
 	ds := NewDebugConfig(cm,
 		mockXdsDebugger,
 		proxyRegistry,
 		nil,
 		client,
-		mockCompute,
+		mockComputeInterface,
 		nil)
 
 	handlers := ds.GetHandlers()