Skip to content

Commit 3140051

Browse files
authored
RUST-1408 Use orchestration-provided version of crypt_shared (#785)
1 parent d99b2ae commit 3140051

File tree

3 files changed

+2
-35
lines changed

3 files changed

+2
-35
lines changed

.evergreen/config.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ functions:
8585
export SSL=${SSL}
8686
export TOPOLOGY=${TOPOLOGY}
8787
export MONGODB_VERSION=${MONGODB_VERSION}
88-
export CRYPT_SHARED_VERSION=${CRYPT_SHARED_VERSION}
8988
9089
if [ "Windows_NT" != "$OS" ]; then
9190
ulimit -n 64000
@@ -473,20 +472,6 @@ functions:
473472
MONGO_OCSP_TESTS=1 \
474473
.evergreen/run-ocsp-test.sh
475474
476-
"fetch crypt_shared":
477-
- command: shell.exec
478-
params:
479-
shell: bash
480-
working_dir: "src"
481-
script: |
482-
${PREPARE_SHELL}
483-
if [ "${DISABLE_CRYPT_SHARED}" == "true" ]; then
484-
echo "crypt_shared is disabled, not fetching"
485-
else
486-
${PYTHON} ${DRIVERS_TOOLS}/.evergreen/mongodl.py --component=crypt_shared --version=${CRYPT_SHARED_VERSION} --out=./crypt_shared/
487-
ls -R ${PROJECT_DIRECTORY}/crypt_shared
488-
fi
489-
490475
"run kmip server":
491476
- command: shell.exec
492477
params:
@@ -508,7 +493,7 @@ functions:
508493
${PREPARE_SHELL}
509494
export ASYNC_RUNTIME=${ASYNC_RUNTIME}
510495
export CSFLE_TLS_CERT_DIR=$DRIVERS_TOOLS_X509
511-
export CSFLE_SHARED_LIB_PATH=$(.evergreen/find-crypt_shared.sh "$PROJECT_DIRECTORY/crypt_shared/lib/")
496+
export CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH}
512497
export DISABLE_CRYPT_SHARED=${DISABLE_CRYPT_SHARED}
513498
export TLS_FEATURE=${TLS_FEATURE}
514499
export PYTHON=${PYTHON}
@@ -1184,7 +1169,6 @@ tasks:
11841169
tags: ["csfle"]
11851170
commands:
11861171
- func: "install junit dependencies"
1187-
- func: "fetch crypt_shared"
11881172
- func: "bootstrap mongo-orchestration"
11891173
- func: "run kmip server"
11901174
- func: "run csfle tests"
@@ -1576,7 +1560,6 @@ axes:
15761560
display_name: "latest"
15771561
variables:
15781562
MONGODB_VERSION: "latest"
1579-
CRYPT_SHARED_VERSION: "latest"
15801563
- id: "rapid"
15811564
display_name: "rapid"
15821565
variables:
@@ -1585,7 +1568,6 @@ axes:
15851568
display_name: "6.0"
15861569
variables:
15871570
MONGODB_VERSION: "6.0"
1588-
CRYPT_SHARED_VERSION: "6.0.0"
15891571
- id: "5.0"
15901572
display_name: "5.0"
15911573
variables:

.evergreen/find-crypt_shared.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/test/csfle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ lazy_static! {
151151
map
152152
};
153153
static ref EXTRA_OPTIONS: Document =
154-
doc! { "cryptSharedLibPath": std::env::var("CSFLE_SHARED_LIB_PATH").unwrap() };
154+
doc! { "cryptSharedLibPath": std::env::var("CRYPT_SHARED_LIB_PATH").unwrap() };
155155
static ref KV_NAMESPACE: Namespace = Namespace::from_str("keyvault.datakeys").unwrap();
156156
static ref DISABLE_CRYPT_SHARED: bool =
157157
std::env::var("DISABLE_CRYPT_SHARED").map_or(false, |s| s == "true");

0 commit comments

Comments
 (0)