@@ -514,7 +514,7 @@ functions:
514
514
silent : true
515
515
script : |
516
516
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
517
- alias urlencode='python -c "import sys, urllib as ul ; sys.stdout.write(ul .quote_plus(sys.argv[1]))"'
517
+ alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp ; sys.stdout.write(ulp .quote_plus(sys.argv[1]))"'
518
518
USER=$(urlencode ${iam_auth_ecs_account})
519
519
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
520
520
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -541,7 +541,7 @@ functions:
541
541
else
542
542
. mongovenv/bin/activate
543
543
fi
544
- pip install boto3
544
+ pip install --upgrade boto3
545
545
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
546
546
mongo aws_e2e_assume_role.js
547
547
- command : shell.exec
@@ -552,8 +552,8 @@ functions:
552
552
script : |
553
553
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
554
554
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
555
- alias urlencode='python -c "import sys, urllib as ul ; sys.stdout.write(ul .quote_plus(sys.argv[1]))"'
556
- alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
555
+ alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp ; sys.stdout.write(ulp .quote_plus(sys.argv[1]))"'
556
+ 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'
557
557
USER=$(jsonkey AccessKeyId)
558
558
USER=$(urlencode $USER)
559
559
PASS=$(jsonkey SecretAccessKey)
@@ -626,7 +626,7 @@ functions:
626
626
script : |
627
627
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
628
628
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
629
- alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
629
+ 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'
630
630
export AWS_ACCESS_KEY_ID=$(jsonkey AccessKeyId)
631
631
export AWS_SECRET_ACCESS_KEY=$(jsonkey SecretAccessKey)
632
632
export AWS_SESSION_TOKEN=$(jsonkey SessionToken)
@@ -650,6 +650,12 @@ functions:
650
650
echo "This platform does not support the ECS auth test, skipping..."
651
651
exit 0
652
652
fi
653
+ # The mongovenv was created earlier in "run aws auth test with assume role credentials".
654
+ if [ "Windows_NT" = "$OS" ]; then
655
+ . mongovenv/Scripts/activate
656
+ else
657
+ . mongovenv/bin/activate
658
+ fi
653
659
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
654
660
cat <<EOF > setup.js
655
661
const mongo_binaries = "$MONGODB_BINARIES";
0 commit comments