ci: connect to pg directly.

Author: tobyhede

mise.toml

@@ -323,8 +323,6 @@ echo
 mise --env tcp run postgres:setup
 mise --env tls run postgres:setup
 
-mise run test:integration:showcase
-
 echo
 echo '###############################################'
 echo '# Test: Prometheus'
@@ -366,7 +364,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
-mise run test:integration:without_multitenant
+mise --env tls run test:integration:without_multitenant
 mise --env tls run proxy:down
 
 echo
@@ -381,7 +379,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
-mise run test:integration:multitenant
+mise --env tls 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

@@ -8,6 +8,7 @@ use rustls::{
 use serde_json::Value;
 use std::sync::{Arc, Once};
 use tokio_postgres::{types::ToSql, Client, NoTls, Row, SimpleQueryMessage};
+use tracing::info;
 use tracing_subscriber::{filter::Directive, EnvFilter, FmtSubscriber};
 
 pub const PROXY: u16 = 6432;
@@ -116,7 +117,7 @@ pub fn trace() {
 pub fn connection_config(port: u16) -> tokio_postgres::Config {
     let mut db_config = tokio_postgres::Config::new();
 
-    let host = std::env::var("CS_DATABASE__HOST").unwrap_or_else(|_| "localhost".to_string());
+    let host = "localhost".to_string();
     let name = "cipherstash".to_string();
     let username = "cipherstash".to_string();
     let password = "p@ssword".to_string();
@@ -222,6 +223,8 @@ where
     T: for<'a> tokio_postgres::types::FromSql<'a>,
 {
     let port = get_database_port();
+    info!(port);
+
     let client = connect_with_tls(port).await;
     let rows = client.query(sql, &[param]).await.unwrap();
     rows.iter().map(|row| row.get(0)).collect()