Fix tests and use postgres instead of H2

Author: prakhar10

gateway-ha/src/main/java/io/trino/gateway/ha/router/RoutingRulesManager.java

@@ -25,7 +25,7 @@
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.List;
 
@@ -47,7 +47,7 @@ public List<RoutingRule> getRoutingRules()
         ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
         ImmutableList.Builder<RoutingRule> routingRulesBuilder = ImmutableList.builder();
         try {
-            String content = Files.readString(Paths.get(rulesConfigPath), UTF_8);
+            String content = Files.readString(Path.of(rulesConfigPath), UTF_8);
             YAMLParser parser = new YAMLFactory().createParser(content);
             while (parser.nextToken() != null) {
                 RoutingRule routingRule = yamlReader.readValue(parser, RoutingRule.class);
@@ -65,7 +65,7 @@ public synchronized List<RoutingRule> updateRoutingRule(RoutingRule routingRule)
     {
         ImmutableList.Builder<RoutingRule> updatedRoutingRulesBuilder = ImmutableList.builder();
         List<RoutingRule> currentRoutingRulesList = getRoutingRules();
-        try (FileChannel fileChannel = FileChannel.open(Paths.get(rulesConfigPath), StandardOpenOption.WRITE, StandardOpenOption.READ);
+        try (FileChannel fileChannel = FileChannel.open(Path.of(rulesConfigPath), StandardOpenOption.WRITE, StandardOpenOption.READ);
                 FileLock lock = fileChannel.lock()) {
             ObjectMapper yamlWriter = new ObjectMapper(new YAMLFactory());
             StringBuilder yamlContent = new StringBuilder();
@@ -79,7 +79,7 @@ public synchronized List<RoutingRule> updateRoutingRule(RoutingRule routingRule)
                     updatedRoutingRulesBuilder.add(rule);
                 }
             }
-            Files.writeString(Paths.get(rulesConfigPath), yamlContent.toString(), UTF_8);
+            Files.writeString(Path.of(rulesConfigPath), yamlContent.toString(), UTF_8);
             lock.release();
         }
         catch (IOException e) {

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingAPI.java

@@ -28,8 +28,10 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
+import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.TrinoContainer;
 
+import java.io.File;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,6 +42,7 @@ final class TestRoutingAPI
 {
     private final OkHttpClient httpClient = new OkHttpClient();
     private TrinoContainer trino;
+    private final PostgreSQLContainer postgresql = new PostgreSQLContainer("postgres:16");
     int routerPort = 21001 + (int) (Math.random() * 1000);
     int backendPort;
 
@@ -53,11 +56,13 @@ void setup()
 
         backendPort = trino.getMappedPort(8080);
 
+        postgresql.start();
+
         // seed database
-        HaGatewayTestUtils.TestConfig testConfig =
-                HaGatewayTestUtils.buildGatewayConfigAndSeedDb(routerPort, "test-config-with-routing-rules-api.yml");
+        File testConfigFile =
+                HaGatewayTestUtils.buildGatewayConfig(postgresql, routerPort, "test-config-with-routing-rules-api.yml");
         // Start Gateway
-        String[] args = {testConfig.configFilePath()};
+        String[] args = {testConfigFile.getAbsolutePath()};
         HaGatewayLauncher.main(args);
         // Now populate the backend
         HaGatewayTestUtils.setUpBackend(

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingRulesManager.java

@@ -48,7 +48,7 @@ void testGetRoutingRules()
                         "airflow",
                         "if query from airflow, route to etl group",
                         null,
-                        List.of("result.put(\"routingGroup\", \"etl\")"),
+                        List.of("result.put(FileBasedRoutingGroupSelector.RESULTS_ROUTING_GROUP_KEY, \"etl\")"),
                         "request.getHeader(\"X-Trino-Source\") == \"airflow\" && (request.getHeader(\"X-Trino-Client-Tags\") == null || request.getHeader(\"X-Trino-Client-Tags\").isEmpty())"));
     }
 

gateway-ha/src/test/resources/test-config-with-routing-rules-api.yml

@@ -3,18 +3,10 @@ serverConfig:
   http-server.http.port: REQUEST_ROUTER_PORT
 
 dataStore:
-  jdbcUrl: jdbc:h2:DB_FILE_PATH
-  user: sa
-  password: sa
-  driver: org.h2.Driver
-
-modules:
-  - io.trino.gateway.ha.module.HaGatewayProviderModule
-  - io.trino.gateway.ha.module.ClusterStateListenerModule
-  - io.trino.gateway.ha.module.ClusterStatsMonitorModule
-
-managedApps:
-  - io.trino.gateway.ha.clustermonitor.ActiveClusterMonitor
+  jdbcUrl: POSTGRESQL_JDBC_URL
+  user: POSTGRESQL_USER
+  password: POSTGRESQL_PASSWORD
+  driver: org.postgresql.Driver
 
 clusterStatsConfiguration:
   monitorType: INFO_API