@@ -2201,8 +2201,7 @@ tasks:
2201
2201
echo "Copying files ... begin"
2202
2202
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2203
2203
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
2204
- echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2205
- export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2204
+ export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
2206
2205
tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib64/libmongocrypt.*
2207
2206
AZUREKMS_SRC=testazurekms.tgz AZUREKMS_DST=/tmp $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
2208
2207
echo "Copying files ... end"
@@ -2217,10 +2216,11 @@ tasks:
2217
2216
working_dir : src/go.mongodb.org/mongo-driver
2218
2217
script : |
2219
2218
${PREPARE_SHELL}
2219
+ # Get azurekms credentials from the vault.
2220
+ . ./etc/get_aws_secrets.sh drivers/azurekms
2220
2221
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2221
2222
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
2222
- echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2223
- export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2223
+ export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
2224
2224
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
2225
2225
2226
2226
- name : " testazurekms-fail-task"
@@ -2562,6 +2562,7 @@ task_groups:
2562
2562
- testgcpkms-task
2563
2563
- name : testazurekms_task_group
2564
2564
setup_group_can_fail_task : true
2565
+ teardown_group_can_fail_task : true
2565
2566
setup_group_timeout_secs : 1800 # 30 minutes
2566
2567
setup_group :
2567
2568
- func : fetch-source
@@ -2574,17 +2575,10 @@ task_groups:
2574
2575
script : |
2575
2576
${PREPARE_SHELL}
2576
2577
export AZUREKMS_VMNAME_PREFIX="GODRIVER"
2577
- export AZUREKMS_CLIENTID=${AZUREKMS_CLIENTID}
2578
- export AZUREKMS_TENANTID=${AZUREKMS_TENANTID}
2579
- export AZUREKMS_SECRET=${AZUREKMS_SECRET}
2580
2578
export AZUREKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS
2581
- export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2582
- echo '${testazurekms_publickey}' > /tmp/testazurekms.pubkey
2583
- export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms.pubkey
2584
- echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2585
- sudo chmod 600 /tmp/testazurekms.prikey
2586
- export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2587
- export AZUREKMS_SCOPE=${AZUREKMS_SCOPE}
2579
+ # Get azurekms credentials from the vault.
2580
+ bash $DRIVERS_TOOLS/.evergreen/auth_aws/setup_secrets.sh drivers/azurekms
2581
+ source ./secrets-export.sh
2588
2582
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
2589
2583
- command : expansions.update
2590
2584
params :
@@ -2599,6 +2593,7 @@ task_groups:
2599
2593
shell : " bash"
2600
2594
script : |
2601
2595
${PREPARE_SHELL}
2596
+ export AZUREKMS_SCOPE=${AZUREKMS_SCOPE}
2602
2597
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
2603
2598
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/delete-vm.sh
2604
2599
tasks :
0 commit comments