Add metadata test and fix expected output of other

Add getClusters() metadata test.
Adjust expected output of other 'SHOW TABLES' tests.

x-pack/plugin/sql/qa/server/multi-cluster-with-security/build.gradle

@@ -10,7 +10,6 @@ dependencies {
 
 def remoteClusterReg = testClusters.register('remote-cluster') {
   testDistribution = 'DEFAULT'
-  // numberOfNodes = 2
   setting 'node.roles', '[data,ingest,master]'
   setting 'xpack.ml.enabled', 'false'
   setting 'xpack.watcher.enabled', 'false'

x-pack/plugin/sql/qa/server/multi-cluster-with-security/src/test/java/org/elasticsearch/xpack/sql/qa/multi_cluster_with_security/JdbcMetadataIT.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.sql.qa.multi_cluster_with_security;
+
+import org.elasticsearch.xpack.sql.qa.jdbc.JdbcIntegrationTestCase;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+
+public class JdbcMetadataIT extends JdbcIntegrationTestCase {
+
+    // gradle defines
+    public static final String LOCAL_CLUSTER_NAME = "integTest";
+    public static final String REMOTE_CLUSTER_NAME = "my_remote_cluster";
+
+    @AwaitsFix(bugUrl = "foo")
+    public void testJdbcGetClusters() throws Exception {
+        try (Connection es = esJdbc()) {
+            ResultSet rs = es.getMetaData().getCatalogs();
+            assertEquals(1, rs.getMetaData().getColumnCount());
+            assertTrue(rs.next());
+            assertEquals(LOCAL_CLUSTER_NAME, rs.getString(1));
+            assertTrue(rs.next());
+            assertEquals(REMOTE_CLUSTER_NAME, rs.getString(1));
+            assertFalse(rs.next());
+        }
+    }
+}

x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/CliSecurityIT.java

@@ -165,18 +165,19 @@ public void expectDescribe(Map<String, List<String>> columns, String user) throw
         public void expectShowTables(List<String> tables, String user) throws Exception {
             try (EmbeddedCli cli = new EmbeddedCli(elasticsearchAddress(), true, userSecurity(user))) {
                 String tablesOutput = cli.command("SHOW TABLES");
+                assertThat(tablesOutput, containsString("catalog"));
                 assertThat(tablesOutput, containsString("name"));
                 assertThat(tablesOutput, containsString("type"));
                 assertThat(tablesOutput, containsString("kind"));
-                assertEquals("---------------+---------------+---------------", cli.readLine());
+                assertEquals("---------------+---------------+---------------+---------------", cli.readLine());
                 for (String table : tables) {
                     String line = null;
                     /*
                      * Security automatically creates either a `.security` or a
                      * `.security6` index but it might not have created the index
                      * by the time the test runs.
                      */
-                    while (line == null || line.startsWith(".security")) {
+                    while (line == null || line.contains("|.security")) {
                         line = cli.readLine();
                     }
                     assertThat(line, containsString(table));

x-pack/plugin/sql/qa/server/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/RestSqlSecurityIT.java

@@ -143,6 +143,7 @@ public void expectDescribe(Map<String, List<String>> columns, String user) throw
         public void expectShowTables(List<String> tables, String user) throws Exception {
             String mode = randomMode();
             List<Object> columns = new ArrayList<>();
+            columns.add(columnInfo(mode, "catalog", "keyword", JDBCType.VARCHAR, 32766));
             columns.add(columnInfo(mode, "name", "keyword", JDBCType.VARCHAR, 32766));
             columns.add(columnInfo(mode, "type", "keyword", JDBCType.VARCHAR, 32766));
             columns.add(columnInfo(mode, "kind", "keyword", JDBCType.VARCHAR, 32766));
@@ -151,6 +152,7 @@ public void expectShowTables(List<String> tables, String user) throws Exception
             List<List<String>> rows = new ArrayList<>();
             for (String table : tables) {
                 List<String> fields = new ArrayList<>();
+                fields.add("integTest"); // gradle defined
                 fields.add(table);
                 fields.add("TABLE");
                 fields.add("INDEX");
@@ -167,7 +169,7 @@ public void expectShowTables(List<String> tables, String user) throws Exception
              */
             @SuppressWarnings("unchecked")
             List<List<String>> rowsNoSecurity = ((List<List<String>>) actual.get("rows")).stream()
-                .filter(ls -> ls.get(0).startsWith(".security") == false)
+                .filter(ls -> ls.get(1).startsWith(".security") == false)
                 .collect(Collectors.toList());
             actual.put("rows", rowsNoSecurity);
             assertResponse(expected, actual);