Handle bulk update errors

elastic · Feb 3, 2021 · c8e1f15 · c8e1f15
1 parent 9749bb4
commit c8e1f15
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 31 deletions.
diff --git a/x-pack/plugins/fleet/server/routes/agent/handlers.ts b/x-pack/plugins/fleet/server/routes/agent/handlers.ts
@@ -316,34 +316,24 @@ export const postBulkAgentsReassignHandler: RequestHandler<
   const soClient = context.core.savedObjects.client;
   const esClient = context.core.elasticsearch.client.asInternalUser;
   try {
-    // Reassign by array of IDs
-    if (Array.isArray(request.body.agents)) {
-      await AgentService.reassignAgents(
-        soClient,
-        esClient,
-        { agentIds: request.body.agents },
-        request.body.policy_id
-      );
-    } else {
-      await AgentService.reassignAgents(
-        soClient,
-        esClient,
-        { kuery: request.body.agents },
-        request.body.policy_id
-      );
-    }
+    const results = await AgentService.reassignAgents(
+      soClient,
+      esClient,
+      Array.isArray(request.body.agents)
+        ? { agentIds: request.body.agents }
+        : { kuery: request.body.agents },
+      request.body.policy_id
+    );
 
-    const body: PostBulkAgentReassignResponse = {};
-    // TODO fix
-    // const body: PostBulkAgentReassignResponse = result.saved_objects.reduce((acc, so) => {
-    //   return {
-    //     ...acc,
-    //     [so.id]: {
-    //       success: !so.error,
-    //       error: so.error || undefined,
-    //     },
-    //   };
-    // }, {});
+    const body: PostBulkAgentReassignResponse = results.items.reduce((acc, so) => {
+      return {
+        ...acc,
+        [so.id]: {
+          success: !so.error,
+          error: so.error || undefined,
+        },
+      };
+    }, {});
     return response.ok({ body });
   } catch (error) {
     return defaultIngestErrorHandler({ error, response });

diff --git a/x-pack/plugins/fleet/server/services/agents/crud_fleet_server.ts b/x-pack/plugins/fleet/server/services/agents/crud_fleet_server.ts
@@ -208,15 +208,23 @@ export async function bulkUpdateAgents(
       },
     },
     {
-      doc: agentSOAttributesToFleetServerAgentDoc(data),
+      doc: { ...agentSOAttributesToFleetServerAgentDoc(data) },
     },
   ]);
 
-  await esClient.bulk({
+  const res = await esClient.bulk({
     body,
     index: AGENTS_INDEX,
     refresh: 'wait_for',
   });
+
+  return {
+    items: res.body.items.map((item: { update: { _id: string; error?: Error } }) => ({
+      id: item.update._id,
+      success: !item.update.error,
+      error: item.update.error,
+    })),
+  };
 }
 
 export async function deleteAgent(esClient: ElasticsearchClient, agentId: string) {

diff --git a/x-pack/plugins/fleet/server/services/agents/crud_so.ts b/x-pack/plugins/fleet/server/services/agents/crud_so.ts
@@ -199,7 +199,15 @@ export async function bulkUpdateAgents(
     })
   );
 
-  await soClient.bulkUpdate<AgentSOAttributes>(updates);
+  const res = await soClient.bulkUpdate<AgentSOAttributes>(updates);
+
+  return {
+    items: res.saved_objects.map((so) => ({
+      id: so.id,
+      success: !so.error,
+      error: so.error,
+    })),
+  };
 }
 
 export async function deleteAgent(soClient: SavedObjectsClientContract, agentId: string) {

diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.ts b/x-pack/plugins/fleet/server/services/agents/reassign.ts
@@ -44,7 +44,7 @@ export async function reassignAgents(
         kuery: string;
       },
   newAgentPolicyId: string
-) {
+): Promise<{ items: Array<{ id: string; sucess: boolean; error?: Error }> }> {
   const agentPolicy = await agentPolicyService.get(soClient, newAgentPolicyId);
   if (!agentPolicy) {
     throw Boom.notFound(`Agent policy not found: ${newAgentPolicyId}`);