@@ -471,7 +471,7 @@ functions:
471471 silent : true
472472 script : |
473473 cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
474- alias urlencode='python -c "import sys, urllib as ul ; sys.stdout.write(ul .quote_plus(sys.argv[1]))"'
474+ alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp ; sys.stdout.write(ulp .quote_plus(sys.argv[1]))"'
475475 USER=$(urlencode ${iam_auth_ecs_account})
476476 PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
477477 MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -498,7 +498,7 @@ functions:
498498 else
499499 . mongovenv/bin/activate
500500 fi
501- pip install boto3
501+ pip install --upgrade boto3
502502 cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
503503 mongo aws_e2e_assume_role.js
504504 - command : shell.exec
@@ -509,8 +509,8 @@ functions:
509509 script : |
510510 # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
511511 cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
512- alias urlencode='python -c "import sys, urllib as ul ; sys.stdout.write(ul .quote_plus(sys.argv[1]))"'
513- alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
512+ alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp ; sys.stdout.write(ulp .quote_plus(sys.argv[1]))"'
513+ 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'
514514 USER=$(jsonkey AccessKeyId)
515515 USER=$(urlencode $USER)
516516 PASS=$(jsonkey SecretAccessKey)
@@ -583,7 +583,7 @@ functions:
583583 script : |
584584 # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
585585 cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
586- alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
586+ 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'
587587 export AWS_ACCESS_KEY_ID=$(jsonkey AccessKeyId)
588588 export AWS_SECRET_ACCESS_KEY=$(jsonkey SecretAccessKey)
589589 export AWS_SESSION_TOKEN=$(jsonkey SessionToken)
@@ -607,6 +607,12 @@ functions:
607607 echo "This platform does not support the ECS auth test, skipping..."
608608 exit 0
609609 fi
610+ # The mongovenv was created earlier in "run aws auth test with assume role credentials".
611+ if [ "Windows_NT" = "$OS" ]; then
612+ . mongovenv/Scripts/activate
613+ else
614+ . mongovenv/bin/activate
615+ fi
610616 cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
611617 cat <<EOF > setup.js
612618 const mongo_binaries = "$MONGODB_BINARIES";
0 commit comments