Skip to content

Fix NPE when creating a match-all composable index template without an inline template #22421

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

Open
llilyy wants to merge 5 commits into
base: main
Choose a base branch
from
+28 −7
Open

Fix NPE when creating a match-all composable index template without an inline template #22421

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
e3dbb40
Fix NPE on match-all composable index template without inline template
llilyy Jul 8, 2026
c9b04de
Merge branch 'main' into fix/global-template-npe-without-template
llilyy Jul 9, 2026
94c1dc6
Merge branch 'main' into fix/global-template-npe-without-template
llilyy Jul 19, 2026
e273298
Merge branch 'main' into fix/global-template-npe-without-template
llilyy Jul 20, 2026
c579dbd
Merge branch 'main' into fix/global-template-npe-without-template
llilyy Jul 30, 2026
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
15 changes: 8 additions & 7 deletions ...va/org/opensearch/action/admin/indices/template/put/PutComposableIndexTemplateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,14 @@ public ActionRequestValidationException validateIndexTemplate(@Nullable ActionRe
if (indexTemplate == null) {
validationException = addValidationError("an index template is required", validationException);
} else {
if (indexTemplate.indexPatterns().stream().anyMatch(Regex::isMatchAllPattern)) {
if (IndexMetadata.INDEX_HIDDEN_SETTING.exists(indexTemplate.template().settings())) {
validationException = addValidationError(
"global composable templates may not specify the setting " + IndexMetadata.INDEX_HIDDEN_SETTING.getKey(),
validationException
);
}
if (indexTemplate.indexPatterns().stream().anyMatch(Regex::isMatchAllPattern)
&& indexTemplate.template() != null
&& indexTemplate.template().settings() != null
&& IndexMetadata.INDEX_HIDDEN_SETTING.exists(indexTemplate.template().settings())) {
validationException = addValidationError(
"global composable templates may not specify the setting " + IndexMetadata.INDEX_HIDDEN_SETTING.getKey(),
validationException
);
}
if (indexTemplate.priority() != null && indexTemplate.priority() < 0) {
validationException = addValidationError("index template priority must be >= 0", validationException);
Expand Down
20 changes: 20 additions & 0 deletions .../opensearch/action/admin/indices/template/put/PutComposableIndexTemplateRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;

public class PutComposableIndexTemplateRequestTests extends AbstractWireSerializingTestCase<PutComposableIndexTemplateAction.Request> {
@Override
Expand Down Expand Up @@ -84,6 +85,25 @@ public void testPutGlobalTemplatesCannotHaveHiddenIndexSetting() {
assertThat(error, is("global composable templates may not specify the setting " + IndexMetadata.SETTING_INDEX_HIDDEN));
}

public void testPutGlobalTemplateWithoutInlineTemplateSucceeds() {
ComposableIndexTemplate globalTemplate = new ComposableIndexTemplate(List.of("*"), null, List.of("ct"), null, null, null, null);

PutComposableIndexTemplateAction.Request request = new PutComposableIndexTemplateAction.Request("test");
request.indexTemplate(globalTemplate);

assertThat(request.validate(), is(nullValue()));
}

public void testPutGlobalTemplateWithoutSettingsSucceeds() {
Template template = new Template(null, null, null);
ComposableIndexTemplate globalTemplate = new ComposableIndexTemplate(List.of("*"), template, null, null, null, null, null);

PutComposableIndexTemplateAction.Request request = new PutComposableIndexTemplateAction.Request("test");
request.indexTemplate(globalTemplate);

assertThat(request.validate(), is(nullValue()));
}

public void testPutIndexTemplateV2RequestMustContainTemplate() {
PutComposableIndexTemplateAction.Request requestWithoutTemplate = new PutComposableIndexTemplateAction.Request("test");

Expand Down
Loading