From 72a44448271a7d2185d53d978ae6af3972f707c6 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Thu, 8 Oct 2020 16:40:57 -0400
Subject: [PATCH 1/2] [Ingest Manager] Fix agent policy bump revision to create
 only one POLICY_CHANGE action

---
 .../server/services/agent_policy.test.ts           | 14 ++++++++++++++
 .../ingest_manager/server/services/agent_policy.ts |  2 --
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
index d9dffa03b2290..7fec07b4e31ae 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
@@ -6,6 +6,7 @@
 
 import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { agentPolicyService } from './agent_policy';
+import { agentPolicyUpdateEventHandler } from './agent_policy_update';
 import { Output } from '../types';
 
 function getSavedObjectMock(agentPolicyAttributes: any) {
@@ -59,7 +60,20 @@ jest.mock('./output', () => {
   };
 });
 
+jest.mock('./agent_policy_update');
+
 describe('agent policy', () => {
+  describe('bumpRevision', () => {
+    it('should call agentPolicyUpdateEventHandler with updated event once', async () => {
+      const soClient = getSavedObjectMock({
+        revision: 1,
+        monitoring_enabled: ['metrics'],
+      });
+      await agentPolicyService.bumpRevision(soClient, 'agent-policy');
+
+      expect(agentPolicyUpdateEventHandler).toHaveBeenCalledTimes(1);
+    });
+  });
   describe('getFullAgentPolicy', () => {
     it('should return a policy without monitoring if monitoring is not enabled', async () => {
       const soClient = getSavedObjectMock({
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_policy.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
index 12ea8ab92f6c4..49d0c4eb37f1b 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
@@ -260,8 +260,6 @@ class AgentPolicyService {
   ): Promise<AgentPolicy> {
     const res = await this._update(soClient, id, {}, options?.user);
 
-    await this.triggerAgentPolicyUpdatedEvent(soClient, 'updated', id);
-
     return res;
   }
   public async bumpAllAgentPolicies(

From d7f80b5741aed611e7adb356f47b551f95a4fdee Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Thu, 8 Oct 2020 16:56:32 -0400
Subject: [PATCH 2/2] more tests

---
 .../server/services/agent_policy.test.ts      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
index 7fec07b4e31ae..c84ab68c5700e 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
@@ -62,7 +62,16 @@ jest.mock('./output', () => {
 
 jest.mock('./agent_policy_update');
 
+function getAgentPolicyUpdateMock() {
+  return (agentPolicyUpdateEventHandler as unknown) as jest.Mock<
+    typeof agentPolicyUpdateEventHandler
+  >;
+}
+
 describe('agent policy', () => {
+  beforeEach(() => {
+    getAgentPolicyUpdateMock().mockClear();
+  });
   describe('bumpRevision', () => {
     it('should call agentPolicyUpdateEventHandler with updated event once', async () => {
       const soClient = getSavedObjectMock({
@@ -74,6 +83,19 @@ describe('agent policy', () => {
       expect(agentPolicyUpdateEventHandler).toHaveBeenCalledTimes(1);
     });
   });
+
+  describe('bumpAllAgentPolicies', () => {
+    it('should call agentPolicyUpdateEventHandler with updated event once', async () => {
+      const soClient = getSavedObjectMock({
+        revision: 1,
+        monitoring_enabled: ['metrics'],
+      });
+      await agentPolicyService.bumpAllAgentPolicies(soClient);
+
+      expect(agentPolicyUpdateEventHandler).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe('getFullAgentPolicy', () => {
     it('should return a policy without monitoring if monitoring is not enabled', async () => {
       const soClient = getSavedObjectMock({