Skip to content

Commit 8cbc208

Browse files
baileympearsonbaileympearson
committed
asdf
1 parent 5750625 commit 8cbc208

File tree

4 files changed

+82
-96
lines changed

4 files changed

+82
-96
lines changed

Diff for: ‎.evergreen/config.in.yml

+44-30
Original file line numberDiff line numberDiff line change
@@ -612,39 +612,53 @@ functions:
612612
- .evergreen/run-mongodb-aws-test-copy.sh
613613

614614
"run aws ECS auth test":
615-
- command: shell.exec
615+
- command: subprocess.exec
616616
type: test
617617
params:
618-
working_dir: src
618+
include_expansions_in_env:
619+
- DRIVERS_TOOLS
620+
- MONGODB_AWS_SDK
621+
- PROJECT_DIRECTORY
622+
- MONGODB_BINARIES
619623
env:
620-
MONGODB_AWS_SDK: ${MONGODB_AWS_SDK}
621-
shell: bash
622-
script: |
623-
${PREPARE_SHELL}
624-
AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
625-
ECS_SRC_DIR=$AUTH_AWS_DIR/src
626-
627-
# pack up project directory to ssh it to the container
628-
mkdir -p $ECS_SRC_DIR/.evergreen
629-
630-
set -ex
631-
632-
echo "export MONGODB_AWS_SDK=$MONGODB_AWS_SDK" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
633-
echo "if [ $MONGODB_AWS_SDK = 'false' ]; then rm -rf ./node_modules/@aws-sdk/credential-providers; fi" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
634-
echo "npm run check:aws" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
635-
636-
cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
637-
638-
cd ..
639-
tar -czf src.tgz src drivers-tools
640-
mv src.tgz $ECS_SRC_DIR/src.tgz
641-
642-
643-
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
644-
. ./activate-authawsvenv.sh
645-
export MONGODB_BINARIES="${MONGODB_BINARIES}";
646-
export PROJECT_DIRECTORY=$ECS_SRC_DIR;
647-
python aws_tester.py ecs
624+
AWS_CREDENTIAL_TYPE: web-identity
625+
working_dir: "src"
626+
binary: bash
627+
args:
628+
- .evergreen/prepare-mongodb-aws-ecs-auth.sh
629+
# - command: shell.exec
630+
# type: test
631+
# params:
632+
# working_dir: src
633+
# env:
634+
# MONGODB_AWS_SDK: ${MONGODB_AWS_SDK}
635+
# shell: bash
636+
# script: |
637+
# ${PREPARE_SHELL}
638+
# AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
639+
# ECS_SRC_DIR=$AUTH_AWS_DIR/src
640+
641+
# # pack up project directory to ssh it to the container
642+
# mkdir -p $ECS_SRC_DIR/.evergreen
643+
644+
# set -ex
645+
646+
# echo "export MONGODB_AWS_SDK=$MONGODB_AWS_SDK" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
647+
# echo "if [ $MONGODB_AWS_SDK = 'false' ]; then rm -rf ./node_modules/@aws-sdk/credential-providers; fi" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
648+
# echo "npm run check:aws" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
649+
650+
# cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
651+
652+
# cd ..
653+
# tar -czf src.tgz src drivers-tools
654+
# mv src.tgz $ECS_SRC_DIR/src.tgz
655+
656+
657+
# cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
658+
# . ./activate-authawsvenv.sh
659+
# export MONGODB_BINARIES="${MONGODB_BINARIES}";
660+
# export PROJECT_DIRECTORY=$ECS_SRC_DIR;
661+
# python aws_tester.py ecs
648662

649663
"run custom csfle tests":
650664
- command: subprocess.exec

Diff for: ‎.evergreen/config.yml

+11-48
Original file line numberDiff line numberDiff line change
@@ -547,57 +547,20 @@ functions:
547547
args:
548548
- .evergreen/run-mongodb-aws-test-copy.sh
549549
run aws ECS auth test:
550-
- command: shell.exec
550+
- command: subprocess.exec
551551
type: test
552552
params:
553-
working_dir: src
553+
include_expansions_in_env:
554+
- DRIVERS_TOOLS
555+
- MONGODB_AWS_SDK
556+
- PROJECT_DIRECTORY
557+
- MONGODB_BINARIES
554558
env:
555-
MONGODB_AWS_SDK: ${MONGODB_AWS_SDK}
556-
shell: bash
557-
script: >
558-
${PREPARE_SHELL}
559-
560-
AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
561-
562-
ECS_SRC_DIR=$AUTH_AWS_DIR/src
563-
564-
565-
# pack up project directory to ssh it to the container
566-
567-
mkdir -p $ECS_SRC_DIR/.evergreen
568-
569-
570-
set -ex
571-
572-
573-
echo "export MONGODB_AWS_SDK=$MONGODB_AWS_SDK" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
574-
575-
echo "if [ $MONGODB_AWS_SDK = 'false' ]; then rm -rf ./node_modules/@aws-sdk/credential-providers; fi" >>
576-
$PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
577-
578-
echo "npm run check:aws" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
579-
580-
581-
cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
582-
583-
584-
cd ..
585-
586-
tar -czf src.tgz src drivers-tools
587-
588-
mv src.tgz $ECS_SRC_DIR/src.tgz
589-
590-
591-
592-
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
593-
594-
. ./activate-authawsvenv.sh
595-
596-
export MONGODB_BINARIES="${MONGODB_BINARIES}";
597-
598-
export PROJECT_DIRECTORY=$ECS_SRC_DIR;
599-
600-
python aws_tester.py ecs
559+
AWS_CREDENTIAL_TYPE: web-identity
560+
working_dir: src
561+
binary: bash
562+
args:
563+
- .evergreen/prepare-mongodb-aws-ecs-auth.sh
601564
run custom csfle tests:
602565
- command: subprocess.exec
603566
type: test

Diff for: ‎.evergreen/prepare-mongodb-aws-ecs-auth.sh

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#! /usr/bin/env bash
2+
3+
AUTH_AWS_DIR=${DRIVERS_TOOLS}/.evergreen/auth_aws
4+
ECS_SRC_DIR=$AUTH_AWS_DIR/src
5+
6+
# pack up project directory to ssh it to the container
7+
mkdir -p $ECS_SRC_DIR/.evergreen
8+
set -ex
9+
10+
# write test file
11+
echo "export MONGODB_AWS_SDK=$MONGODB_AWS_SDK" >>$PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
12+
echo "if [ $MONGODB_AWS_SDK = 'false' ]; then rm -rf ./node_modules/@aws-sdk/credential-providers; fi" >>$PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
13+
echo "npm run check:aws" >>$PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
14+
15+
# copy test file to AWS ecs test directory
16+
cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
17+
18+
# tar the file and drivers tools and do the same
19+
cd ..
20+
tar -czf src.tgz src drivers-tools
21+
mv src.tgz $ECS_SRC_DIR/src.tgz
22+
23+
export MONGODB_BINARIES="${MONGODB_BINARIES}"
24+
25+
export PROJECT_DIRECTORY=$ECS_SRC_DIR
26+
27+
bash $AUTH_AWS_DIR/aws_setup.sh ecs

Diff for: ‎.evergreen/run-mongodb-aws-ecs-test.sh

-18
This file was deleted.

0 commit comments

Comments
 (0)