Skip to content

Commit 10b54a7

Browse files
authored
Merge pull request #354 from cipherstash/chore/update-cipherstash-client
chore: update cipherstash-client to 0.32.2
2 parents e12a527 + 18114c0 commit 10b54a7

17 files changed

Lines changed: 801 additions & 117 deletions

File tree

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ debug = true
4343

4444
[workspace.dependencies]
4545
sqltk = { version = "0.10.0" }
46-
cipherstash-client = { version = "0.31.1" }
47-
cts-common = { version = "0.4.0" }
46+
cipherstash-client = { version = "0.32.2" }
47+
cts-common = { version = "0.4.1" }
4848

4949
thiserror = "2.0.9"
5050
tokio = { version = "1.44.2", features = ["full"] }

mise.local.example.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CS_CLIENT_KEY = "client-key"
1515
CS_CLIENT_ID = "client-id"
1616

1717
# The release of EQL that the proxy tests will use and releases will be built with
18-
CS_EQL_VERSION = "eql-2.1.8"
18+
CS_EQL_VERSION = "eql-2.2.1"
1919

2020
# TLS variables are required for providing TLS to Proxy's clients.
2121
# CS_TLS__TYPE can be either "Path" or "Pem" (case-sensitive).

mise.toml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,39 @@ run = """
174174
cargo nextest run --no-fail-fast --nocapture -p cipherstash-proxy-integration
175175
"""
176176

177+
[tasks."test:integration:setup:tls"]
178+
description = "Setup for TLS integration tests: preflight, postgres, proxy"
179+
run = """
180+
set -e
181+
182+
echo
183+
echo '###############################################'
184+
echo '# Preflight'
185+
echo '###############################################'
186+
echo
187+
188+
mise run test:integration:preflight
189+
190+
echo
191+
echo '###############################################'
192+
echo '# Setup'
193+
echo '###############################################'
194+
echo
195+
196+
mise --env tls run postgres:setup
197+
198+
echo
199+
echo '###############################################'
200+
echo '# Start Proxy'
201+
echo '###############################################'
202+
echo
203+
204+
mise --env tls run proxy:up proxy-tls --extra-args "--detach --wait"
205+
mise --env tls run test:wait_for_postgres_to_quack --port 6432 --max-retries 20 --tls
206+
"""
207+
177208
[tasks."test:integration:without_multitenant"]
178-
description = "Runs integration tests excluding multitenant"
209+
description = "Runs integration tests excluding multitenant (run test:integration:setup:tls first for standalone use)"
179210
run = """
180211
cargo nextest run --no-fail-fast --nocapture -E 'package(cipherstash-proxy-integration) and not test(multitenant)'
181212
"""

0 commit comments

Comments
 (0)