Skip to content

Commit 0bc2db8

Browse files
nchauletnchaulet
authored
[Fleet] Fix space awareness agent action tests (#241156)
1 parent ce6ff95 commit 0bc2db8

File tree

8 files changed

+60
-30
lines changed

8 files changed

+60
-30
lines changed

‎x-pack/platform/plugins/shared/fleet/common/errors.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export class FleetError<TMeta = unknown> extends Error {
2020
}
2121
}
2222

23+
export class FleetVersionConflictError extends FleetError {}
24+
2325
export class PolicyNamespaceValidationError extends FleetError {}
2426
export class PackagePolicyValidationError extends FleetError {}
2527

‎x-pack/platform/plugins/shared/fleet/server/errors/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export {
2121
export { isESClientError } from './utils';
2222
export {
2323
FleetError as FleetError,
24+
FleetVersionConflictError,
2425
OutputInvalidError as OutputInvalidError,
2526
AgentlessAgentCreateOverProvisionedError as AgentlessAgentCreateOverProvisionnedError,
2627
} from '../../common/errors';

‎x-pack/platform/plugins/shared/fleet/server/services/agents/update_agent_tags.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ describe('update_agent_tags', () => {
180180
expect(errorResults.operations[1].error).toEqual('error reason');
181181
});
182182

183-
it('should throw error on version conflicts', async () => {
183+
it('should retry error on version conflicts', async () => {
184184
esClient.updateByQuery.mockReset();
185185
esClient.updateByQuery.mockResolvedValue({
186186
failures: [],

‎x-pack/platform/plugins/shared/fleet/server/services/agents/update_agent_tags.ts‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
*/
77

88
import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
9+
import pRetry from 'p-retry';
910

1011
import type { Agent } from '../../types';
11-
import { AgentReassignmentError } from '../../errors';
12+
import { AgentReassignmentError, FleetVersionConflictError } from '../../errors';
1213

1314
import { SO_SEARCH_LIMIT } from '../../constants';
1415

@@ -84,9 +85,22 @@ export async function updateAgentTags(
8485
).runActionAsyncTask();
8586
}
8687

87-
return await updateTagsBatch(soClient, esClient, givenAgents, outgoingErrors, {
88-
tagsToAdd,
89-
tagsToRemove,
90-
spaceId: currentSpaceId,
91-
});
88+
return pRetry(
89+
() =>
90+
updateTagsBatch(soClient, esClient, givenAgents, outgoingErrors, {
91+
tagsToAdd,
92+
tagsToRemove,
93+
spaceId: currentSpaceId,
94+
}),
95+
{
96+
onFailedAttempt: (error) => {
97+
if (!(error instanceof FleetVersionConflictError)) {
98+
throw error;
99+
}
100+
},
101+
retries: 3,
102+
minTimeout: 100,
103+
maxTimeout: 200,
104+
}
105+
);
92106
}

‎x-pack/platform/plugins/shared/fleet/server/services/agents/update_agent_tags_action_runner.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { AGENTS_INDEX } from '../../constants';
1515

1616
import { appContextService } from '../app_context';
1717

18-
import { FleetError } from '../../errors';
18+
import { FleetError, FleetVersionConflictError } from '../../errors';
1919

2020
import { ActionRunner } from './action_runner';
2121

@@ -218,7 +218,7 @@ export async function updateTagsBatch(
218218
.getLogger()
219219
.debug(`action conflict result wrote on ${versionConflictCount} agents`);
220220
}
221-
throw new FleetError(`Version conflict of ${versionConflictCount} agents`);
221+
throw new FleetVersionConflictError(`Version conflict of ${versionConflictCount} agents`);
222222
}
223223

224224
return { actionId, updated: res.updated, took: res.took };

‎x-pack/platform/test/fleet_api_integration/apis/space_awareness/actions.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ export default function (providerContext: FtrProviderContext) {
2727
const spaces = getService('spaces');
2828
let TEST_SPACE_1: string;
2929

30-
// Failing: See https://github.com/elastic/kibana/issues/236306
31-
describe.skip('actions', function () {
30+
describe('actions', function () {
3231
skipIfNoDockerRegistry(providerContext);
3332
const apiClient = new SpaceTestApiClient(supertest);
3433

@@ -97,7 +96,7 @@ export default function (providerContext: FtrProviderContext) {
9796
});
9897

9998
const actionStatusInDefaultSpace = await apiClient.getActionStatus();
100-
expect(actionStatusInDefaultSpace.items.length).to.eql(1);
99+
expect(actionStatusInDefaultSpace.items.length).to.greaterThan(0);
101100
expect(actionStatusInDefaultSpace.items[0]).to.have.keys(
102101
'type',
103102
'status',
@@ -130,7 +129,7 @@ export default function (providerContext: FtrProviderContext) {
130129
expect(actionStatusInDefaultSpace.items.length).to.eql(0);
131130

132131
const actionStatusInCustomSpace = await apiClient.getActionStatus(TEST_SPACE_1);
133-
expect(actionStatusInCustomSpace.items.length).to.eql(1);
132+
expect(actionStatusInCustomSpace.items.length).to.greaterThan(0);
134133
expect(actionStatusInCustomSpace.items[0]).to.have.keys(
135134
'type',
136135
'status',
@@ -175,7 +174,7 @@ export default function (providerContext: FtrProviderContext) {
175174
});
176175

177176
const actionStatusInDefaultSpace = await apiClient.getActionStatus();
178-
expect(actionStatusInDefaultSpace.items.length).to.eql(1);
177+
expect(actionStatusInDefaultSpace.items.length).to.greaterThan(0);
179178
expect(actionStatusInDefaultSpace.items[0]).to.have.keys(
180179
'type',
181180
'status',
@@ -276,7 +275,7 @@ export default function (providerContext: FtrProviderContext) {
276275
);
277276

278277
const actionStatusInCustomSpace = await apiClient.getActionStatus(TEST_SPACE_1);
279-
expect(actionStatusInCustomSpace.items.length).to.eql(1);
278+
expect(actionStatusInCustomSpace.items.length).to.greaterThan(0);
280279

281280
const res = await apiClient.cancelAction(
282281
actionStatusInCustomSpace.items[0].actionId,
@@ -296,7 +295,7 @@ export default function (providerContext: FtrProviderContext) {
296295
);
297296

298297
const actionStatusInCustomSpace = await apiClient.getActionStatus(TEST_SPACE_1);
299-
expect(actionStatusInCustomSpace.items.length).to.eql(1);
298+
expect(actionStatusInCustomSpace.items.length).to.greaterThan(0);
300299

301300
let err: Error | undefined;
302301
try {

‎x-pack/platform/test/fleet_api_integration/apis/space_awareness/agents.ts‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ import { pollResult } from '../agents/update_agent_tags';
2323

2424
export default function (providerContext: FtrProviderContext) {
2525
const { getService } = providerContext;
26+
2627
const supertest = getService('supertest');
2728
const esClient = getService('es');
29+
2830
const kibanaServer = getService('kibanaServer');
31+
2932
const spaces = getService('spaces');
3033
let TEST_SPACE_1: string;
3134

@@ -243,8 +246,12 @@ export default function (providerContext: FtrProviderContext) {
243246
});
244247
});
245248

246-
// Failing: See https://github.com/elastic/kibana/issues/236095
247-
describe.skip('POST /agents/bulkUpdateAgentTags', () => {
249+
describe('POST /agents/bulkUpdateAgentTags', () => {
250+
beforeEach(async () => {
251+
await cleanFleetAgents(esClient);
252+
await createAgents();
253+
});
254+
248255
function getAgentTags(agents: GetAgentsResponse) {
249256
return agents.items?.reduce((acc, item) => {
250257
acc[item.id] = item.tags;
@@ -262,12 +269,14 @@ export default function (providerContext: FtrProviderContext) {
262269
await verifyAgentsTags({
263270
[defaultSpaceAgent1]: ['tag1'],
264271
[defaultSpaceAgent2]: ['tag1'],
272+
[allSpaceAgent4]: ['tag1'],
265273
});
266274
await verifyAgentsTags(
267275
{
268276
[testSpaceAgent1]: ['tag1'],
269277
[testSpaceAgent2]: ['tag1'],
270278
[testSpaceAgent3]: ['tag1'],
279+
[allSpaceAgent4]: ['tag1'],
271280
},
272281
TEST_SPACE_1
273282
);
@@ -286,18 +295,20 @@ export default function (providerContext: FtrProviderContext) {
286295
await verifyAgentsTags({
287296
[defaultSpaceAgent1]: ['tag1'],
288297
[defaultSpaceAgent2]: ['tag1'],
298+
[allSpaceAgent4]: ['tag1'],
289299
});
290300
await verifyAgentsTags(
291301
{
292302
[testSpaceAgent1]: ['tag1', 'space1'],
293303
[testSpaceAgent2]: ['tag1'],
294304
[testSpaceAgent3]: ['tag1'],
305+
[allSpaceAgent4]: ['tag1'],
295306
},
296307
TEST_SPACE_1
297308
);
298309
await verifyNoAgentActions();
299310
let actionStatus = await apiClient.getActionStatus(TEST_SPACE_1);
300-
expect(actionStatus.items.length).to.eql(1);
311+
expect(actionStatus.items.length).to.greaterThan(0);
301312

302313
// Remove tag
303314
await apiClient.bulkUpdateAgentTags(
@@ -311,21 +322,21 @@ export default function (providerContext: FtrProviderContext) {
311322
await verifyAgentsTags({
312323
[defaultSpaceAgent1]: ['tag1'],
313324
[defaultSpaceAgent2]: ['tag1'],
325+
[allSpaceAgent4]: ['tag1'],
314326
});
315327
await verifyAgentsTags(
316328
{
317329
[testSpaceAgent1]: ['tag1'],
318330
[testSpaceAgent2]: ['tag1'],
319331
[testSpaceAgent3]: ['tag1'],
332+
[allSpaceAgent4]: ['tag1'],
320333
},
321334
TEST_SPACE_1
322335
);
323336
await verifyNoAgentActions();
324337
actionStatus = await apiClient.getActionStatus(TEST_SPACE_1);
325-
expect(actionStatus.items.length).to.eql(2);
338+
expect(actionStatus.items.length).to.greaterThan(1);
326339
actionStatus.items.forEach((item) => {
327-
expect(item.nbAgentsActioned).to.eql(1);
328-
expect(item.nbAgentsActionCreated).to.eql(1);
329340
expect(item.type).to.eql('UPDATE_TAGS');
330341
});
331342
});
@@ -334,12 +345,14 @@ export default function (providerContext: FtrProviderContext) {
334345
await verifyAgentsTags({
335346
[defaultSpaceAgent1]: ['tag1'],
336347
[defaultSpaceAgent2]: ['tag1'],
348+
[allSpaceAgent4]: ['tag1'],
337349
});
338350
await verifyAgentsTags(
339351
{
340352
[testSpaceAgent1]: ['tag1'],
341353
[testSpaceAgent2]: ['tag1'],
342354
[testSpaceAgent3]: ['tag1'],
355+
[allSpaceAgent4]: ['tag1'],
343356
},
344357
TEST_SPACE_1
345358
);
@@ -361,20 +374,22 @@ export default function (providerContext: FtrProviderContext) {
361374
[testSpaceAgent1]: ['tag1', 'space1'],
362375
[testSpaceAgent2]: ['tag1', 'space1'],
363376
[testSpaceAgent3]: ['tag1', 'space1'],
377+
[allSpaceAgent4]: ['tag1', 'space1'],
364378
},
365379
TEST_SPACE_1
366380
);
367381
};
368382

369-
await pollResult(supertest, actionId, 3, verifyActionResult, TEST_SPACE_1);
383+
await pollResult(supertest, actionId, 4, verifyActionResult, TEST_SPACE_1);
370384

371385
await verifyNoAgentActions();
372386
let actionStatus = await apiClient.getActionStatus(TEST_SPACE_1);
373-
expect(actionStatus.items.length).to.eql(1);
387+
expect(actionStatus.items.length).to.greaterThan(0);
374388

375389
await verifyAgentsTags({
376390
[defaultSpaceAgent1]: ['tag1'],
377391
[defaultSpaceAgent2]: ['tag1'],
392+
[allSpaceAgent4]: ['tag1', 'space1'],
378393
});
379394

380395
// Remove tag
@@ -392,23 +407,23 @@ export default function (providerContext: FtrProviderContext) {
392407
[testSpaceAgent1]: ['tag1'],
393408
[testSpaceAgent2]: ['tag1'],
394409
[testSpaceAgent3]: ['tag1'],
410+
[allSpaceAgent4]: ['tag1'],
395411
},
396412
TEST_SPACE_1
397413
);
398414
};
399415

400-
await pollResult(supertest, actionId, 3, verifyActionResult, TEST_SPACE_1);
416+
await pollResult(supertest, actionId, 4, verifyActionResult, TEST_SPACE_1);
401417

402418
await verifyAgentsTags({
403419
[defaultSpaceAgent1]: ['tag1'],
404420
[defaultSpaceAgent2]: ['tag1'],
421+
[allSpaceAgent4]: ['tag1'],
405422
});
406423
await verifyNoAgentActions();
407424
actionStatus = await apiClient.getActionStatus(TEST_SPACE_1);
408-
expect(actionStatus.items.length).to.eql(2);
425+
expect(actionStatus.items.length).to.greaterThan(1);
409426
actionStatus.items.forEach((item) => {
410-
expect(item.nbAgentsActioned).to.eql(3);
411-
expect(item.nbAgentsActionCreated).to.eql(3);
412427
expect(item.type).to.eql('UPDATE_TAGS');
413428
});
414429
});

‎x-pack/platform/test/fleet_api_integration/apis/space_awareness/enrollment_settings.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ export default function (providerContext: FtrProviderContext) {
1919
const spaces = getService('spaces');
2020
let TEST_SPACE_1: string;
2121

22-
// Failing: See https://github.com/elastic/kibana/issues/236125
23-
describe.skip('enrollment_settings', function () {
22+
describe('enrollment_settings', function () {
2423
skipIfNoDockerRegistry(providerContext);
2524
const apiClient = new SpaceTestApiClient(supertest);
2625

0 commit comments

Comments
 (0)