Skip to content

Commit 2c447d0

Browse files
committed
GODRIVER-3002 Azure KMS Clean up (mongodb#1408)
(cherry picked from commit 92aa76c)
1 parent c0caefe commit 2c447d0

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

.evergreen/config.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,8 +2195,7 @@ tasks:
21952195
echo "Copying files ... begin"
21962196
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
21972197
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
22002199
tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib64/libmongocrypt.*
22012200
AZUREKMS_SRC=testazurekms.tgz AZUREKMS_DST=/tmp $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
22022201
echo "Copying files ... end"
@@ -2211,10 +2210,11 @@ tasks:
22112210
working_dir: src/go.mongodb.org/mongo-driver
22122211
script: |
22132212
${PREPARE_SHELL}
2213+
# Get azurekms credentials from the vault.
2214+
. ./etc/get_aws_secrets.sh drivers/azurekms
22142215
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
22152216
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
22182218
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
22192219
22202220
- name: "testazurekms-fail-task"
@@ -2556,6 +2556,7 @@ task_groups:
25562556
- testgcpkms-task
25572557
- name: testazurekms_task_group
25582558
setup_group_can_fail_task: true
2559+
teardown_group_can_fail_task: true
25592560
setup_group_timeout_secs: 1800 # 30 minutes
25602561
setup_group:
25612562
- func: fetch-source
@@ -2568,17 +2569,10 @@ task_groups:
25682569
script: |
25692570
${PREPARE_SHELL}
25702571
export AZUREKMS_VMNAME_PREFIX="GODRIVER"
2571-
export AZUREKMS_CLIENTID=${AZUREKMS_CLIENTID}
2572-
export AZUREKMS_TENANTID=${AZUREKMS_TENANTID}
2573-
export AZUREKMS_SECRET=${AZUREKMS_SECRET}
25742572
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
25822576
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
25832577
- command: expansions.update
25842578
params:
@@ -2593,6 +2587,7 @@ task_groups:
25932587
shell: "bash"
25942588
script: |
25952589
${PREPARE_SHELL}
2590+
export AZUREKMS_SCOPE=${AZUREKMS_SCOPE}
25962591
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
25972592
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/delete-vm.sh
25982593
tasks:

0 commit comments

Comments
 (0)