Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ debug = true

[workspace.dependencies]
sqltk = { version = "0.10.0" }
cipherstash-client = { version = "0.31.1" }
cts-common = { version = "0.4.0" }
cipherstash-client = { version = "0.32.2" }
cts-common = { version = "0.4.1" }

thiserror = "2.0.9"
tokio = { version = "1.44.2", features = ["full"] }
Expand Down
2 changes: 1 addition & 1 deletion mise.local.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CS_CLIENT_KEY = "client-key"
CS_CLIENT_ID = "client-id"

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

# TLS variables are required for providing TLS to Proxy's clients.
# CS_TLS__TYPE can be either "Path" or "Pem" (case-sensitive).
Expand Down
33 changes: 32 additions & 1 deletion mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,39 @@ run = """
cargo nextest run --no-fail-fast --nocapture -p cipherstash-proxy-integration
"""

[tasks."test:integration:setup:tls"]
description = "Setup for TLS integration tests: preflight, postgres, proxy"
run = """
set -e

echo
echo '###############################################'
echo '# Preflight'
echo '###############################################'
echo

mise run test:integration:preflight

echo
echo '###############################################'
echo '# Setup'
echo '###############################################'
echo

mise --env tls run postgres:setup

echo
echo '###############################################'
echo '# Start Proxy'
echo '###############################################'
echo

mise --env tls run proxy:up proxy-tls --extra-args "--detach --wait"
mise --env tls run test:wait_for_postgres_to_quack --port 6432 --max-retries 20 --tls
"""

[tasks."test:integration:without_multitenant"]
description = "Runs integration tests excluding multitenant"
description = "Runs integration tests excluding multitenant (run test:integration:setup:tls first for standalone use)"
run = """
cargo nextest run --no-fail-fast --nocapture -E 'package(cipherstash-proxy-integration) and not test(multitenant)'
"""
Expand Down
Loading