added error handling, extracted index names as constants

elastic · Nov 9, 2022 · 89888ae · 89888ae
1 parent d622ed3
commit 89888ae
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/x-pack/plugins/fleet/server/services/agents/uploads.ts b/x-pack/plugins/fleet/server/services/agents/uploads.ts
@@ -23,20 +23,32 @@ import {
 
 import { SO_SEARCH_LIMIT } from '../../constants';
 
+const FILE_STORAGE_METADATA_AGENT_INDEX = '.fleet-agent-files';
+const FILE_STORAGE_DATA_AGENT_INDEX = '.fleet-agent-file-data';
+
 export async function getAgentUploads(
   esClient: ElasticsearchClient,
   agentId: string
 ): Promise<AgentDiagnostics[]> {
   const getFile = async (fileId: string) => {
     if (!fileId) return;
-    const file = await esClient.get({
-      index: '.fleet-agent-files',
-      id: fileId,
-    });
-    return {
-      id: file._id,
-      ...(file._source as any)?.file,
-    };
+    try {
+      const file = await esClient.get({
+        index: FILE_STORAGE_METADATA_AGENT_INDEX,
+        id: fileId,
+      });
+      return {
+        id: file._id,
+        ...(file._source as any)?.file,
+      };
+    } catch (err) {
+      if (err.statusCode === 404) {
+        appContextService.getLogger().debug(err);
+        return;
+      } else {
+        throw err;
+      }
+    }
   };
 
   const actions = await _getRequestDiagnosticsActions(esClient, agentId);
@@ -137,8 +149,8 @@ export async function getAgentUploadFile(
 ): Promise<{ body: Readable; headers: ResponseHeaders }> {
   try {
     const fileClient = createEsFileClient({
-      blobStorageIndex: '.fleet-agent-file-data',
-      metadataIndex: '.fleet-agent-files',
+      blobStorageIndex: FILE_STORAGE_DATA_AGENT_INDEX,
+      metadataIndex: FILE_STORAGE_METADATA_AGENT_INDEX,
       elasticsearchClient: esClient,
       logger: appContextService.getLogger(),
     });