???

Author: tobyhede

mise.toml

@@ -174,6 +174,18 @@ run = """
 cargo nextest run --no-fail-fast --nocapture -p cipherstash-proxy-integration
 """
 
+[tasks."test:integration:without_multitenant"]
+description = "Runs integration tests excluding multitenant"
+run = """
+cargo nextest run --no-fail-fast --nocapture -E 'package(cipherstash-proxy-integration) and not test(multitenant)'
+"""
+
+[tasks."test:integration:multitenant"]
+description = "Runs multitenant integration tests only"
+run = """
+cargo nextest run --no-fail-fast --nocapture -E 'package(cipherstash-proxy-integration) and test(multitenant)'
+"""
+
 [tasks."test:local:mapper"]
 alias = 'lm'
 description = "Runs test/s"
@@ -354,7 +366,7 @@ echo
 
 mise --env tls run proxy:up proxy-tls --extra-args "--detach --wait"
 mise --env tls run test:wait_for_postgres_to_quack --port 6432 --max-retries 20 --tls
-cargo nextest run --no-fail-fast --nocapture -E 'package(cipherstash-proxy-integration) and not test(multitenant)'
+mise run test:integration:without_multitenant
 mise --env tls run proxy:down
 
 echo
@@ -369,7 +381,7 @@ unset CS_DEFAULT_KEYSET_ID
 
 mise --env tls run proxy:up proxy-tls --extra-args "--detach --wait"
 mise --env tls run test:wait_for_postgres_to_quack --port 6432 --max-retries 20 --tls
-cargo nextest run --no-fail-fast --nocapture -E 'package(cipherstash-proxy-integration) and test(multitenant)'
+mise run test:integration:multitenant
 
 echo "'set CS_DEFAULT_KEYSET_ID = {{default_keyset_id}}'"
 export CS_DEFAULT_KEYSET_ID="{{default_keyset_id}}"

packages/cipherstash-proxy-integration/src/common.rs

@@ -217,20 +217,6 @@ fn get_database_port() -> u16 {
         .unwrap_or(PG_PORT)
 }
 
-/// Query directly from PostgreSQL, bypassing the proxy.
-/// Uses CS_DATABASE__HOST and CS_DATABASE__PORT to ensure same DB as proxy.
-pub async fn query_direct<T>(sql: &str) -> Vec<T>
-where
-    T: for<'a> tokio_postgres::types::FromSql<'a>,
-{
-    let port = get_database_port();
-    let client = connect_with_tls(port).await;
-    let rows = client.query(sql, &[]).await.unwrap();
-    rows.iter().map(|row| row.get(0)).collect()
-}
-
-/// Query directly from PostgreSQL with a parameter, bypassing the proxy.
-/// Uses CS_DATABASE__HOST and CS_DATABASE__PORT to ensure same DB as proxy.
 pub async fn query_direct_by<T>(sql: &str, param: &(dyn ToSql + Sync)) -> Vec<T>
 where
     T: for<'a> tokio_postgres::types::FromSql<'a>,