Skip to content

Trim field references in reroute processor #96941

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
merged 3 commits into from
Jun 20, 2023
Merged

Trim field references in reroute processor #96941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a85293e
Trim field references in reroute processor
felixbarny Jun 20, 2023
f72642e
Update docs/changelog/96941.yaml
felixbarny Jun 20, 2023
34c0b56
Merge branch 'main' into reroute-trim-field-references
elasticmachine Jun 20, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/changelog/96941.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 96941
summary: Trim field references in reroute processor
area: Ingest Node
type: bug
issues:
- 96939
1 change: 1 addition & 0 deletions modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RerouteProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ private DataStreamValueSource(String value, Function<String, String> sanitizer)
if (fieldReference.startsWith("{") && fieldReference.endsWith("}")) {
fieldReference = fieldReference.substring(1, fieldReference.length() - 1);
}
fieldReference = fieldReference.trim();
// only a single field reference is allowed
// so something like this is disallowed: {{foo}}-{{bar}}
if (fieldReference.contains("{") || fieldReference.contains("}")) {
Expand Down
6 changes: 3 additions & 3 deletions ...es/ingest-common/src/test/java/org/elasticsearch/ingest/common/RerouteProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void testEventDataset() throws Exception {
IngestDocument ingestDocument = createIngestDocument("logs-generic-default");
ingestDocument.setFieldValue("event.dataset", "foo");

RerouteProcessor processor = createRerouteProcessor(List.of("{{event.dataset}}"), List.of());
RerouteProcessor processor = createRerouteProcessor(List.of("{{event.dataset }}"), List.of());
processor.execute(ingestDocument);
assertDataSetFields(ingestDocument, "logs", "foo", "default");
assertThat(ingestDocument.getFieldValue("event.dataset", String.class), equalTo("foo"));
Expand All @@ -45,7 +45,7 @@ public void testEventDatasetDottedFieldName() throws Exception {
IngestDocument ingestDocument = createIngestDocument("logs-generic-default");
ingestDocument.getCtxMap().put("event.dataset", "foo");

RerouteProcessor processor = createRerouteProcessor(List.of("{{event.dataset}}"), List.of());
RerouteProcessor processor = createRerouteProcessor(List.of("{{ event.dataset}}"), List.of());
processor.execute(ingestDocument);
assertDataSetFields(ingestDocument, "logs", "foo", "default");
assertThat(ingestDocument.getCtxMap().get("event.dataset"), equalTo("foo"));
Expand All @@ -56,7 +56,7 @@ public void testNoDataset() throws Exception {
IngestDocument ingestDocument = createIngestDocument("logs-generic-default");
ingestDocument.setFieldValue("ds", "foo");

RerouteProcessor processor = createRerouteProcessor(List.of("{{ds}}"), List.of());
RerouteProcessor processor = createRerouteProcessor(List.of("{{ ds }}"), List.of());
processor.execute(ingestDocument);
assertDataSetFields(ingestDocument, "logs", "foo", "default");
assertFalse(ingestDocument.hasField("event.dataset"));
Expand Down