chore: Split postgres url in to parts.

helm/templates/query-service-config.yaml

@@ -22,6 +22,11 @@ data:
           type = zookeeper
           connectionString = "{{ .Values.queryServiceConfig.data.zookeeperConnectionString }}"
         }
+        {
+          type = postgres
+          connectionString = "{{ .Values.queryServiceConfig.data.postgresConnectionString }}"
+          user = "{{ .Values.queryServiceConfig.data.postgresUser }}"
+        }
       ]
       {{- if or .Values.handlers .Values.extraHandlers }}
       queryRequestHandlersConfig = [

helm/values.yaml

@@ -66,6 +66,8 @@ queryServiceConfig:
   name: query-service-config
   data:
     zookeeperConnectionString: zookeeper:2181/pinot/my-views
+    postgresConnectionString: jdbc:postgresql://postgres:5432/postgres
+    postgresUser: postgres
     tenantColumnName: tenant_id
     attributeClient:
       host: attribute-service

query-service-impl/src/main/java/org/hypertrace/core/query/service/QueryServiceConfig.java

@@ -2,6 +2,7 @@
 
 import com.typesafe.config.Config;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.Value;
 import lombok.experimental.NonFinal;
@@ -62,12 +63,26 @@ private RequestHandlerConfig(Config config) {
   public static class RequestHandlerClientConfig {
     private static final String CONFIG_PATH_TYPE = "type";
     private static final String CONFIG_PATH_CONNECTION_STRING = "connectionString";
+    private static final String CONFIG_PATH_USER = "user";
+    private static final String CONFIG_PATH_PASSWORD = "password";
     String type;
     String connectionString;
+    Optional<String> user;
+    Optional<String> password;
 
     private RequestHandlerClientConfig(Config config) {
       this.type = config.getString(CONFIG_PATH_TYPE);
       this.connectionString = config.getString(CONFIG_PATH_CONNECTION_STRING);
+      if (config.hasPath(CONFIG_PATH_USER)) {
+        this.user = Optional.of(config.getString(CONFIG_PATH_USER));
+      } else {
+        this.user = Optional.empty();
+      }
+      if (config.hasPath(CONFIG_PATH_PASSWORD)) {
+        this.password = Optional.of(config.getString(CONFIG_PATH_PASSWORD));
+      } else {
+        this.password = Optional.empty();
+      }
     }
   }
 

query-service-impl/src/main/java/org/hypertrace/core/query/service/postgres/PostgresClientFactory.java

@@ -7,6 +7,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.concurrent.ConcurrentHashMap;
+import org.hypertrace.core.query.service.QueryServiceConfig.RequestHandlerClientConfig;
 
 /*
  * Factory to create PostgresClient based on postgres jdbc connection.
@@ -23,12 +24,12 @@ public class PostgresClientFactory {
   private PostgresClientFactory() {}
 
   // Create a Postgres Client.
-  public static PostgresClient createPostgresClient(String postgresCluster, String path)
-      throws SQLException {
+  public static PostgresClient createPostgresClient(
+      String postgresCluster, RequestHandlerClientConfig clientConfig) throws SQLException {
     if (!get().containsClient(postgresCluster)) {
       synchronized (get()) {
         if (!get().containsClient(postgresCluster)) {
-          get().addPostgresClient(postgresCluster, new PostgresClient(path));
+          get().addPostgresClient(postgresCluster, new PostgresClient(clientConfig));
         }
       }
     }
@@ -59,7 +60,12 @@ public static class PostgresClient {
 
     private final Connection connection;
 
-    private PostgresClient(String url) throws SQLException {
+    private PostgresClient(RequestHandlerClientConfig clientConfig) throws SQLException {
+      String user = clientConfig.getUser().orElseThrow(IllegalArgumentException::new);
+      String password = clientConfig.getUser().orElseThrow(IllegalArgumentException::new);
+      String url =
+          String.format(
+              "%s?user=%s&password=%s", clientConfig.getConnectionString(), user, password);
       LOG.info(
           "Trying to create a Postgres client connected to postgres server using url: {}", url);
       this.connection = DriverManager.getConnection(url);

query-service-impl/src/main/java/org/hypertrace/core/query/service/postgres/PostgresRequestHandlerBuilder.java

@@ -34,8 +34,7 @@ public RequestHandler build(RequestHandlerConfig config) {
                         "Client config requested but not registered: " + config.getClientConfig()));
 
     try {
-      PostgresClientFactory.createPostgresClient(
-          config.getName(), clientConfig.getConnectionString());
+      PostgresClientFactory.createPostgresClient(config.getName(), clientConfig);
     } catch (SQLException ex) {
       throw new RuntimeException(ex);
     }

query-service/src/integrationTest/java/org/hypertrace/core/query/service/htqueries/HTPostgresQueriesTest.java

@@ -111,9 +111,8 @@ public static void setup() throws Exception {
 
     withEnvironmentVariable(
             "POSTGRES_CONNECT_STR",
-            "jdbc:postgresql://localhost:"
-                + postgresqlService.getMappedPort(5432).toString()
-                + "/postgres?user=postgres&password=postgres")
+            String.format(
+                "jdbc:postgresql://localhost:%s/postgres", postgresqlService.getMappedPort(5432)))
         .and("ATTRIBUTE_SERVICE_HOST_CONFIG", attributeService.getHost())
         .and("ATTRIBUTE_SERVICE_PORT_CONFIG", attributeService.getMappedPort(9012).toString())
         .execute(

query-service/src/integrationTest/resources/configs/query-service/postgres/application.conf

@@ -15,8 +15,9 @@ service.config = {
   clients = [
     {
       type = postgres
-      connectionString = "jdbc:postgresql://localhost:5432/traceable?user=postgres&password=postgres"
       connectionString = ${?POSTGRES_CONNECT_STR}
+      user = postgres
+      password = postgres
     }
   ]
   queryRequestHandlersConfig = [

query-service/src/main/resources/configs/common/application.conf

@@ -23,6 +23,15 @@ service.config = {
       connectionString = "localhost:2181/pinot/org-views"
       connectionString = ${?ZK_CONNECT_STR}
     }
+    {
+      type = postgres
+      connectionString = "jdbc:postgresql://localhost:5432/postgres"
+      connectionString = ${?POSTGRES_CONNECT_STR}
+      user = postgres
+      user = ${?POSTGRES_USER}
+      password = postgres
+      password = ${?POSTGRES_PASSWORD}
+    }
   ]
   queryRequestHandlersConfig = [
     # Update runtime configuration in helm/values.yaml. Only local test/debug needs the following