@@ -471,7 +471,7 @@ functions:
471
471
silent : true
472
472
script : |
473
473
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]))"'
475
475
USER=$(urlencode ${iam_auth_ecs_account})
476
476
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
477
477
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -498,7 +498,7 @@ functions:
498
498
else
499
499
. mongovenv/bin/activate
500
500
fi
501
- pip install boto3
501
+ pip install --upgrade boto3
502
502
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
503
503
mongo aws_e2e_assume_role.js
504
504
- command : shell.exec
@@ -509,8 +509,8 @@ functions:
509
509
script : |
510
510
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
511
511
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'
514
514
USER=$(jsonkey AccessKeyId)
515
515
USER=$(urlencode $USER)
516
516
PASS=$(jsonkey SecretAccessKey)
@@ -583,7 +583,7 @@ functions:
583
583
script : |
584
584
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
585
585
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'
587
587
export AWS_ACCESS_KEY_ID=$(jsonkey AccessKeyId)
588
588
export AWS_SECRET_ACCESS_KEY=$(jsonkey SecretAccessKey)
589
589
export AWS_SESSION_TOKEN=$(jsonkey SessionToken)
@@ -607,6 +607,12 @@ functions:
607
607
echo "This platform does not support the ECS auth test, skipping..."
608
608
exit 0
609
609
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
610
616
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
611
617
cat <<EOF > setup.js
612
618
const mongo_binaries = "$MONGODB_BINARIES";
0 commit comments