Skip to content

Handle the indices pattern ["*", "-*"] when grouping indices by cluster name #128610

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 7 commits into from
Jun 3, 2025
Merged

Handle the indices pattern ["*", "-*"] when grouping indices by cluster name #128610

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3c3f9d
Handle the indices pattern `["*", "-*"]` when grouping indices by clu…
pawankartik-elastic May 29, 2025
cd388ae
Apply review comments
pawankartik-elastic Jun 2, 2025
d29a9c3
Drop redundant code comment
pawankartik-elastic Jun 2, 2025
7a76fca
Merge branch 'main' into pkar/detect-no-indices-aliases-pattern
pawankartik-elastic Jun 2, 2025
bac027a
Update docs/changelog/128610.yaml
pawankartik-elastic Jun 2, 2025
00020a3
Apply review comments
pawankartik-elastic Jun 3, 2025
07449bb
Merge branch 'main' into pkar/detect-no-indices-aliases-pattern
pawankartik-elastic Jun 3, 2025
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
17 changes: 16 additions & 1 deletion server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,22 @@ public Map<String, OriginalIndices> groupIndices(
boolean returnLocalAll
) {
final Map<String, OriginalIndices> originalIndicesMap = new HashMap<>();
final Map<String, List<String>> groupedIndices = groupClusterIndices(remoteClusterNames, indices);
final Map<String, List<String>> groupedIndices;
/*
* We could use IndicesAndAliasesResolverField.NO_INDICES_OR_ALIASES_ARRAY but that'd require adding dependency on its
* module and doing so results in a circular dependency warnings.
*/
if (indices.length == 2 && indices[0].equals("*") && indices[1].equals("-*")) {
groupedIndices = Map.of();
/*
* We set returnLocalAll to false because this semantic ["*", "-*"] specifically means that it's alright to return
* an empty response and in this context we do not want to fallback to the local cluster.
*/
returnLocalAll = false;
} else {
groupedIndices = groupClusterIndices(remoteClusterNames, indices);
}

if (groupedIndices.isEmpty()) {
if (returnLocalAll) {
// search on _all in the local cluster if neither local indices nor remote indices were specified
Expand Down
24 changes: 9 additions & 15 deletions ...java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityRCS1ResolveClusterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,21 +281,15 @@ public void testResolveClusterUnderRCS1() throws Exception {
);
assertThat(exc.getMessage(), containsString(indexOptionTuple.v1()));
}
// TODO: The security pathways are not using the new
// RemoteClusterService.groupIndices(IndicesOptions indicesOptions, String[] indices, boolean returnLocalAll) method
// so this use case still behaves badly - fix in follow on PR
// {
// // TEST CASE 13: Resolution against wildcarded remote cluster expression that matches no remotes
// final Request remoteOnly1 = new Request("GET", "_resolve/cluster/no_such_remote*:*");
// Response response = performRequestWithRemoteSearchUser(remoteOnly1);
// assertOK(response);
// Map<String, Object> responseMap = responseAsMap(response);
// assertThat(responseMap.get(LOCAL_CLUSTER_NAME_REPRESENTATION), nullValue());
// Map<String, Object> remoteMap = (Map<String, Object>) responseMap.get("my_remote_cluster");
// assertThat((Boolean) remoteMap.get("connected"), equalTo(true));
// assertThat((Boolean) remoteMap.get("matching_indices"), equalTo(false));
// assertThat(remoteMap.get("version"), notNullValue());
// }
{
// TEST CASE 13: Resolution against wildcarded remote cluster expression that matches no remotes should result in an
// empty response and not fall back to the local cluster.
final Request remoteOnly1 = new Request("GET", "_resolve/cluster/no_such_remote*:*");
Response response = performRequestWithRemoteSearchUser(remoteOnly1);
assertOK(response);
Map<String, Object> responseMap = responseAsMap(response);
assertThat(responseMap.isEmpty(), is(true));
}
}

private Response performRequestWithRemoteSearchUser(final Request request) throws IOException {
Expand Down
22 changes: 9 additions & 13 deletions ...java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityRCS2ResolveClusterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,19 +376,15 @@ public void testResolveCluster() throws Exception {
);
assertThat(exc.getMessage(), containsString(indexOptionTuple.v1()));
}
// TODO: fix this in a follow-on PR
// {
// // TEST CASE 13: Resolution against wildcarded remote cluster expression that matches no remotes
// final Request remoteOnly1 = new Request("GET", "_resolve/cluster/no_such_remote*:*");
// Response response = performRequestWithRemoteSearchUser(remoteOnly1);
// assertOK(response);
// Map<String, Object> responseMap = responseAsMap(response);
// assertThat(responseMap.get(LOCAL_CLUSTER_NAME_REPRESENTATION), nullValue());
// Map<String, Object> remoteMap = (Map<String, Object>) responseMap.get("my_remote_cluster");
// assertThat((Boolean) remoteMap.get("connected"), equalTo(true));
// assertThat((Boolean) remoteMap.get("matching_indices"), equalTo(false));
// assertThat(remoteMap.get("version"), notNullValue());
// }
{
// TEST CASE 13: Resolution against wildcarded remote cluster expression that matches no remotes should result in an
// empty response and not fall back to the local cluster.
final Request remoteOnly1 = new Request("GET", "_resolve/cluster/no_such_remote*:*");
Response response = performRequestWithRemoteSearchUser(remoteOnly1);
assertOK(response);
Map<String, Object> responseMap = responseAsMap(response);
assertThat(responseMap.isEmpty(), is(true));
}
}

private Response performRequestWithRemoteSearchUser(final Request request) throws IOException {
Expand Down