Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Ingest Manager] Fix agent policy bump revision to create only one POLICY_CHANGE action #80081

Merged
merged 5 commits into from
Oct 13, 2020
Merged

[Ingest Manager] Fix agent policy bump revision to create only one POLICY_CHANGE action #80081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72a4444
[Ingest Manager] Fix agent policy bump revision to create only one PO…
nchaulet Oct 8, 2020
6099b95
Merge branch 'master' into fix-agents-policy-bump-revision
kibanamachine Oct 8, 2020
d7f80b5
more tests
nchaulet Oct 8, 2020
d37f551
Merge branch 'fix-agents-policy-bump-revision' of github.com:nchaulet…
nchaulet Oct 8, 2020
9293ebb
Merge branch 'master' into fix-agents-policy-bump-revision
kibanamachine Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -59,7 +60,42 @@ 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({
revision: 1,
monitoring_enabled: ['metrics'],
});
await agentPolicyService.bumpRevision(soClient, '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({
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/ingest_manager/server/services/agent_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,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(
Expand Down