Merge pull request #222 from cipherstash/feat/proxy-eql-v2-integration

Integration branch for Proxy + EQL V2

Author: tobyhede

.github/workflows/benchmark.yml

@@ -34,6 +34,7 @@ jobs:
           CS_DEFAULT_KEYSET_ID: ${{ secrets.CS_DEFAULT_KEYSET_ID }}
           CS_CLIENT_ID: ${{ secrets.CS_CLIENT_ID }}
           CS_CLIENT_KEY: ${{ secrets.CS_CLIENT_KEY }}
+          CS_REGION: "ap-southeast-2.aws"
           RUST_BACKTRACE: "1"
         run: mise run benchmark:continuous
       # Download previous benchmark result from cache (if exists)

.github/workflows/test.yml

@@ -21,11 +21,14 @@ jobs:
       - run: |
           mise run postgres:up --extra-args "--detach --wait"
       - env:
+          # REMEMBER TO ADD ENVIRONMENT VARIABLES TO tests/docker-compose.yml
+          # The tests/docker-compose.yml config passes the ENV vars into the container
           CS_WORKSPACE_ID: ${{ secrets.CS_WORKSPACE_ID }}
           CS_CLIENT_ACCESS_KEY: ${{ secrets.CS_CLIENT_ACCESS_KEY }}
           CS_DEFAULT_KEYSET_ID: ${{ secrets.CS_DEFAULT_KEYSET_ID }}
           CS_CLIENT_ID: ${{ secrets.CS_CLIENT_ID }}
           CS_CLIENT_KEY: ${{ secrets.CS_CLIENT_KEY }}
+          CS_REGION: "ap-southeast-2.aws"
 
           RUST_BACKTRACE: "1"
         run: |

.gitignore

@@ -4,17 +4,16 @@
 /cipherstash-proxy.local.toml
 mise.local.toml
 tests/pg/data**
-tests/sql/cipherstash-encrypt.sql
-tests/sql/cipherstash-encrypt-uninstall.sql
 .vscode
 
 rust-toolchain.toml
 .cargo/config.toml
 
 # release artifacts
 /cipherstash-proxy
-/cipherstash-eql.sql
 /packages/cipherstash-proxy/eql-version-at-build-time.txt
+/cipherstash-encrypt.sql
+/cipherstash-encrypt-uninstall.sql
 
 # credentials for local dev
 .env.proxy.docker