[Backport 2.x] added version decoupling for neo MDS support (#353)

opensearch_dashboards.json

@@ -13,5 +13,7 @@
     "observabilityDashboards",
     "dataSource",
     "dataSourceManagement"
-  ]
+  ],
+  "supportedOSDataSourceVersions": ">=1.0.0",
+  "requiredOSDataSourcePlugins": ["opensearch-sql"]
 }

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,
@@ -53,8 +57,8 @@
 import { CreateButton } from '../SQLPage/CreateButton';
 import { DataSelect } from '../SQLPage/DataSelect';
 import { SQLPage } from '../SQLPage/SQLPage';
 import { CatalogTree } from '../SQLPage/sql_catalog_tree/catalog_tree';
 
 interface ResponseData {
   ok: boolean;
   resp: any;
@@ -64,11 +68,11 @@
 export interface ResponseDetail<T> {
   fulfilled: boolean;
   errorMessage?: string;
   data?: T;
 }
 
 export interface TranslateResult {
   [key: string]: any;
 }
 
 export interface QueryMessage {
@@ -88,13 +92,13 @@
   disabled: boolean;
 }
 
 export interface ItemIdToExpandedRowMap {
   [key: string]: {
     nodes: Tree;
     expandedRow?: {};
     selectedNodes?: { [key: string]: any };
   };
 }
 
 export interface DataRow {
   rowId: number;
@@ -142,7 +146,7 @@
   cluster: string;
   dataSourceOptions: DataSourceOption[];
   mdsClusterName: string;
   flintDataConnections: boolean;
 }
 
 const SUCCESS_MESSAGE = 'Success';
@@ -170,7 +174,7 @@
           ? JSON.parse(queryResultResponseDetail.data)
           : queryResultResponseDetail.data;
         const responseObj = queryResultResponseDetail.data ? resultData : '';
         const fields: string[] = [];
         const dataRows: DataRow[] = [];
 
         const schema: object[] = _.get(responseObj, 'schema');
@@ -195,7 +199,7 @@
               if (_.eq(_.get(field, 'name'), 'TABLE_NAME')) {
                 index = id;
                 break;
               }
             }
 
             for (const [id, field] of datarows.entries()) {
@@ -208,7 +212,7 @@
               dataRows[id] = dataRow;
             }
             break;
 
           case 'describe':
           case 'default':
             for (const [id, field] of schema.entries()) {
@@ -284,11 +288,11 @@
       refreshTree: false,
       isAccelerationFlyoutOpened: false,
       isCallOutVisible: false,
       cluster: 'Indexes',
       dataSourceOptions: [],
       selectedMDSDataConnectionId: '',
       mdsClusterName: '',
-      flintDataConnections: false
+      flintDataConnections: false,
     };
     this.httpClient = this.props.httpClient;
     this.updateSQLQueries = _.debounce(this.updateSQLQueries, 250).bind(this);
@@ -896,15 +900,26 @@
     const dataConnectionId = e[0] ? e[0].id : undefined;
     const clusterName = e[0] ? e[0].label : '';
     await this.setState({
       selectedMDSDataConnectionId: dataConnectionId,
       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
   >();
@@ -1003,7 +1018,7 @@
       );
     }
 
     return (
       <>
         {this.props.dataSourceEnabled && (
           <this.DataSourceMenu
@@ -1011,25 +1026,28 @@
             componentType={'DataSourceSelectable'}
             componentConfig={{
               savedObjects: this.props.savedObjects.client,
               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}>