Skip to content

Commit 6ff2883

Browse files
authored
PYTHON-2445 PYTHON-2530 Fix MONGODB-AWS auth tests (#562)
1 parent 96b7580 commit 6ff2883

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

.evergreen/config.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ functions:
504504
silent: true
505505
script: |
506506
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
507-
alias urlencode='python3 -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
507+
alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
508508
USER=$(urlencode ${iam_auth_ecs_account})
509509
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
510510
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -531,7 +531,7 @@ functions:
531531
else
532532
. mongovenv/bin/activate
533533
fi
534-
pip install boto3
534+
pip install --upgrade boto3
535535
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
536536
mongo aws_e2e_assume_role.js
537537
- command: shell.exec
@@ -542,8 +542,8 @@ functions:
542542
script: |
543543
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
544544
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
545-
alias urlencode='python3 -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
546-
alias jsonkey='python3 -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
545+
alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
546+
alias jsonkey='${python3_binary} -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
547547
USER=$(jsonkey AccessKeyId)
548548
USER=$(urlencode $USER)
549549
PASS=$(jsonkey SecretAccessKey)
@@ -616,7 +616,7 @@ functions:
616616
script: |
617617
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
618618
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
619-
alias jsonkey='python3 -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
619+
alias jsonkey='${python3_binary} -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
620620
export AWS_ACCESS_KEY_ID=$(jsonkey AccessKeyId)
621621
export AWS_SECRET_ACCESS_KEY=$(jsonkey SecretAccessKey)
622622
export AWS_SESSION_TOKEN=$(jsonkey SessionToken)
@@ -640,6 +640,12 @@ functions:
640640
echo "This platform does not support the ECS auth test, skipping..."
641641
exit 0
642642
fi
643+
# The mongovenv was created earlier in "run aws auth test with assume role credentials".
644+
if [ "Windows_NT" = "$OS" ]; then
645+
. mongovenv/Scripts/activate
646+
else
647+
. mongovenv/bin/activate
648+
fi
643649
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
644650
cat <<EOF > setup.js
645651
const mongo_binaries = "$MONGODB_BINARIES";

0 commit comments

Comments
 (0)