Skip to content

Commit e635745

Browse files
committed
chore(eql): Update to use EQL 2.0 configuration table
1 parent cc3f9bf commit e635745

7 files changed

Lines changed: 9 additions & 10 deletions

File tree

docs/getting-started/schema-example.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TRUNCATE TABLE cs_configuration_v1;
1+
TRUNCATE TABLE public.eql_v1_configuration;
22

33
-- Exciting cipherstash table
44
DROP TABLE IF EXISTS users;

packages/cipherstash-proxy/src/encrypt/config/manager.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ pub async fn load_encrypt_config(config: &DatabaseConfig) -> Result<EncryptConfi
195195
}
196196
}
197197
}
198-
199198
fn configuration_table_not_found(e: &tokio_postgres::Error) -> bool {
200199
let msg = e.to_string();
201-
msg.contains("cs_configuration_v1") && msg.contains("does not exist")
200+
msg.contains("eql_v1_configuration") && msg.contains("does not exist")
202201
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SELECT data FROM cs_configuration_v1 WHERE state = 'active' LIMIT 1;
1+
SELECT data FROM public.eql_v1_configuration WHERE state = 'active' LIMIT 1;

tests/benchmark/sql/benchmark-schema.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TRUNCATE TABLE cs_configuration_v1;
1+
TRUNCATE TABLE public.eql_v1_configuration;
22

33
DROP TABLE IF EXISTS benchmark_plaintext;
44
CREATE TABLE benchmark_plaintext (

tests/sql/schema-uninstall.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DROP TABLE IF EXISTS cs_configuration_v1;
1+
DROP TABLE IF EXISTS public.eql_v1_configuration;
22

33
-- Regular old table
44
DROP TABLE IF EXISTS plaintext;

tests/sql/schema.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TRUNCATE TABLE cs_configuration_v1;
1+
TRUNCATE TABLE public.eql_v1_configuration;
22

33
-- Regular old table
44
DROP TABLE IF EXISTS plaintext;

tests/tasks/test/integration/psql-passthrough.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ EOF
1717

1818
# Confirm that there is indeed no config
1919
set +e
20-
OUTPUT="$(docker exec -i postgres${CONTAINER_SUFFIX} psql 'postgresql://cipherstash:password@proxy:6432/cipherstash?sslmode=disable' --command 'SELECT * FROM cs_configuration_v1' 2>&1)"
20+
OUTPUT="$(docker exec -i postgres${CONTAINER_SUFFIX} psql 'postgresql://cipherstash:password@proxy:6432/cipherstash?sslmode=disable' --command 'SELECT * FROM eql_v1_configuration' 2>&1)"
2121
retval=$?
22-
if echo ${OUTPUT} | grep -v 'relation "cs_configuration_v1" does not exist'; then
23-
echo "error: did not see string in output: \"relation "cs_configuration_v1" does not exist\""
22+
if echo ${OUTPUT} | grep -v 'relation "eql_v1_configuration" does not exist'; then
23+
echo "error: did not see string in output: \"relation "eql_v1_configuration" does not exist\""
2424
exit 1
2525
fi
2626

0 commit comments

Comments
 (0)