fixed order of cancel action

elastic · Sep 30, 2022 · 8661838 · 8661838
1 parent 81e86c0
commit 8661838
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/x-pack/plugins/fleet/server/services/agents/actions.ts b/x-pack/plugins/fleet/server/services/agents/actions.ts
@@ -254,16 +254,6 @@ export async function cancelAgentAction(esClient: ElasticsearchClient, actionId:
     if (!hit._source || !hit._source.agents || !hit._source.action_id) {
       continue;
     }
-    await createAgentAction(esClient, {
-      id: cancelActionId,
-      type: 'CANCEL',
-      agents: hit._source.agents,
-      data: {
-        target_id: hit._source.action_id,
-      },
-      created_at: now,
-      expiration: hit._source.expiration,
-    });
     if (hit._source.type === 'UPGRADE') {
       await bulkUpdateAgents(
         esClient,
@@ -277,6 +267,16 @@ export async function cancelAgentAction(esClient: ElasticsearchClient, actionId:
         {}
       );
     }
+    await createAgentAction(esClient, {
+      id: cancelActionId,
+      type: 'CANCEL',
+      agents: hit._source.agents,
+      data: {
+        target_id: hit._source.action_id,
+      },
+      created_at: now,
+      expiration: hit._source.expiration,
+    });
   }
 
   return {