wip

Author: tobyhede

mise.toml

@@ -377,10 +377,8 @@ echo '###############################################'
 echo '# Test: Showcase'
 echo '###############################################'
 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
-RUST_BACKTRACE=full cargo run -p showcase
-mise --env tls run proxy:down
+
+mise run test:integration:showcase
 
 echo
 echo '###############################################'
@@ -637,6 +635,15 @@ else
 fi
 """
 
+[tasks."test:integration:showcase"]
+description = "Run Showcase integration test"
+run = """
+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
+RUST_BACKTRACE=full cargo run -p showcase
+mise --env tls run proxy:down
+"""
+
 [tasks.release]
 description = "Publish release artifacts"
 depends = ["release:docker"]

packages/cipherstash-proxy/src/postgresql/context/mod.rs

@@ -311,6 +311,10 @@ where
     }
 
     pub fn set_schema_changed(&self) {
+        debug!(target: CONTEXT,
+            client_id = self.client_id,
+            msg = "Schema changed"
+        );
         let _ = self.schema_changed.write().map(|mut guard| *guard = true);
     }
 
@@ -510,15 +514,15 @@ where
     }
 
     pub async fn reload_schema(&self) {
-        match self.reload_sender.send(ReloadCommand::DatabaseSchema) {
-            Ok(_) => self.set_schema_changed(),
-            Err(err) => {
+        let _ = self
+            .reload_sender
+            .send(ReloadCommand::DatabaseSchema)
+            .inspect_err(|err| {
                 error!(
                     msg = "Database schema could not be reloaded",
                     error = err.to_string()
-                );
-            }
-        }
+                )
+            });
     }
 
     pub fn is_passthrough(&self) -> bool {

packages/cipherstash-proxy/src/postgresql/frontend.rs

@@ -746,10 +746,6 @@ where
         let schema_changed = eql_mapper::collect_ddl(self.context.get_table_resolver(), statement);
 
         if schema_changed {
-            debug!(target: MAPPER,
-                client_id = self.context.client_id,
-                msg = "schema changed"
-            );
             self.context.set_schema_changed();
         }
     }

packages/cipherstash-proxy/src/proxy/mod.rs

@@ -9,7 +9,7 @@ use crate::{
 };
 use cipherstash_client::encryption::Plaintext;
 use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
-use tracing::warn;
+use tracing::{debug, warn};
 
 mod encrypt_config;
 mod schema;
@@ -99,6 +99,7 @@ impl Proxy {
 
     pub async fn receive(&mut self) {
         while let Some(command) = self.reload_receiver.recv().await {
+            debug!(msg = "ReloadCommand received", ?command);
             match command {
                 ReloadCommand::DatabaseSchema => self.schema_manager.reload().await,
                 ReloadCommand::EncryptSchema => self.encrypt_config_manager.reload().await,

packages/showcase/src/data.rs

@@ -8,6 +8,7 @@ use crate::{
 };
 
 pub async fn insert_test_data() {
+    println!("Insert test data");
     let medications = [
         Medication::new(
             "550e8400-e29b-41d4-a716-446655440001",
@@ -496,8 +497,6 @@ pub async fn clear() {
     //
     // Deleting rows from the eql_v2_configuration table is not officially supported due to the risk of data loss.
     //
-    // TODO: EQL should support safe removal of config rows - at least in some kind of "test" or non-production
-    // mode.
     let sql = r#"
         DELETE
           FROM public.eql_v2_configuration

packages/showcase/src/main.rs

@@ -66,17 +66,18 @@ use crate::{
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🩺 Healthcare Database Showcase - EQL v2 Searchable Encryption");
+    println!("============================================================");
+
     trace();
     clear().await;
+
     setup_schema().await;
     insert_test_data().await;
     create_enhanced_jsonb_test_data().await;
 
     let client = connect_with_tls(PROXY).await;
 
-    println!("🩺 Healthcare Database Showcase - EQL v2 Searchable Encryption");
-    println!("============================================================");
-
     // Query 1: Get the Aspirin medication ID
     let aspirin_id_sql = "SELECT id FROM medications WHERE name = 'Aspirin';";
     let rows = client.query(aspirin_id_sql, &[]).await.unwrap();

packages/showcase/src/schema.rs

@@ -3,5 +3,6 @@ use crate::common::{reset_schema_to, PROXY};
 const SCHEMA: &str = include_str!("./schema.sql");
 
 pub async fn setup_schema() {
+    println!("Setup schema");
     reset_schema_to(SCHEMA, PROXY).await
 }