Skip to content

Commit 8eb7483

Browse files
blink1073blink1073
authored
PYTHON-3489 Remove legacy shell from test scripts (#1397)
1 parent 015073d commit 8eb7483

File tree

2 files changed

+22
-138
lines changed

2 files changed

+22
-138
lines changed

‎.evergreen/config.yml‎

Lines changed: 20 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ functions:
6969
PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
7070
PREPARE_SHELL: |
7171
set -o errexit
72+
export SKIP_LEGACY_SHELL=1
7273
export DRIVERS_TOOLS="$DRIVERS_TOOLS"
7374
export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
7475
export MONGODB_BINARIES="$MONGODB_BINARIES"
@@ -556,11 +557,9 @@ functions:
556557
add_expansions_to_env: true
557558
working_dir: "src"
558559
script: |
559-
# Disable xtrace for security reasons (just in case it was accidentally set).
560-
set +x
561-
set -o errexit
562-
563-
bash ${PROJECT_DIRECTORY}/.evergreen/tox.sh -m aws-secrets -- drivers/aws_auth
560+
${PREPARE_SHELL}
561+
cd $DRIVERS_TOOLS/.evergreen/auth_aws
562+
./setup_secrets.sh drivers/aws_auth
564563
565564
"run aws auth test with regular aws credentials":
566565
- command: shell.exec
@@ -569,13 +568,8 @@ functions:
569568
shell: "bash"
570569
working_dir: "src"
571570
script: |
572-
# Disable xtrace for security reasons (just in case it was accidentally set).
573-
set +x
574-
set -o errexit
575-
576-
PYTHON_BINARY="${PYTHON_BINARY}" \
577-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
578-
.evergreen/run-mongodb-aws-test.sh regular
571+
${PREPARE_SHELL}
572+
.evergreen/run-mongodb-aws-test.sh regular
579573
580574
"run aws auth test with assume role credentials":
581575
- command: shell.exec
@@ -584,15 +578,8 @@ functions:
584578
shell: "bash"
585579
working_dir: "src"
586580
script: |
587-
# Disable xtrace for security reasons (just in case it was accidentally set).
588-
set +x
589-
set -o errexit
590-
591-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
592-
ASSUME_ROLE_CREDENTIALS=true \
593-
PYTHON_BINARY="${PYTHON_BINARY}" \
594-
.evergreen/run-mongodb-aws-test.sh assume-role
595-
581+
${PREPARE_SHELL}
582+
.evergreen/run-mongodb-aws-test.sh assume-role
596583
597584
"run aws auth test with aws EC2 credentials":
598585
- command: shell.exec
@@ -605,16 +592,8 @@ functions:
605592
echo "This platform does not support the EC2 auth test, skipping..."
606593
exit 0
607594
fi
608-
609-
# Disable xtrace for security reasons (just in case it was accidentally set).
610-
set +x
611-
set -o errexit
612-
613-
PYTHON_BINARY=${PYTHON_BINARY} \
614-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
615-
ASSERT_NO_URI_CREDS=true \
616-
SKIP_PREPARE_AWS_ENV=true \
617-
.evergreen/run-mongodb-aws-test.sh ec2
595+
${PREPARE_SHELL}
596+
.evergreen/run-mongodb-aws-test.sh ec2
618597
619598
"run aws auth test with aws web identity credentials":
620599
- command: shell.exec
@@ -627,25 +606,12 @@ functions:
627606
echo "This platform does not support the web identity auth test, skipping..."
628607
exit 0
629608
fi
630-
631-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
632-
PYTHON_BINARY="${PYTHON_BINARY}" \
633-
ASSERT_NO_URI_CREDS=true \
634-
USE_WEB_IDENTITY_CREDS=true \
609+
${PREPARE_SHELL}
610+
# Test with and without AWS_ROLE_SESSION_NAME set.
611+
.evergreen/run-mongodb-aws-test.sh web-identity
612+
AWS_ROLE_SESSION_NAME="test" \
635613
.evergreen/run-mongodb-aws-test.sh web-identity
636614
637-
if [ "${skip_web_identity_auth_test}" = "true" ]; then
638-
echo "This platform does not support the web identity auth test, skipping..."
639-
else
640-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
641-
PYTHON_BINARY=${PYTHON_BINARY} \
642-
ASSERT_NO_URI_CREDS=true \
643-
SKIP_PREPARE_AWS_ENV=true \
644-
AWS_ROLE_SESSION_NAME="test" \
645-
USE_WEB_IDENTITY_CREDS=true \
646-
.evergreen/run-mongodb-aws-test.sh
647-
fi
648-
649615
"run oidc auth test with aws credentials":
650616
- command: ec2.assume_role
651617
params:
@@ -667,17 +633,8 @@ functions:
667633
working_dir: "src"
668634
shell: bash
669635
script: |
670-
# Disable xtrace for security reasons (just in case it was accidentally set).
671-
set +x
672-
set -o errexit
673-
674-
PYTHON_BINARY="${PYTHON_BINARY}" \
675-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
676-
PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
677-
ASSERT_NO_URI_CREDS=true \
678-
SKIP_PREPARE_AWS_ENV=true \
679-
USE_ENV_VAR_CREDS=true \
680-
.evergreen/run-mongodb-aws-test.sh
636+
${PREPARE_SHELL}
637+
.evergreen/run-mongodb-aws-test.sh env-creds
681638
682639
"run aws auth test with aws credentials and session token as environment variables":
683640
- command: shell.exec
@@ -686,16 +643,8 @@ functions:
686643
working_dir: "src"
687644
shell: bash
688645
script: |
689-
# Disable xtrace for security reasons (just in case it was accidentally set).
690-
set +x
691-
set -o errexit
692-
693-
PYTHON_BINARY="${PYTHON_BINARY}" \
694-
DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
695-
PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
696-
ASSERT_NO_URI_CREDS=true \
697-
SESSION_TOKEN_CREDENTIALS=true \
698-
.evergreen/run-mongodb-aws-test.sh
646+
${PREPARE_SHELL}
647+
.evergreen/run-mongodb-aws-test.sh session-creds
699648
700649
"run aws ECS auth test":
701650
- command: shell.exec
@@ -708,24 +657,8 @@ functions:
708657
echo "This platform does not support the ECS auth test, skipping..."
709658
exit 0
710659
fi
711-
712-
# Disable xtrace for security reasons (just in case it was accidentally set).
713-
set +x
714-
set -o errexit
715-
716-
# Try to source exported AWS Secrets
717-
if [ -f ./secrets-export.sh ]; then
718-
source ./secrets-export.sh
719-
fi
720-
721-
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
722-
. ./activate-authawsvenv.sh
723-
724-
export MONGODB_BINARIES="${MONGODB_BINARIES}";
725-
export PROJECT_DIRECTORY="${PROJECT_DIRECTORY}";
726-
727-
python aws_tester.py ecs
728-
cd -
660+
${PREPARE_SHELL}
661+
.evergreen/run-mongodb-aws-test.sh session-creds
729662
730663
"cleanup":
731664
- command: shell.exec

‎.evergreen/run-mongodb-aws-test.sh‎

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,8 @@ set -o errexit # Exit the script with error if any of the commands fail
1515

1616
echo "Running MONGODB-AWS authentication tests"
1717

18-
# ensure no secrets are printed in log files
19-
set +x
20-
21-
. ./.evergreen/utils.sh
22-
PYTHON_BINARY=$(find_python3)
23-
24-
# Try to source exported AWS Secrets
25-
if [ -f ./secrets-export.sh ]; then
26-
source ./secrets-export.sh
27-
fi
28-
29-
if [ -n "$1" ]; then
30-
cd "${DRIVERS_TOOLS}"/.evergreen/auth_aws
31-
. ./activate-authawsvenv.sh
32-
python aws_tester.py "$1"
33-
cd -
34-
fi
35-
36-
if [ -z "${SKIP_PREPARE_AWS_ENV}" ]; then
37-
[ -s "${DRIVERS_TOOLS}/.evergreen/auth_aws/prepare_aws_env.sh" ] && source "${DRIVERS_TOOLS}/.evergreen/auth_aws/prepare_aws_env.sh"
38-
fi
39-
40-
if [ -n "$USE_ENV_VAR_CREDS" ]; then
41-
export AWS_ACCESS_KEY_ID=$IAM_AUTH_ECS_ACCOUNT
42-
export AWS_SECRET_ACCESS_KEY=$IAM_AUTH_ECS_SECRET_ACCESS_KEY
43-
fi
44-
45-
if [ -n "$USE_WEB_IDENTITY_CREDS" ]; then
46-
export AWS_ROLE_ARN=$IAM_AUTH_ASSUME_WEB_ROLE_NAME
47-
export AWS_WEB_IDENTITY_TOKEN_FILE=$IAM_WEB_IDENTITY_TOKEN_FILE
48-
fi
49-
50-
MONGODB_URI=${MONGODB_URI:-"mongodb://localhost"}
51-
MONGODB_URI="${MONGODB_URI}/aws?authMechanism=MONGODB-AWS"
52-
if [[ -n ${SESSION_TOKEN} ]]; then
53-
MONGODB_URI="${MONGODB_URI}&authMechanismProperties=AWS_SESSION_TOKEN:${SESSION_TOKEN}"
54-
fi
55-
56-
export MONGODB_URI="$MONGODB_URI"
57-
58-
if [ "$ASSERT_NO_URI_CREDS" = "true" ]; then
59-
if echo "$MONGODB_URI" | grep -q "@"; then
60-
echo "MONGODB_URI unexpectedly contains user credentials!";
61-
exit 1
62-
fi
63-
fi
64-
65-
if [ -z "$PYTHON_BINARY" ]; then
66-
echo "Cannot test without specifying PYTHON_BINARY"
67-
exit 1
68-
fi
18+
# Handle credentials and environment setup.
19+
. $DRIVERS_TOOLS/.evergreen/auth_aws/aws_setup.sh $1
6920

7021
# show test output
7122
set -x

0 commit comments

Comments
 (0)