Re-assert invalid chars

Author: pawankartik-elastic

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/IdentifierBuilder.java

@@ -34,6 +34,8 @@ abstract class IdentifierBuilder extends AbstractBuilder {
 
     private static final String BLANK_INDEX_ERROR_MESSAGE = "Blank index specified in index pattern";
 
+    private static final String INVALID_ESQL_CHARS = Strings.INVALID_FILENAME_CHARS.replace("'*',", "");
+
     @Override
     public String visitIdentifier(IdentifierContext ctx) {
         return ctx == null ? null : unquoteIdentifier(ctx.QUOTED_IDENTIFIER(), ctx.UNQUOTED_IDENTIFIER());
@@ -311,8 +313,7 @@ private static void resolveAndValidateIndex(String index, EsqlBaseParser.IndexPa
              * mislead the user by mentioning this char in the error message.
              */
             if (e.getMessage().contains("must not contain the following characters")) {
-                var updatedInvalidChars = Strings.INVALID_FILENAME_CHARS.replace("'*',", "");
-                throwInvalidIndexNameException(index, "must not contain the following characters " + updatedInvalidChars, ctx);
+                throwInvalidIndexNameException(index, "must not contain the following characters " + INVALID_ESQL_CHARS, ctx);
             }
 
             throw new ParsingException(e, source(ctx), e.getMessage());

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

@@ -3233,7 +3233,12 @@ public void testInvalidPatternsWithIntermittentQuotes() {
             var invalidIndexName = "foo" + randomInvalidChar + "bar";
             var remoteIndexWithInvalidChar = quote(randomIdentifier() + ":" + invalidIndexName);
             var query = "FROM " + randomIndex + "," + remoteIndexWithInvalidChar;
-            expectError(query, "Invalid index name [" + invalidIndexName + "], must not contain the following characters");
+            expectError(
+                query,
+                "Invalid index name ["
+                    + invalidIndexName
+                    + "], must not contain the following characters [' ','\"',',','/','<','>','?','\\','|']"
+            );
         }
 
         // Colon outside a quoted string should result in an ANTLR error: a comma is expected.