[Discover] Filter out OpenSearch Serverless Collections (#8758)

* Filtering out serverless collections Signed-off-by: Sean Li <[email protected]> * rerunning linter Signed-off-by: Sean Li <[email protected]> * adding test for s3 type Signed-off-by: Sean Li <[email protected]> * updating filter Signed-off-by: Sean Li <[email protected]> * string check Signed-off-by: Sean Li <[email protected]> * update test Signed-off-by: Sean Li <[email protected]> --------- Signed-off-by: Sean Li <[email protected]> (cherry picked from commit 04dff9b) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Oct 31, 2024 · 581f736 · 581f736
1 parent 6b49593
commit 581f736
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 17 deletions.
diff --git a/src/plugins/data/public/query/query_string/dataset_service/lib/index_type.ts b/src/plugins/data/public/query/query_string/dataset_service/lib/index_type.ts
@@ -120,11 +120,17 @@ const fetchDataSources = async (client: SavedObjectsClientContract) => {
     perPage: 10000,
   });
   const dataSources: DataStructure[] = [DEFAULT_DATA.STRUCTURES.LOCAL_DATASOURCE].concat(
-    response.savedObjects.map((savedObject) => ({
-      id: savedObject.id,
-      title: savedObject.attributes.title,
-      type: 'DATA_SOURCE',
-    }))
+    response.savedObjects
+      .filter(
+        (savedObject) =>
+          typeof savedObject.attributes?.dataSourceEngineType === 'string' &&
+          !savedObject.attributes?.dataSourceEngineType?.includes('OpenSearch Serverless')
+      )
+      .map((savedObject) => ({
+        id: savedObject.id,
+        title: savedObject.attributes.title,
+        type: 'DATA_SOURCE',
+      }))
   );
 
   return injectMetaToDataStructures(dataSources);

diff --git a/src/plugins/query_enhancements/public/datasets/s3_type.test.ts b/src/plugins/query_enhancements/public/datasets/s3_type.test.ts
@@ -141,7 +141,9 @@ describe('s3TypeConfig', () => {
 
     it('should fetch data sources for unknown type', async () => {
       mockSavedObjectsClient.find = jest.fn().mockResolvedValue({
-        savedObjects: [{ id: 'ds1', attributes: { title: 'DataSource 1' } }],
+        savedObjects: [
+          { id: 'ds1', attributes: { title: 'DataSource 1', dataSourceEngineType: 'OpenSearch' } },
+        ],
       });
 
       const result = await s3TypeConfig.fetch(mockServices as IDataPluginServices, [
@@ -152,6 +154,29 @@ describe('s3TypeConfig', () => {
       expect(result.children?.[1].title).toBe('DataSource 1');
       expect(result.hasNext).toBe(true);
     });
+
+    it('should filter out OpenSearch Serverless data sources', async () => {
+      mockSavedObjectsClient.find = jest.fn().mockResolvedValue({
+        savedObjects: [
+          { id: 'ds1', attributes: { title: 'DataSource 1', dataSourceEngineType: 'OpenSearch' } },
+          {
+            id: 'ds2',
+            attributes: { title: 'DataSource 2', dataSourceEngineType: 'OpenSearch Serverless' },
+          },
+          { id: 'ds3', attributes: { title: 'DataSource 3', dataSourceEngineType: 'OpenSearch' } },
+        ],
+      });
+
+      const result = await s3TypeConfig.fetch(mockServices as IDataPluginServices, [
+        { id: 'unknown', title: 'Unknown', type: 'UNKNOWN' },
+      ]);
+
+      expect(result.children).toHaveLength(3); // Including DEFAULT_DATA.STRUCTURES.LOCAL_DATASOURCE
+      expect(result.children?.[1].title).toBe('DataSource 1');
+      expect(result.children?.[2].title).toBe('DataSource 3');
+      expect(result.children?.some((child) => child.title === 'DataSource 2')).toBe(false);
+      expect(result.hasNext).toBe(true);
+    });
   });
 
   test('fetchFields returns table fields', async () => {

diff --git a/src/plugins/query_enhancements/public/datasets/s3_type.ts b/src/plugins/query_enhancements/public/datasets/s3_type.ts
@@ -198,17 +198,23 @@ const fetchDataSources = async (client: SavedObjectsClientContract): Promise<Dat
   });
   const dataSources: DataStructure[] = [DEFAULT_DATA.STRUCTURES.LOCAL_DATASOURCE];
   return dataSources.concat(
-    resp.savedObjects.map((savedObject) => ({
-      id: savedObject.id,
-      title: savedObject.attributes.title,
-      type: 'DATA_SOURCE',
-      meta: {
-        query: {
-          id: savedObject.id,
-        },
-        type: DATA_STRUCTURE_META_TYPES.CUSTOM,
-      } as DataStructureCustomMeta,
-    }))
+    resp.savedObjects
+      .filter(
+        (savedObject) =>
+          typeof savedObject.attributes?.dataSourceEngineType === 'string' &&
+          !savedObject.attributes?.dataSourceEngineType?.includes('OpenSearch Serverless')
+      )
+      .map((savedObject) => ({
+        id: savedObject.id,
+        title: savedObject.attributes.title,
+        type: 'DATA_SOURCE',
+        meta: {
+          query: {
+            id: savedObject.id,
+          },
+          type: DATA_STRUCTURE_META_TYPES.CUSTOM,
+        } as DataStructureCustomMeta,
+      }))
   );
 };