[MDS] Mute the non-mds endpoints for direct query data connections (#…

…8537) (#8597) * Mute the non-mds endpoints for direct query data connections when MDS enabled * Handle the case for local cluster too * Handle the case for local cluster 2 * Changeset file for PR #8537 created/updated --------- (cherry picked from commit 47ae28b) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
opensearch-project · Oct 16, 2024 · 8dbad3f · 8dbad3f
1 parent 14a4ba7
commit 8dbad3f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/changelogs/fragments/8537.yml b/changelogs/fragments/8537.yml
@@ -0,0 +1,2 @@
+fix:
+- [MDS] Mute the non-mds endpoints for direct query data connections ([#8537](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8537))
diff --git a/src/plugins/data_source_management/public/components/utils.ts b/src/plugins/data_source_management/public/components/utils.ts
@@ -62,7 +62,7 @@ export const getDirectQueryConnections = async (dataSourceId: string, http: Http
 };
 
 export const getLocalClusterConnections = async (http: HttpSetup) => {
-  const res = await http.get(`${DATACONNECTIONS_BASE}`);
+  const res = await http.get(`${DATACONNECTIONS_BASE}/dataSourceMDSId=`);
   const localClusterConnections: DataSourceTableItem[] = res.map(
     (dataConnection: DirectQueryDatasourceDetails) => ({
       id: `${dataConnection.name}`,

diff --git a/src/plugins/data_source_management/server/routes/data_connections_router.ts b/src/plugins/data_source_management/server/routes/data_connections_router.ts
@@ -16,7 +16,7 @@ import {
   EDIT,
 } from '../../framework/utils/shared';
 
-export function registerDataConnectionsRoute(router: IRouter, dataSourceEnabled: boolean) {
+export function registerNonMdsDataConnectionsRoute(router: IRouter) {
   router.get(
     {
       path: `${DATACONNECTIONS_BASE}/{name}`,
@@ -204,7 +204,9 @@ export function registerDataConnectionsRoute(router: IRouter, dataSourceEnabled:
       }
     }
   );
+}
 
+export function registerDataConnectionsRoute(router: IRouter, dataSourceEnabled: boolean) {
   router.get(
     {
       path: `${DATACONNECTIONS_BASE}/dataSourceMDSId={dataSourceMDSId?}`,

diff --git a/src/plugins/data_source_management/server/routes/index.ts b/src/plugins/data_source_management/server/routes/index.ts
@@ -5,7 +5,10 @@
 
 import { IRouter, ILegacyClusterClient } from '../../../../core/server';
 import { registerDslRoute } from './dsl';
-import { registerDataConnectionsRoute } from './data_connections_router';
+import {
+  registerDataConnectionsRoute,
+  registerNonMdsDataConnectionsRoute,
+} from './data_connections_router';
 import { registerDatasourcesRoute } from './datasources_router';
 import { registerPplRoute } from './ppl';
 import { DSLFacet } from '../services/facets/dsl_facet';
@@ -43,6 +46,9 @@ export function setupRoutes({
   // const queryService = new QueryService(client);
   // registerSqlRoute(router, queryService);
 
+  if (!dataSourceEnabled) {
+    registerNonMdsDataConnectionsRoute(router);
+  }
   registerDataConnectionsRoute(router, dataSourceEnabled);
   registerDatasourcesRoute(router, dataSourceEnabled);
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- [MDS] Mute the non-mds endpoints for direct query data connections ([#8537](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8537))