Including missing agent results is optional & off by default

elastic · Mar 16, 2021 · f02ef35 · f02ef35
1 parent cdd501f
commit f02ef35
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/x-pack/plugins/fleet/server/routes/agent/handlers.ts b/x-pack/plugins/fleet/server/routes/agent/handlers.ts
@@ -10,7 +10,6 @@ import type { TypeOf } from '@kbn/config-schema';
 import { AbortController } from 'abort-controller';
 
 import type {
-  Agent,
   GetAgentsResponse,
   GetOneAgentResponse,
   GetOneAgentEventsResponse,
@@ -268,12 +267,10 @@ export const getAgentsHandler: RequestHandler<
       : 0;
 
     const body: GetAgentsResponse = {
-      list: agents
-        .filter((agent): agent is Agent => !!agent)
-        .map((agent) => ({
-          ...agent,
-          status: AgentService.getAgentStatus(agent),
-        })),
+      list: agents.map((agent) => ({
+        ...agent,
+        status: AgentService.getAgentStatus(agent),
+      })),
       total,
       totalInactive,
       page,

diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts
@@ -92,7 +92,7 @@ export async function getAgentsByKuery(
     showInactive: boolean;
   }
 ): Promise<{
-  agents: Array<Agent | undefined>;
+  agents: Agent[];
   total: number;
   page: number;
   perPage: number;
@@ -137,7 +137,7 @@ export async function getAgentsByKuery(
   }
 
   return {
-    agents: agents || [],
+    agents,
     total: agents.length,
     page,
     perPage,
@@ -156,7 +156,7 @@ export async function getAllAgentsByKuery(
   const res = await getAgentsByKuery(esClient, { ...options, page: 1, perPage: SO_SEARCH_LIMIT });
 
   return {
-    agents: res.agents.filter((agent): agent is Agent => !!agent),
+    agents: res.agents,
     total: res.total,
   };
 }
@@ -220,17 +220,16 @@ async function getAgentDocuments(
 
 export async function getAgentsById(
   esClient: ElasticsearchClient,
-  agentIds: string[]
-): Promise<
-  Agent[]
-  // | GetResponse<FleetServerAgent>
-> {
-  const agentDocs = await getAgentDocuments(esClient, agentIds);
-  const results = agentDocs
-    .map((doc) => searchHitToAgent(doc))
-    .filter((agent): agent is Agent => !!agent);
-
-  return results;
+  agentIds: string[],
+  options: { includeMissing?: boolean } = { includeMissing: false }
+): Promise<Agent[]> {
+  const allDocs = await getAgentDocuments(esClient, agentIds);
+  const agentDocs = options.includeMissing
+    ? allDocs
+    : allDocs.filter((res) => res._id && res._source);
+  const agents = agentDocs.map((doc) => searchHitToAgent(doc));
+
+  return agents;
 }
 
 export async function getAgentByAccessAPIKeyId(

diff --git a/x-pack/plugins/fleet/server/services/agents/helpers.ts b/x-pack/plugins/fleet/server/services/agents/helpers.ts
@@ -13,14 +13,7 @@ type FleetServerAgentESResponse =
   | GetResponse<FleetServerAgent>
   | SearchResponse<FleetServerAgent>['hits']['hits'][0];
 
-export function searchHitToAgent(hit: FleetServerAgentESResponse): Agent | undefined {
-  if (!(hit._id && hit._source)) {
-    return;
-  }
-  if ('found' in hit && hit.found === false) {
-    return;
-  }
-
+export function searchHitToAgent(hit: FleetServerAgentESResponse): Agent {
   return {
     id: hit._id,
     ...hit._source,