Run psql inside containers

And use idiomatic postgres environment variable names

Author: auxesis

mise.toml

@@ -13,9 +13,8 @@ includes = [
 ]
 
 [env]
-# Default configuration for running cipherstash-proxy out of the box
-# CS_DATABASE__NAME = "cipherstash"
-# CS_DATABASE__USERNAME = "cipherstash"
-# CS_DATABASE__PASSWORD = "password"
-# CS_DATABASE__HOST = "localhost"
-# CS_DATABASE__PORT = "5532"
+POSTGRES_DB = "cipherstash"
+POSTGRES_USER = "cipherstash"
+POSTGRES_PASSWORD = "password"
+POSTGRES_HOST = "localhost"
+POSTGRES_PORT = "5532"

tasks/reset.sh

@@ -3,10 +3,11 @@
 
 set -euxo pipefail
 
-connection_url=postgresql://${CS_DATABASE__USERNAME:-$USER}:${CS_DATABASE__PASSWORD}@localhost:$CS_DATABASE__PORT/$CS_DATABASE__NAME
+connection_url=postgresql://${POSTGRES_USER:-$USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+container_name=postgres-${POSTGRES_VERSION}
 
 # Uninstall
-psql ${connection_url} -f release/cipherstash-encrypt-uninstall.sql
+cat release/cipherstash-encrypt-uninstall.sql | docker exec -i ${container_name} psql ${connection_url} -f-
 
 # Install
-psql ${connection_url} -f release/cipherstash-encrypt.sql
+cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f-

tasks/test.sh

@@ -8,11 +8,12 @@ set -euxo pipefail
 mise run build
 mise run reset
 
-connection_url=postgresql://${CS_DATABASE__USERNAME:-$USER}:@localhost:$CS_DATABASE__PORT/$CS_DATABASE__NAME
+connection_url=postgresql://${POSTGRES_USER:-$USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+container_name=postgres-${POSTGRES_VERSION}
 
 # # tests
 # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/core.sql
 # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/core-functions.sql
 # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/config.sql
 # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/encryptindex.sql
-PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/operators.sql
+cat tests/operators.sql | docker exec -i ${container_name} psql ${connection_url} -f-