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

[Fleet] Do not reassign actions space #207381

Merged
merged 5 commits into from
Jan 22, 2025
Merged

[Fleet] Do not reassign actions space #207381

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
4393f9e
[Fleet] Do not reassing action space
nchaulet Jan 21, 2025
ac2130d
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Jan 21, 2025
862a1c8
fix tests
nchaulet Jan 21, 2025
8e907e2
Merge branch 'feature-change-space-policy-action-fix' of github.com:n…
nchaulet Jan 21, 2025
e872ab8
Merge branch 'main' into feature-change-space-policy-action-fix
elasticmachine Jan 21, 2025
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
19 changes: 0 additions & 19 deletions x-pack/platform/plugins/shared/fleet/server/services/spaces/agent_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import type { SortResults } from '@elastic/elasticsearch/lib/api/types';

import {
AGENTS_INDEX,
AGENT_ACTIONS_INDEX,
AGENT_POLICY_SAVED_OBJECT_TYPE,
PACKAGE_POLICY_SAVED_OBJECT_TYPE,
SO_SEARCH_LIMIT,
Expand Down Expand Up @@ -197,24 +196,6 @@ export async function updateAgentPolicySpaces({

const lastAgent = agents[agents.length - 1];
searchAfter = lastAgent.sort;

await esClient.updateByQuery({
index: AGENT_ACTIONS_INDEX,
query: {
bool: {
must: {
terms: {
agents: agents.map(({ id }) => id),
},
},
},
},
script: `ctx._source.namespaces = [${newSpaceIds
.map((spaceId) => `"${spaceId}"`)
.join(',')}]`,
ignore_unavailable: true,
refresh: true,
});
}
} finally {
await closePointInTime(esClient, pitId);
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/fleet_api_integration/apis/space_awareness/change_space_agent_policies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export default function (providerContext: FtrProviderContext) {
await assertAgentSpaces(policy1AgentId, ['default', TEST_SPACE_1]);
await assertAgentSpaces(policy2AgentId, ['default']);

await assertActionSpaces(agent1ActionId, ['default', TEST_SPACE_1]);
await assertActionSpaces(agent1ActionId, ['default']);
await assertActionSpaces(agent2ActionId, ['default']);

await assertEnrollemntApiKeysForSpace('default', [
Expand Down Expand Up @@ -262,7 +262,7 @@ export default function (providerContext: FtrProviderContext) {
await assertAgentSpaces(policy1AgentId, [TEST_SPACE_1]);
await assertAgentSpaces(policy2AgentId, ['default']);

await assertActionSpaces(agent1ActionId, [TEST_SPACE_1]);
await assertActionSpaces(agent1ActionId, ['default']);
await assertActionSpaces(agent2ActionId, ['default']);

await assertEnrollemntApiKeysForSpace('default', [defaultSpacePolicy2.item.id]);
Expand Down
Loading