Skip to content

Commit 9a3a704

Browse files
kevinAlbseramongodb
authored andcommitted
CXX-3287 assume role before pull-mongohouse-image.sh (mongodb#1413)
1 parent c45ea0e commit 9a3a704

File tree

2 files changed

+37
-26
lines changed

2 files changed

+37
-26
lines changed

.evergreen/config_generator/components/mongohouse.py

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from config_generator.etc.utils import bash_exec
99

1010
from shrub.v3.evg_build_variant import BuildVariant
11-
from shrub.v3.evg_command import EvgCommandType
11+
from shrub.v3.evg_command import EvgCommandType, ec2_assume_role
1212
from shrub.v3.evg_task import EvgTask, EvgTaskRef
1313

1414

@@ -17,18 +17,22 @@
1717

1818
class BuildMongohouse(Function):
1919
name = 'build_mongohouse'
20-
commands = bash_exec(
21-
command_type=EvgCommandType.SETUP,
22-
script='''\
23-
if [ ! -d "drivers-evergreen-tools" ]; then
24-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
25-
fi
26-
cd drivers-evergreen-tools
27-
export DRIVERS_TOOLS=$(pwd)
28-
29-
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
30-
'''
31-
)
20+
commands = [
21+
ec2_assume_role (role_arn='${aws_test_secrets_role}'),
22+
bash_exec(
23+
include_expansions_in_env=["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"],
24+
command_type=EvgCommandType.SETUP,
25+
script='''\
26+
if [ ! -d "drivers-evergreen-tools" ]; then
27+
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
28+
fi
29+
cd drivers-evergreen-tools
30+
export DRIVERS_TOOLS=$(pwd)
31+
32+
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
33+
'''
34+
)
35+
]
3236

3337

3438
class RunMongohouse(Function):

.evergreen/generated_configs/functions.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,27 @@ functions:
200200
permissions: public-read
201201
remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/rpm-packages.tar.gz
202202
build_mongohouse:
203-
command: subprocess.exec
204-
type: setup
205-
params:
206-
binary: bash
207-
args:
208-
- -c
209-
- |
210-
if [ ! -d "drivers-evergreen-tools" ]; then
211-
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
212-
fi
213-
cd drivers-evergreen-tools
214-
export DRIVERS_TOOLS=$(pwd)
203+
- command: ec2.assume_role
204+
params:
205+
role_arn: ${aws_test_secrets_role}
206+
- command: subprocess.exec
207+
type: setup
208+
params:
209+
binary: bash
210+
include_expansions_in_env:
211+
- AWS_ACCESS_KEY_ID
212+
- AWS_SECRET_ACCESS_KEY
213+
- AWS_SESSION_TOKEN
214+
args:
215+
- -c
216+
- |
217+
if [ ! -d "drivers-evergreen-tools" ]; then
218+
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git
219+
fi
220+
cd drivers-evergreen-tools
221+
export DRIVERS_TOOLS=$(pwd)
215222
216-
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
223+
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
217224
check augmented sbom:
218225
- command: ec2.assume_role
219226
type: setup

0 commit comments

Comments
 (0)