Skip to content

Commit 640a30a

Browse files
committed
RUST-1746 Use more environment variables in Azure KMS test (#944)
* use environment variables for key_name and key_vault_endpoint This may prevent future code changes if Azure test data changes.
1 parent 3396d1e commit 640a30a

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.evergreen/azure-kms-test/src/main.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@ use mongodb::{
44
error::Result,
55
};
66

7+
use std::env;
8+
79
#[tokio::main]
810
async fn main() -> Result<()> {
911
let c = ClientEncryption::new(
1012
Client::with_uri_str("mongodb://localhost:27017").await?,
1113
Namespace::new("keyvault", "datakeys"),
12-
[(KmsProvider::Azure, doc! { }, None)],
14+
[(KmsProvider::Azure, doc! {}, None)],
1315
)?;
1416

17+
let key_name = env::var("KEY_NAME").expect("KEY_NAME environment variable should be set");
18+
let key_vault_endpoint = env::var("KEY_VAULT_ENDPOINT")
19+
.expect("KEY_VAULT_ENDPOINT environment variable should be set");
20+
1521
c.create_data_key(MasterKey::Azure {
16-
key_vault_endpoint: "https://keyvault-drivers-2411.vault.azure.net/keys/".to_string(),
17-
key_name: "KEY-NAME".to_string(),
22+
key_vault_endpoint: key_vault_endpoint,
23+
key_name: key_name,
1824
key_version: None,
1925
})
2026
.run()

.evergreen/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,8 @@ task_groups:
492492
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
493493
export AZUREKMS_RESOURCEGROUP=${testazurekms_resourcegroup}
494494
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
495+
export AZUREKMS_KEY_NAME='${testazurekms_keyname}'
496+
export AZUREKMS_KEY_VAULT_ENDPOINT='${testazurekms_keyvaultendpoint}'
495497
EOT
496498
- command: expansions.update
497499
params:

.evergreen/run-azure-kms-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ AZUREKMS_SRC=azurekms_remote.tgz \
2222
AZUREKMS_DST="." \
2323
$AZUREKMS_TOOLS/copy-file.sh
2424
AZUREKMS_CMD="tar xvf azurekms_remote.tgz" $AZUREKMS_TOOLS/run-command.sh
25-
AZUREKMS_CMD="LD_LIBRARY_PATH=./azurekms_remote/lib ./azurekms_remote/azure-kms-test" \
25+
AZUREKMS_CMD="LD_LIBRARY_PATH=./azurekms_remote/lib KEY_NAME='${AZUREKMS_KEY_NAME}' KEY_VAULT_ENDPOINT='${AZUREKMS_KEY_VAULT_ENDPOINT}' ./azurekms_remote/azure-kms-test" \
2626
$AZUREKMS_TOOLS/run-command.sh

0 commit comments

Comments
 (0)