added version decoupling for neo MDS support

opensearch_dashboards.json

@@ -4,6 +4,8 @@
   "opensearchDashboardsVersion": "3.0.0",
   "server": true,
   "ui": true,
+  "supportedOSDataSourceVersions": ">=0.7.0",
+  "requiredOSDataSourcePlugins": ["opensearch-sql"],
   "requiredPlugins": ["navigation", "opensearchDashboardsReact", "opensearchDashboardsUtils"],
   "optionalPlugins": ["observabilityDashboards", "dataSource", "dataSourceManagement"]
 }

public/components/Main/main.tsx

@@ -22,13 +22,16 @@
 import { createBrowserHistory } from 'history';
 import _ from 'lodash';
 import React from 'react';
+import semver from 'semver';
 import {
   ChromeBreadcrumb,
   CoreStart,
   MountPoint,
   NotificationsStart,
+  SavedObject,
   SavedObjectsStart,
 } from '../../../../../src/core/public';
+import { DataSourceAttributes } from '../../../../../src/plugins/data_source/common/data_sources';
 import {
   DataSourceManagementPluginSetup,
   DataSourceSelectableConfig,
@@ -38,6 +41,7 @@
 import { AsyncApiResponse, AsyncQueryStatus } from '../../../common/types';
 import { executeAsyncQuery } from '../../../common/utils/async_query_helpers';
 import { fetchDataSources } from '../../../common/utils/fetch_datasources';
+import * as pluginManifest from '../../../opensearch_dashboards.json';
 import { MESSAGE_TAB_LABEL } from '../../utils/constants';
 import {
   Tree,
@@ -57,8 +61,8 @@
 
 interface ResponseData {
   ok: boolean;
   resp: any;
   body: any;
 }
 
 export interface ResponseDetail<T> {
@@ -68,11 +72,11 @@
 }
 
 export interface TranslateResult {
   [key: string]: any;
 }
 
 export interface QueryMessage {
   text: any;
   className: string;
 }
 
@@ -92,13 +96,13 @@
   [key: string]: {
     nodes: Tree;
     expandedRow?: {};
     selectedNodes?: { [key: string]: any };
   };
 }
 
 export interface DataRow {
   rowId: number;
   data: { [key: string]: any };
 }
 
 interface MainProps {
@@ -146,7 +150,7 @@
 }
 
 const SUCCESS_MESSAGE = 'Success';
 const errorQueryResponse = (queryResultResponseDetail: any) => {
   const errorMessage =
     queryResultResponseDetail.errorMessage +
     ', this query is not runnable. \n \n' +
@@ -174,7 +178,7 @@
         const dataRows: DataRow[] = [];
 
         const schema: object[] = _.get(responseObj, 'schema');
         const datarows: any[][] = _.get(responseObj, 'datarows');
         let queryType = 'default';
 
         for (const column of schema.values()) {
@@ -199,7 +203,7 @@
             }
 
             for (const [id, field] of datarows.entries()) {
               const row: { [key: string]: any } = {};
               row.TABLE_NAME = field[index];
               const dataRow: DataRow = {
                 rowId: id,
@@ -212,7 +216,7 @@
           case 'describe':
           case 'default':
             for (const [id, field] of schema.entries()) {
               let alias: any = null;
               try {
                 alias = _.get(field, 'alias');
               } catch (e) {
@@ -288,7 +292,7 @@
       dataSourceOptions: [],
       selectedMDSDataConnectionId: '',
       mdsClusterName: '',
-      flintDataConnections: false
+      flintDataConnections: false,
     };
     this.httpClient = this.props.httpClient;
     this.updateSQLQueries = _.debounce(this.updateSQLQueries, 250).bind(this);
@@ -900,11 +904,22 @@
       mdsClusterName: clusterName,
       cluster: 'Indexes',
       selectedDatasource: [{ label: 'OpenSearch', key: '' }],
-      isAccelerationFlyoutOpened: false
+      isAccelerationFlyoutOpened: false,
     });
     this.fetchFlintDataSources();
   };
 
+  dataSourceFilterFn = (dataSource: SavedObject<DataSourceAttributes>) => {
+    const dataSourceVersion = dataSource?.attributes?.dataSourceVersion || '';
+    const installedPlugins = dataSource?.attributes?.installedPlugins || [];
+    return (
+      semver.satisfies(dataSourceVersion, pluginManifest.supportedOSDataSourceVersions) &&
+      pluginManifest.requiredOSDataSourcePlugins.every((plugin) =>
+        installedPlugins.includes(plugin)
+      )
+    );
+  };
+
   DataSourceMenu = this.props.dataSourceManagement?.ui?.getDataSourceMenu<
     DataSourceSelectableConfig
   >();
@@ -1014,22 +1029,25 @@
               notifications: this.props.notifications,
               fullWidth: true,
               onSelectedDataSources: this.onSelectedDataSource,
+              dataSourceFilter: this.dataSourceFilterFn,
             }}
           />
         )}
         <EuiPage paddingSize="none">
-          <EuiPanel grow={true} style={{marginRight: '10px'}}>
+          <EuiPanel grow={true} style={{ marginRight: '10px' }}>
             <EuiPageSideBar
               style={{
                 maxWidth: '400px',
                 width: '400px',
                 height: 'calc(100vh - 254px)',
               }}
             >
-              <EuiTitle size='xs'>
-                  <p><b>{this.state.mdsClusterName}</b></p>
-                </EuiTitle>
-                <EuiSpacer size='s'/>
+              <EuiTitle size="xs">
+                <p>
+                  <b>{this.state.mdsClusterName}</b>
+                </p>
+              </EuiTitle>
+              <EuiSpacer size="s" />
               {this.state.flintDataConnections && (
                 <EuiFlexGroup direction="row" gutterSize="s">
                   <EuiFlexItem grow={false}>