Skip to content

Fix delete_entries incorrect validation #6161

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
graytaylor0 merged 1 commit into from
Oct 13, 2025
Merged

Fix delete_entries incorrect validation #6161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .../org/opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ boolean hasOnlyOneConfiguration() {

@AssertTrue(message = "exclude_from_delete only applies when with_keys_regex is configured.")
boolean isExcludeFromDeleteValid() {
return excludeFromDelete != null && !excludeFromDelete.isEmpty() && withKeysRegex != null && !withKeysRegex.isEmpty();
return !((excludeFromDelete != null && !excludeFromDelete.isEmpty()) && (withKeysRegex == null || withKeysRegex.isEmpty()));
}

@JsonIgnore
Expand Down
9 changes: 9 additions & 0 deletions ...opensearch/dataprepper/plugins/processor/mutateevent/DeleteEntryProcessorConfigTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ void testisExcludeFromDeleteValid_with_valid_config() throws NoSuchFieldExceptio
assertThat(objectUnderTest.isExcludeFromDeleteValid(), equalTo(true));
}

@Test
void test_with_keys_valid_config() throws NoSuchFieldException, IllegalAccessException{
final DeleteEntryProcessorConfig objectUnderTest = new DeleteEntryProcessorConfig();
final List<String> regexKeys = List.of("test.*");
ReflectivelySetField.setField(DeleteEntryProcessorConfig.class, objectUnderTest, "withKeys", regexKeys);

assertThat(objectUnderTest.isExcludeFromDeleteValid(), equalTo(true));
}

@Test
void testisExcludeFromDeleteValid_with_invalid_config() throws NoSuchFieldException, IllegalAccessException{
final DeleteEntryProcessorConfig objectUnderTest = new DeleteEntryProcessorConfig();
Expand Down
Loading