Skip to content

Commit 263e431

Browse files
kevinAlbseramongodb
authored andcommitted
CDRIVER-6010 use ec2.assume_role for Azure KMS task (mongodb#2051)
1 parent 2f538d1 commit 263e431

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.evergreen/generated_configs/legacy-config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16249,8 +16249,15 @@ task_groups:
1624916249
- name: testazurekms_task_group
1625016250
setup_group:
1625116251
- func: fetch-det
16252+
- command: ec2.assume_role
16253+
params:
16254+
role_arn: ${aws_test_secrets_role}
1625216255
- command: shell.exec
1625316256
params:
16257+
include_expansions_in_env:
16258+
- AWS_ACCESS_KEY_ID
16259+
- AWS_SECRET_ACCESS_KEY
16260+
- AWS_SESSION_TOKEN
1625416261
shell: bash
1625516262
script: |-
1625616263
set -o errexit

.evergreen/legacy_config_generator/evergreen_config_lib/testazurekms.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
from collections import OrderedDict as OD
1919
from typing import MutableSequence
2020

21-
from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
22-
2321
from evergreen_config_generator.functions import shell_exec, func
2422
from evergreen_config_generator.tasks import NamedTask
2523
from evergreen_config_generator.variants import Variant
@@ -117,6 +115,13 @@ def _create_task_group():
117115
task_group.setup_group_timeout_secs = 1800 # 30 minutes
118116
task_group.setup_group = [
119117
func("fetch-det"),
118+
# Assume role to get AWS secrets.
119+
{
120+
"command": "ec2.assume_role",
121+
"params": {
122+
"role_arn": "${aws_test_secrets_role}"
123+
}
124+
},
120125
shell_exec(
121126
r"""
122127
DRIVERS_TOOLS=$(pwd)/drivers-evergreen-tools
@@ -136,6 +141,7 @@ def _create_task_group():
136141
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
137142
""",
138143
test=False,
144+
include_expansions_in_env=[ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
139145
),
140146
# Load the AZUREKMS_VMNAME expansion.
141147
OD(

0 commit comments

Comments
 (0)