consolidate error messages and exceptions thrown

Author: slobodanadamovic

server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java

@@ -2368,7 +2368,7 @@ private static <V> V splitSelectorExpression(String expression, BiFunction<Strin
                 IndexComponentSelector selector = resolveAndValidateSelectorString(() -> expression, suffix);
                 String expressionBase = expression.substring(0, lastDoubleColon);
                 ensureNoMoreSelectorSeparators(expressionBase, expression);
-                ensureNoCrossClusterExpressionWithSelectorSeparator(expressionBase, selector, expression);
+                ensureNotMixingRemoteClusterExpressionWithSelectorSeparator(expressionBase, selector, expression);
                 return bindFunction.apply(expressionBase, suffix);
             }
             // Otherwise accept the default
@@ -2420,24 +2420,17 @@ private static void ensureNoMoreSelectorSeparators(String remainingExpression, S
         }
 
         /**
-         * Checks the expression for cross-cluster syntax and throws an exception if it is combined with ::failures selector.
-         * @throws IllegalArgumentException if cross-cluster syntax is detected after parsing the selector expression
+         * Checks the expression for remote cluster pattern and throws an exception if it is combined with :: selectors.
+         * @throws InvalidIndexNameException if remote cluster pattern is detected after parsing the selector expression
          */
-        private static void ensureNoCrossClusterExpressionWithSelectorSeparator(
+        private static void ensureNotMixingRemoteClusterExpressionWithSelectorSeparator(
             String expressionWithoutSelector,
             IndexComponentSelector selector,
             String originalExpression
         ) {
             if (selector != null) {
                 if (RemoteClusterAware.isRemoteIndexName(expressionWithoutSelector)) {
-                    throw new IllegalArgumentException(
-                        "Invalid usage of ["
-                            + SELECTOR_SEPARATOR
-                            + selector.getKey()
-                            + "] selector in ["
-                            + originalExpression
-                            + "], selectors are not supported with cross-cluster expressions"
-                    );
+                    throw new InvalidIndexNameException(originalExpression, "Selectors are not yet supported on remote cluster patterns");
                 }
             }
         }

server/src/test/java/org/elasticsearch/cluster/metadata/SelectorResolverTests.java

@@ -115,8 +115,8 @@ public void testResolveExpression() {
             "*:-test*,*::data"
         );
         for (String expression : remoteClusterExpressionsWithSelectors) {
-            var e = expectThrows(IllegalArgumentException.class, () -> resolve(selectorsAllowed, expression));
-            assertThat(e.getMessage(), containsString("selectors are not supported with cross-cluster expressions"));
+            var e = expectThrows(InvalidIndexNameException.class, () -> resolve(selectorsAllowed, expression));
+            assertThat(e.getMessage(), containsString("Selectors are not yet supported on remote cluster patterns"));
         }
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java

@@ -636,7 +636,13 @@ public void testInvalidCharacterInIndexPattern() {
                 expectDoubleColonErrorWithLineNumber(command, "*:*::failures", parseLineNumber + 3);
 
                 // Too many colons
-                expectInvalidIndexNameErrorWithLineNumber(command, "\"index:::data\"", lineNumber, "index:", "must not contain ':'");
+                expectInvalidIndexNameErrorWithLineNumber(
+                    command,
+                    "\"index:::data\"",
+                    lineNumber,
+                    "index:::data",
+                    "Selectors are not yet supported on remote cluster patterns"
+                );
                 expectInvalidIndexNameErrorWithLineNumber(
                     command,
                     "\"index::::data\"",

x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/AbstractRemoteClusterSecurityFailureStoreRestIT.java

@@ -171,7 +171,7 @@ protected Tuple<String, String> getSingleDataAndFailureIndices(String dataStream
 
     protected static void assertSelectorsNotSupported(ResponseException exception) {
         assertThat(exception.getResponse().getStatusLine().getStatusCode(), equalTo(403));
-        assertThat(exception.getMessage(), containsString("selectors are not supported with cross-cluster expressions"));
+        assertThat(exception.getMessage(), containsString("Selectors are not yet supported on remote cluster patterns"));
     }
 
 }