[File service] Fix integration tests

src/plugins/files/server/file_client/integration_tests/es_file_client.test.ts

@@ -13,15 +13,34 @@ import { createEsFileClient } from '../create_es_file_client';
 import { FileClient } from '../types';
 import { FileMetadata } from '../../../common';
 
-// FLAKY: https://github.com/elastic/kibana/issues/144505
-// FLAKY: https://github.com/elastic/kibana/issues/144506
-describe.skip('ES-index-backed file client', () => {
+describe('ES-index-backed file client', () => {
   let esClient: TestEnvironmentUtils['esClient'];
   let fileClient: FileClient;
   let testHarness: TestEnvironmentUtils;
   const blobStorageIndex = '.kibana-test-blob';
   const metadataIndex = '.kibana-test-metadata';
 
+  const deleteFile = async ({
+    id,
+    hasContent,
+    refreshIndex = true,
+  }: {
+    id: string;
+    hasContent?: boolean;
+    refreshIndex?: boolean;
+  }) => {
+    if (refreshIndex) {
+      try {
+        // Make sure to refresh the index before deleting the file to avoid an conflict error thrown by
+        // ES when deleting by query documents that don't exist yet.
+        await esClient.indices.refresh({ index: blobStorageIndex });
+      } catch (e) {
+        // Silently fail if the index does not exist
+      }
+    }
+    await fileClient.delete({ id, hasContent });
+  };
+
   beforeAll(async () => {
     testHarness = await setupIntegrationEnvironment();
     ({ esClient } = testHarness);
@@ -57,7 +76,7 @@ describe.skip('ES-index-backed file client', () => {
         name: 'cool name',
       })
     );
-    await fileClient.delete({ id: file.id, hasContent: false });
+    await deleteFile({ id: file.id, hasContent: false });
   });
 
   test('uploads and downloads file content', async () => {
@@ -75,7 +94,7 @@ describe.skip('ES-index-backed file client', () => {
     }
     expect(Buffer.concat(chunks).toString('utf-8')).toBe('test');
 
-    await fileClient.delete({ id: file.id, hasContent: true });
+    await deleteFile({ id: file.id, hasContent: true });
   });
 
   test('searches across files', async () => {
@@ -150,10 +169,12 @@ describe.skip('ES-index-backed file client', () => {
       );
     }
 
+    await esClient.indices.refresh({ index: blobStorageIndex });
+
     await Promise.all([
-      fileClient.delete({ id: id1 }),
-      fileClient.delete({ id: id2 }),
-      fileClient.delete({ id: file3.id }),
+      deleteFile({ id: id1, refreshIndex: false }),
+      deleteFile({ id: id2, refreshIndex: false }),
+      deleteFile({ id: file3.id, refreshIndex: false }),
     ]);
   });
 
@@ -197,9 +218,11 @@ describe.skip('ES-index-backed file client', () => {
       })
     );
 
+    await esClient.indices.refresh({ index: blobStorageIndex });
+
     await Promise.all([
-      fileClient.delete({ id: id1, hasContent: false }),
-      fileClient.delete({ id: id2, hasContent: false }),
+      deleteFile({ id: id1, hasContent: false, refreshIndex: false }),
+      deleteFile({ id: id2, hasContent: false, refreshIndex: false }),
     ]);
   });
 });