refactor to reduce duplication

elastic · Sep 30, 2022 · 92932a7 · 92932a7
1 parent 4780e87
commit 92932a7
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 79 deletions.
diff --git a/x-pack/plugins/fleet/server/services/agents/actions.ts b/x-pack/plugins/fleet/server/services/agents/actions.ts
@@ -8,6 +8,7 @@
 import uuid from 'uuid';
 import type { ElasticsearchClient } from '@kbn/core/server';
 
+import { appContextService } from '../app_context';
 import type {
   Agent,
   AgentAction,
@@ -101,6 +102,27 @@ export async function bulkCreateAgentActions(
   return actions;
 }
 
+export async function createErrorActionResults(
+  esClient: ElasticsearchClient,
+  actionId: string,
+  errors: Record<Agent['id'], Error>
+) {
+  const errorCount = Object.keys(errors).length;
+  if (errorCount > 0) {
+    appContextService.getLogger().info(`Writing error action results of ${errorCount} agents`);
+
+    // writing out error result for those agents that have errors, so the action is not going to stay in progress forever
+    await bulkCreateAgentActionResults(
+      esClient,
+      Object.keys(errors).map((agentId) => ({
+        agentId,
+        actionId,
+        error: errors[agentId].message,
+      }))
+    );
+  }
+}
+
 export async function bulkCreateAgentActionResults(
   esClient: ElasticsearchClient,
   results: Array<{

diff --git a/x-pack/plugins/fleet/server/services/agents/reassign_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/reassign_action_runner.ts
@@ -16,7 +16,7 @@ import { appContextService } from '../app_context';
 import { ActionRunner } from './action_runner';
 
 import { bulkUpdateAgents } from './crud';
-import { bulkCreateAgentActionResults, createAgentAction } from './actions';
+import { createErrorActionResults, createAgentAction } from './actions';
 import { getHostedPolicies, isHostedAgent } from './hosted_agent';
 import { BulkActionTaskType } from './bulk_actions_resolver';
 
@@ -85,8 +85,7 @@ export async function reassignBatch(
   );
 
   const actionId = options.actionId ?? uuid();
-  const errorCount = Object.keys(errors).length;
-  const total = options.total ?? agentsToUpdate.length + errorCount;
+  const total = options.total ?? givenAgents.length;
 
   const now = new Date().toISOString();
   await createAgentAction(esClient, {
@@ -100,23 +99,7 @@ export async function reassignBatch(
     },
   });
 
-  if (errorCount > 0) {
-    appContextService
-      .getLogger()
-      .info(
-        `Skipping ${errorCount} agents, as failed validation (already assigned or assigned to hosted policy)`
-      );
-
-    // writing out error result for those agents that failed validation, so the action is not going to stay in progress forever
-    await bulkCreateAgentActionResults(
-      esClient,
-      Object.keys(errors).map((agentId) => ({
-        agentId,
-        actionId,
-        error: errors[agentId].message,
-      }))
-    );
-  }
+  await createErrorActionResults(esClient, actionId, errors);
 
   return { actionId };
 }
diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/unenroll_action_runner.ts
@@ -25,6 +25,7 @@ import { bulkUpdateAgents } from './crud';
 import {
   bulkCreateAgentActionResults,
   createAgentAction,
+  createErrorActionResults,
   getUnenrollAgentActions,
 } from './actions';
 import { getHostedPolicies, isHostedAgent } from './hosted_agent';
@@ -95,7 +96,6 @@ export async function unenrollBatch(
   );
 
   const actionId = options.actionId ?? uuid();
-  const errorCount = Object.keys(outgoingErrors).length;
   const total = options.total ?? givenAgents.length;
 
   const agentIds = agentsToUpdate.map((agent) => agent.id);
@@ -116,23 +116,7 @@ export async function unenrollBatch(
     });
   }
 
-  if (errorCount > 0) {
-    appContextService
-      .getLogger()
-      .info(
-        `Skipping ${errorCount} agents, as failed validation (cannot unenroll from a hosted policy or already unenrolled)`
-      );
-
-    // writing out error result for those agents that failed validation, so the action is not going to stay in progress forever
-    await bulkCreateAgentActionResults(
-      esClient,
-      Object.keys(outgoingErrors).map((agentId) => ({
-        agentId,
-        actionId,
-        error: outgoingErrors[agentId].message,
-      }))
-    );
-  }
+  await createErrorActionResults(esClient, actionId, outgoingErrors);
 
   return {
     actionId,

diff --git a/x-pack/plugins/fleet/server/services/agents/update_agent_tags_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/update_agent_tags_action_runner.ts
@@ -11,14 +11,16 @@ import { difference, uniq } from 'lodash';
 
 import type { Agent } from '../../types';
 
-import { appContextService } from '../app_context';
-
 import { ActionRunner } from './action_runner';
 
 import { bulkUpdateAgents } from './crud';
 import { BulkActionTaskType } from './bulk_actions_resolver';
 import { filterHostedPolicies } from './filter_hosted_agents';
-import { bulkCreateAgentActionResults, createAgentAction } from './actions';
+import {
+  createErrorActionResults,
+  bulkCreateAgentActionResults,
+  createAgentAction,
+} from './actions';
 
 export class UpdateAgentTagsActionRunner extends ActionRunner {
   protected async processAgents(agents: Agent[]): Promise<{ actionId: string }> {
@@ -96,7 +98,6 @@ export async function updateTagsBatch(
 
   const actionId = options.actionId ?? uuid();
   const total = options.total ?? givenAgents.length;
-  const errorCount = Object.keys(errors).length;
 
   // creating an action doc so that update tags  shows up in activity
   await createAgentAction(esClient, {
@@ -114,23 +115,7 @@ export async function updateTagsBatch(
     }))
   );
 
-  if (errorCount > 0) {
-    appContextService
-      .getLogger()
-      .info(
-        `Skipping ${errorCount} agents, as failed validation (cannot modified tags on hosted agents)`
-      );
-
-    // writing out error result for those agents that failed validation, so the action is not going to stay in progress forever
-    await bulkCreateAgentActionResults(
-      esClient,
-      Object.keys(errors).map((agentId) => ({
-        agentId,
-        actionId,
-        error: errors[agentId].message,
-      }))
-    );
-  }
+  await createErrorActionResults(esClient, actionId, errors);
 
   return { actionId };
 }
diff --git a/x-pack/plugins/fleet/server/services/agents/upgrade_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/upgrade_action_runner.ts
@@ -22,7 +22,7 @@ import { ActionRunner } from './action_runner';
 
 import type { GetAgentsOptions } from './crud';
 import { bulkUpdateAgents } from './crud';
-import { bulkCreateAgentActionResults, createAgentAction } from './actions';
+import { createErrorActionResults, createAgentAction } from './actions';
 import { getHostedPolicies, isHostedAgent } from './hosted_agent';
 import { BulkActionTaskType } from './bulk_actions_resolver';
 
@@ -121,8 +121,7 @@ export async function upgradeBatch(
   );
 
   const actionId = options.actionId ?? uuid();
-  const errorCount = Object.keys(errors).length;
-  const total = options.total ?? agentsToUpdate.length + errorCount;
+  const total = options.total ?? givenAgents.length;
 
   await createAgentAction(esClient, {
     id: actionId,
@@ -135,23 +134,7 @@ export async function upgradeBatch(
     ...rollingUpgradeOptions,
   });
 
-  if (errorCount > 0) {
-    appContextService
-      .getLogger()
-      .info(
-        `Skipping ${errorCount} agents, as failed validation (cannot upgrade hosted agent or agent not upgradeable)`
-      );
-
-    // writing out error result for those agents that failed validation, so the action is not going to stay in progress forever
-    await bulkCreateAgentActionResults(
-      esClient,
-      Object.keys(errors).map((agentId) => ({
-        agentId,
-        actionId,
-        error: errors[agentId].message,
-      }))
-    );
-  }
+  await createErrorActionResults(esClient, actionId, errors);
 
   return {
     actionId,