Skip to content
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.

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

Add more validation for data stream aliases. #73416

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,10 @@ public AliasActions searchRouting(String searchRouting) {
return this;
}

public String routing() {
return routing;
}

public String indexRouting() {
return indexRouting == null ? routing : indexRouting;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@
import org.elasticsearch.transport.TransportService;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

import static java.util.Collections.unmodifiableList;

Expand Down Expand Up @@ -92,6 +94,38 @@ protected void masterOperation(Task task, final IndicesAliasesRequest request, f
List<String> concreteDataStreams =
indexNameExpressionResolver.dataStreamNames(state, request.indicesOptions(), action.indices());
if (concreteDataStreams.size() != 0) {
// Fail if parameters are used that data streams don't support:
if (action.filter() != null) {
throw new IllegalArgumentException("aliases that point to data streams don't support filters");
}
if (action.routing() != null) {
throw new IllegalArgumentException("aliases that point to data streams don't support routing");
}
if (action.indexRouting() != null) {
throw new IllegalArgumentException("aliases that point to data streams don't support index_routing");
}
if (action.searchRouting() != null) {
throw new IllegalArgumentException("aliases that point to data streams don't support search_routing");
}
if (action.writeIndex() != null) {
throw new IllegalArgumentException("aliases that point to data streams don't support is_write_index");
}
if (action.isHidden() != null) {
throw new IllegalArgumentException("aliases that point to data streams don't support is_hidden");
}
// Fail if expressions match both data streams and regular indices:
String[] concreteIndices =
indexNameExpressionResolver.concreteIndexNames(state, request.indicesOptions(), true, action.indices());
List<String> nonBackingIndices = Arrays.stream(concreteIndices)
.map(resolvedIndex -> state.metadata().getIndicesLookup().get(resolvedIndex))
.filter(ia -> ia.getParentDataStream() == null)
.map(IndexAbstraction::getName)
.collect(Collectors.toList());
if (nonBackingIndices.isEmpty() == false) {
throw new IllegalArgumentException("expressions " + Arrays.toString(action.indices()) +
" that match with both data streams and regular indices are disallowed");
}

switch (action.actionType()) {
case ADD:
for (String dataStreamName : concreteDataStreams) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,96 @@ public void testAliasActionsFailOnDataStreamBackingIndices() throws Exception {
);
}

public void testDataStreamAliasesMixedExpressionValidation() throws Exception {
createIndex("metrics-myindex");
putComposableIndexTemplate("id1", List.of("metrics-*"));
String dataStreamName = "metrics-foo";
CreateDataStreamAction.Request createDataStreamRequest = new CreateDataStreamAction.Request(dataStreamName);
client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).get();

AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index("metrics-*").aliases("my-alias");
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
aliasesAddRequest.addAliasAction(addAction);
Exception e = expectThrows(IllegalArgumentException.class, () -> client().admin().indices().aliases(aliasesAddRequest).actionGet());
assertThat(e.getMessage(), equalTo("expressions [metrics-*] that match with both data streams and regular indices are disallowed"));
}

public void testDataStreamAliasesUnsupportedParametersValidation() throws Exception {
putComposableIndexTemplate("id1", List.of("metrics-*"));
String dataStreamName = "metrics-foo";
CreateDataStreamAction.Request createDataStreamRequest = new CreateDataStreamAction.Request(dataStreamName);
client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).get();

{
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index("metrics-*").aliases("my-alias").filter("[filter]");
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
aliasesAddRequest.addAliasAction(addAction);
Exception e = expectThrows(
IllegalArgumentException.class,
() -> client().admin().indices().aliases(aliasesAddRequest).actionGet()
);
assertThat(e.getMessage(), equalTo("aliases that point to data streams don't support filters"));
}
{
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index("metrics-*").aliases("my-alias").routing("[routing]");
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
aliasesAddRequest.addAliasAction(addAction);
Exception e = expectThrows(
IllegalArgumentException.class,
() -> client().admin().indices().aliases(aliasesAddRequest).actionGet()
);
assertThat(e.getMessage(), equalTo("aliases that point to data streams don't support routing"));
}
{
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index("metrics-*")
.aliases("my-alias")
.indexRouting("[index_routing]");
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
aliasesAddRequest.addAliasAction(addAction);
Exception e = expectThrows(
IllegalArgumentException.class,
() -> client().admin().indices().aliases(aliasesAddRequest).actionGet()
);
assertThat(e.getMessage(), equalTo("aliases that point to data streams don't support index_routing"));
}
{
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index("metrics-*")
.aliases("my-alias")
.searchRouting("[search_routing]");
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
aliasesAddRequest.addAliasAction(addAction);
Exception e = expectThrows(
IllegalArgumentException.class,
() -> client().admin().indices().aliases(aliasesAddRequest).actionGet()
);
assertThat(e.getMessage(), equalTo("aliases that point to data streams don't support search_routing"));
}
{
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index("metrics-*")
.aliases("my-alias")
.writeIndex(randomBoolean());
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
aliasesAddRequest.addAliasAction(addAction);
Exception e = expectThrows(
IllegalArgumentException.class,
() -> client().admin().indices().aliases(aliasesAddRequest).actionGet()
);
assertThat(e.getMessage(), equalTo("aliases that point to data streams don't support is_write_index"));
}
{
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index("metrics-*")
.aliases("my-alias")
.isHidden(randomBoolean());
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
aliasesAddRequest.addAliasAction(addAction);
Exception e = expectThrows(
IllegalArgumentException.class,
() -> client().admin().indices().aliases(aliasesAddRequest).actionGet()
);
assertThat(e.getMessage(), equalTo("aliases that point to data streams don't support is_hidden"));
}
}

public void testTimestampFieldCustomAttributes() throws Exception {
String mapping = "{\n"
+ " \"properties\": {\n"
Expand Down