Skip to content

[ES 9.0] Remove body workaround (@elastic/security-threat-hunting) #217224

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

Merged
afharo merged 8 commits into from
Apr 22, 2025
Merged

[ES 9.0] Remove body workaround (@elastic/security-threat-hunting) #217224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b774d7
[ES 9.0] Remove body workaround (`@elastic/security-threat-hunting`)
afharo Apr 4, 2025
324fcb5
Merge branch 'main' of github.com:elastic/kibana into es-9.0/remove-b…
afharo Apr 7, 2025
fc4e4f7
Update tests
afharo Apr 7, 2025
e5118a2
Merge branch 'main' into es-9.0/remove-body-workaround/elastic/securi…
afharo Apr 7, 2025
46b7ba0
Merge branch 'main' into es-9.0/remove-body-workaround/elastic/securi…
afharo Apr 9, 2025
89e0f61
Merge branch 'main' into es-9.0/remove-body-workaround/elastic/securi…
afharo Apr 11, 2025
7d80b53
Merge branch 'main' into es-9.0/remove-body-workaround/elastic/securi…
afharo Apr 16, 2025
0c2999f
Merge branch 'main' into es-9.0/remove-body-workaround/elastic/securi…
afharo Apr 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
4 changes: 2 additions & 2 deletions .../solutions/security/packages/data-stream-adapter/src/create_or_update_data_stream.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('updateDataStreams', () => {
});
expect(esClient.indices.putMapping).toHaveBeenCalledWith({
index: dataStreamName,
body: simulateIndexTemplateResponse.template.mappings,
...simulateIndexTemplateResponse.template.mappings,
});
});

Expand Down Expand Up @@ -167,7 +167,7 @@ describe('createOrUpdateDataStream', () => {
});
expect(esClient.indices.putMapping).toHaveBeenCalledWith({
index: name,
body: simulateIndexTemplateResponse.template.mappings,
...simulateIndexTemplateResponse.template.mappings,
});
});
});
3 changes: 1 addition & 2 deletions x-pack/solutions/security/packages/data-stream-adapter/src/create_or_update_data_stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ const updateMapping = async ({ logger, esClient, indexName, writeIndexOnly }: Up
() =>
esClient.indices.putMapping({
index: indexName,
// @ts-expect-error elasticsearch@9.0.0 https://github.com/elastic/elasticsearch-js/issues/2584
body: simulatedMapping,
...simulatedMapping,
write_index_only: writeIndexOnly,
}),
{ logger }
Expand Down
4 changes: 2 additions & 2 deletions x-pack/solutions/security/packages/index-adapter/src/create_or_update_index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('updateIndices', () => {
});
expect(esClient.indices.putMapping).toHaveBeenCalledWith({
index: indexName,
body: simulateIndexTemplateResponse.template.mappings,
...simulateIndexTemplateResponse.template.mappings,
});
});

Expand Down Expand Up @@ -158,7 +158,7 @@ describe('createOrUpdateIndex', () => {
});
expect(esClient.indices.putMapping).toHaveBeenCalledWith({
index: name,
body: simulateIndexTemplateResponse.template.mappings,
...simulateIndexTemplateResponse.template.mappings,
});
});
});
3 changes: 1 addition & 2 deletions x-pack/solutions/security/packages/index-adapter/src/create_or_update_index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ const updateMapping = async ({ logger, esClient, indexName, writeIndexOnly }: Up
() =>
esClient.indices.putMapping({
index: indexName,
// @ts-expect-error elasticsearch@9.0.0 https://github.com/elastic/elasticsearch-js/issues/2584
body: simulatedMapping,
...simulatedMapping,
write_index_only: writeIndexOnly,
}),
{ logger }
Expand Down