Skip to content

Commit dce33e4

Browse files
authored
Merge pull request #179 from cipherstash/james/cip-1290-lock-proxy-eql-version
feat(proxy): lock EQL to specific version via `CS_EQL_VERSION`
2 parents 59ebe52 + 932f1ba commit dce33e4

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

mise.local.example.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ CS_DEFAULT_KEYSET_ID = "default-keyset-id"
1414
CS_CLIENT_KEY = "client-key"
1515
CS_CLIENT_ID = "client-id"
1616

17+
# The release of EQL that the proxy tests will use and releases will be built with
18+
CS_EQL_VERSION="eql-0.5.4"
1719

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

mise.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ CS_DATABASE__PORT = "5532"
2222
CS_PROXY__HOST = "proxy"
2323
# Misc
2424
DOCKER_CLI_HINTS = "false" # Please don't show us What's Next.
25+
CS_EQL_VERSION="eql-0.5.4"
2526

2627
[tools]
2728
"cargo:cargo-binstall" = "latest"
@@ -466,15 +467,15 @@ outputs = [
466467
run = """
467468
# install script
468469
if [ -z "$CS_EQL_PATH" ]; then
469-
curl -sLo sql/cipherstash-encrypt.sql https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql
470+
curl -sLo sql/cipherstash-encrypt.sql https://github.com/cipherstash/encrypt-query-language/releases/download/${CS_EQL_VERSION}/cipherstash-encrypt.sql
470471
else
471472
echo "Using EQL: ${CS_EQL_PATH}"
472473
cp "$CS_EQL_PATH" sql/cipherstash-encrypt.sql
473474
fi
474475
475476
# uninstall script
476477
if [ -z "$CS_EQL_UNINSTALL_PATH" ]; then
477-
curl -sLo sql/cipherstash-encrypt-uninstall.sql https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt-uninstall.sql
478+
curl -sLo sql/cipherstash-encrypt-uninstall.sql https://github.com/cipherstash/encrypt-query-language/releases/download/${CS_EQL_VERSION}/cipherstash-encrypt-uninstall.sql
478479
else
479480
echo "Using EQL: ${CS_EQL_PATH}"
480481
cp "$CS_EQL_UNINSTALL_PATH" sql/cipherstash-encrypt-uninstall.sql
@@ -545,7 +546,7 @@ description = "Fetch the EQL installation script"
545546
run = """
546547
if [ ! -e "cipherstash-eql.sql" ]; then
547548
echo "Fetching: cipherstash-eql.sql"
548-
curl -sLo cipherstash-eql.sql https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql
549+
curl -sLo cipherstash-eql.sql https://github.com/cipherstash/encrypt-query-language/releases/download/${CS_EQL_VERSION}/cipherstash-encrypt.sql
549550
else
550551
echo "Prefetched: cipherstash-eql.sql"
551552
fi

0 commit comments

Comments
 (0)