Skip to content

Reject external versioning when script is configured in OpenSearch sink #6773

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
dinujoh merged 1 commit into from
Apr 29, 2026
Merged

Reject external versioning when script is configured in OpenSearch sink #6773

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
7 changes: 7 additions & 0 deletions ...ain/java/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,13 @@ public static IndexConfiguration readIndexConfig(final OpenSearchSinkConfig open
builder = builder.withScriptConfiguration(scriptConfiguration);
}

if (scriptConfiguration != null && openSearchSinkConfig.getVersionType() != null
&& VersionType.External.jsonValue().equals(openSearchSinkConfig.getVersionType())) {
throw new InvalidPluginConfigurationException(
"document_version_type 'external' is incompatible with script configuration. " +
"OpenSearch does not support external versioning with scripted upserts.");
}

AwsAuthenticationConfiguration awsAuthenticationConfiguration = openSearchSinkConfig.getAwsAuthenticationOptions();
if (awsAuthenticationConfiguration != null) {
builder = builder.withServerless(awsAuthenticationConfiguration.isServerlessCollection());
Expand Down
22 changes: 22 additions & 0 deletions ...ava/org/opensearch/dataprepper/plugins/sink/opensearch/index/IndexConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,4 +653,26 @@ private String createTemplateContent() {
"\"mappings\":{\"properties\":{\"timestamp\":{\"type\":\"date\",\"format\":\"yyyy-MM-ddHH:mm:ss||yyyy-MM-dd||epoch_millis\"}," +
"\"value\":{\"type\":\"double\"}}}}}";
}

@Test
public void testReadIndexConfig_withExternalVersionAndScript_throws_InvalidPluginConfigurationException() throws JsonProcessingException {
final Map<String, Object> metadata = new HashMap<>();
metadata.put("index_type", "custom");
metadata.put("index", "test-index");
metadata.put("document_version_type", "external");
metadata.put("script", Map.of("source", "ctx._source.counter += 1"));
final OpenSearchSinkConfig openSearchSinkConfig = getOpenSearchSinkConfig(metadata);
assertThrows(InvalidPluginConfigurationException.class, () -> IndexConfiguration.readIndexConfig(openSearchSinkConfig));
}

@Test
public void testReadIndexConfig_withScriptAndNoExternalVersion_doesNotThrow() throws JsonProcessingException {
final Map<String, Object> metadata = new HashMap<>();
metadata.put("index_type", "custom");
metadata.put("index", "test-index");
metadata.put("script", Map.of("source", "ctx._source.counter += 1"));
final OpenSearchSinkConfig openSearchSinkConfig = getOpenSearchSinkConfig(metadata);
final IndexConfiguration config = IndexConfiguration.readIndexConfig(openSearchSinkConfig);
assertThat(config.getScriptConfiguration(), notNullValue());
}
}
Loading