[graphql/rpc] add db url to server conn config (#14218)

Author: oxade

crates/sui-graphql-rpc/src/commands.rs

@@ -28,6 +28,9 @@ pub enum Command {
         /// Host to bind the server to
         #[clap(long)]
         host: Option<String>,
+        /// DB URL to connect to
+        #[clap(long)]
+        db_url: Option<String>,
         /// Path to TOML file containing configuration for service.
         #[clap(short, long)]
         config: Option<PathBuf>,

crates/sui-graphql-rpc/src/config.rs

@@ -5,6 +5,7 @@ use std::{collections::BTreeSet, path::PathBuf};
 
 use async_graphql::*;
 use serde::{Deserialize, Serialize};
+use std::env;
 
 use crate::functional_group::FunctionalGroup;
 
@@ -17,6 +18,7 @@ pub struct ConnectionConfig {
     pub(crate) port: u16,
     pub(crate) host: String,
     pub(crate) rpc_url: String,
+    pub(crate) db_url: String,
 }
 
 /// Configuration on features supported by the RPC, passed in a TOML-based file.
@@ -52,12 +54,18 @@ pub struct Experiments {
 }
 
 impl ConnectionConfig {
-    pub fn new(port: Option<u16>, host: Option<String>, rpc_url: Option<String>) -> Self {
+    pub fn new(
+        port: Option<u16>,
+        host: Option<String>,
+        rpc_url: Option<String>,
+        db_url: Option<String>,
+    ) -> Self {
         let default = Self::default();
         Self {
             port: port.unwrap_or(default.port),
             host: host.unwrap_or(default.host),
             rpc_url: rpc_url.unwrap_or(default.rpc_url),
+            db_url: db_url.unwrap_or(default.db_url),
         }
     }
 }
@@ -101,6 +109,8 @@ impl Default for ConnectionConfig {
             port: 8000,
             host: "127.0.0.1".to_string(),
             rpc_url: "https://fullnode.testnet.sui.io:443/".to_string(),
+            db_url: env::var("PG_DB_URL")
+                .expect("PG_DB_URL must be set if db_url not provided in config"),
         }
     }
 }

crates/sui-graphql-rpc/src/main.rs

@@ -28,8 +28,9 @@ async fn main() {
             port,
             host,
             config,
+            db_url,
         } => {
-            let conn = ConnectionConfig::new(port, host, rpc_url);
+            let conn = ConnectionConfig::new(port, host, rpc_url, db_url);
             let service_config = service_config(config);
 
             println!("Starting server...");

crates/sui-graphql-rpc/src/server/simple_server.rs

@@ -14,7 +14,6 @@ use crate::server::builder::ServerBuilder;
 
 use prometheus::Registry;
 use std::default::Default;
-use std::env;
 use std::net::SocketAddr;
 use std::sync::Arc;
 use sui_json_rpc::name_service::NameServiceConfig;
@@ -31,7 +30,7 @@ pub async fn start_example_server(conn: ConnectionConfig, service_config: Servic
     let data_loader = lru_cache_data_loader(&sui_sdk_client_v0).await;
 
     // TODO (wlmyng): Allow users to choose which data sources to back graphql
-    let db_url = env::var("PG_DB_URL").expect("PG_DB_URL must be set");
+    let db_url = conn.db_url;
     let pg_conn_pool = PgManager::new(db_url, None)
         .map_err(|e| {
             println!("Failed to create pg connection pool: {}", e);