@@ -2195,8 +2195,7 @@ tasks:
2195
2195
echo "Copying files ... begin"
2196
2196
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2197
2197
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
2198
- echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2199
- export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2198
+ export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
2200
2199
tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib64/libmongocrypt.*
2201
2200
AZUREKMS_SRC=testazurekms.tgz AZUREKMS_DST=/tmp $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
2202
2201
echo "Copying files ... end"
@@ -2211,10 +2210,11 @@ tasks:
2211
2210
working_dir : src/go.mongodb.org/mongo-driver
2212
2211
script : |
2213
2212
${PREPARE_SHELL}
2213
+ # Get azurekms credentials from the vault.
2214
+ . ./etc/get_aws_secrets.sh drivers/azurekms
2214
2215
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2215
2216
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
2216
- echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2217
- export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2217
+ export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
2218
2218
AZUREKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib64 MONGODB_URI='mongodb://localhost:27017' PROVIDER='azure' AZUREKMS_KEY_NAME='${AZUREKMS_KEY_NAME}' AZUREKMS_KEY_VAULT_ENDPOINT='${AZUREKMS_KEY_VAULT_ENDPOINT}' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
2219
2219
2220
2220
- name : " testazurekms-fail-task"
@@ -2556,6 +2556,7 @@ task_groups:
2556
2556
- testgcpkms-task
2557
2557
- name : testazurekms_task_group
2558
2558
setup_group_can_fail_task : true
2559
+ teardown_group_can_fail_task : true
2559
2560
setup_group_timeout_secs : 1800 # 30 minutes
2560
2561
setup_group :
2561
2562
- func : fetch-source
@@ -2568,17 +2569,10 @@ task_groups:
2568
2569
script : |
2569
2570
${PREPARE_SHELL}
2570
2571
export AZUREKMS_VMNAME_PREFIX="GODRIVER"
2571
- export AZUREKMS_CLIENTID=${AZUREKMS_CLIENTID}
2572
- export AZUREKMS_TENANTID=${AZUREKMS_TENANTID}
2573
- export AZUREKMS_SECRET=${AZUREKMS_SECRET}
2574
2572
export AZUREKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS
2575
- export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2576
- echo '${testazurekms_publickey}' > /tmp/testazurekms.pubkey
2577
- export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms.pubkey
2578
- echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2579
- sudo chmod 600 /tmp/testazurekms.prikey
2580
- export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2581
- export AZUREKMS_SCOPE=${AZUREKMS_SCOPE}
2573
+ # Get azurekms credentials from the vault.
2574
+ bash $DRIVERS_TOOLS/.evergreen/auth_aws/setup_secrets.sh drivers/azurekms
2575
+ source ./secrets-export.sh
2582
2576
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
2583
2577
- command : expansions.update
2584
2578
params :
@@ -2593,6 +2587,7 @@ task_groups:
2593
2587
shell : " bash"
2594
2588
script : |
2595
2589
${PREPARE_SHELL}
2590
+ export AZUREKMS_SCOPE=${AZUREKMS_SCOPE}
2596
2591
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2597
2592
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/delete-vm.sh
2598
2593
tasks :
0 commit comments