Merge pull request #382 from cipherstash/proxy-2.1.24-alpha.1

fix(deps): bump cipherstash-client to 0.34.0-alpha.4

Author: tobyhede

Cargo.lock

@@ -43,8 +43,8 @@ debug = true
 
 [workspace.dependencies]
 sqltk = { version = "0.10.0" }
-cipherstash-client = { version = "0.33.2" }
-cts-common = { version = "0.4.1" }
+cipherstash-client = { version = "0.34.0-alpha.4" }
+cts-common = { version = "0.34.0-alpha.4" }
 
 thiserror = "2.0.9"
 tokio = { version = "1.44.2", features = ["full"] }

Cargo.toml

@@ -501,29 +501,14 @@ Certificates are generated by `mkcert`, and live in `tests/tls/`.
 
 #### Configuration: development endpoints
 
+ZeroKMS and CTS host endpoints can be configured for local development using environment variables.
 
-ZeroKMS and CTS host endpoints can be configured for local development.
+These are read directly by `cipherstash-client` and do not require proxy configuration:
 
-Env variables are `CS_DEVELOPMENT__ZEROKMS_HOST` and `CS_DEVELOPMENT__CTS_HOST`.
-
-
-```toml
-
-[development]
-# ZeroKMS host
-# Optional
-# Defaults to CipherStash Production ZeroKMS host
-# Env: CS_DEVELOPMENT__ZEROKMS_HOST
-zerokms_host = "1.1.1.1"
-
-
-# CTS host
-# Optional
-# Defaults to CipherStash Production CTS host
-# Env: CS_DEVELOPMENT__CTS_HOST
-cts_host = "1.1.1.1"
-
-```
+| Variable | Description |
+|---|---|
+| `CS_ZEROKMS_HOST` | Override ZeroKMS endpoint (default: resolved from JWT `services` claim) |
+| `CS_CTS_HOST` | Override CTS auth endpoint (default: resolved from workspace CRN region) |
 
 
 

DEVELOPMENT.md

@@ -24,6 +24,6 @@ workspace_crn = "workspace_crn"
 client_access_key = "client_access_key"
 
 [encrypt]
-default_keyset_id = "default_keyset_id"
-client_id = "client_id"
+default_keyset_id = "00000000-0000-0000-0000-000000000000"
+client_id = "00000000-0000-0000-0000-000000000000"
 client_key = "client_key"

cipherstash-proxy-example.toml

@@ -43,6 +43,8 @@ services:
       - CS_PROMETHEUS__ENABLED=${CS_PROMETHEUS__ENABLED:-true}
       - CS_DATABASE__INSTALL_EQL=true            # install EQL into the PostgreSQL database
       - CS_DATABASE__INSTALL_EXAMPLE_SCHEMA=true # install example schema into the PostgreSQL database
+      - CS_CTS_HOST=${CS_CTS_HOST:-}
+      - CS_ZEROKMS_HOST=${CS_ZEROKMS_HOST:-}
     networks:
       - cipherstash
 

docker-compose.yml

@@ -55,8 +55,8 @@ tokio-util = { version = "0.7.13", features = ["rt"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 uuid = { version = "1.11.0", features = ["serde", "v4"] }
+vitaminc-protected = "0.1.0-pre4.2"
 x509-parser = "0.17.0"
-vitaminc-protected = "0.1.0-pre2"
 
 
 [dev-dependencies]