Skip to content

Commit 92aa76c

Browse files
authored
GODRIVER-3002 Azure KMS Clean up (#1408)
1 parent 4a26e6c commit 92aa76c

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
@@ -2201,8 +2201,7 @@ tasks:
22012201
echo "Copying files ... begin"
22022202
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
22032203
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
22062205
tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib64/libmongocrypt.*
22072206
AZUREKMS_SRC=testazurekms.tgz AZUREKMS_DST=/tmp $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
22082207
echo "Copying files ... end"
@@ -2217,10 +2216,11 @@ tasks:
22172216
working_dir: src/go.mongodb.org/mongo-driver
22182217
script: |
22192218
${PREPARE_SHELL}
2219+
# Get azurekms credentials from the vault.
2220+
. ./etc/get_aws_secrets.sh drivers/azurekms
22202221
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
22212222
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
22242224
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
22252225
22262226
- name: "testazurekms-fail-task"
@@ -2562,6 +2562,7 @@ task_groups:
25622562
- testgcpkms-task
25632563
- name: testazurekms_task_group
25642564
setup_group_can_fail_task: true
2565+
teardown_group_can_fail_task: true
25652566
setup_group_timeout_secs: 1800 # 30 minutes
25662567
setup_group:
25672568
- func: fetch-source
@@ -2574,17 +2575,10 @@ task_groups:
25742575
script: |
25752576
${PREPARE_SHELL}
25762577
export AZUREKMS_VMNAME_PREFIX="GODRIVER"
2577-
export AZUREKMS_CLIENTID=${AZUREKMS_CLIENTID}
2578-
export AZUREKMS_TENANTID=${AZUREKMS_TENANTID}
2579-
export AZUREKMS_SECRET=${AZUREKMS_SECRET}
25802578
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
25882582
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
25892583
- command: expansions.update
25902584
params:
@@ -2599,6 +2593,7 @@ task_groups:
25992593
shell: "bash"
26002594
script: |
26012595
${PREPARE_SHELL}
2596+
export AZUREKMS_SCOPE=${AZUREKMS_SCOPE}
26022597
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
26032598
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/delete-vm.sh
26042599
tasks:

0 commit comments

Comments
 (0)