Skip to content

Commit cf5009b

Browse files
authored
CSHARP-4626: Fix urlencode on MacOS variants. (#1133)
1 parent 757e84e commit cf5009b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

evergreen/evergreen.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ functions:
459459
working_dir: mongo-csharp-driver
460460
script: |
461461
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
462-
alias urlencode='python -c "import sys, urllib as ul; sys.stdout.write(ul.quote_plus(sys.argv[1]))"'
462+
alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
463463
USER=$(urlencode "${iam_auth_ecs_account}")
464464
PASS=$(urlencode "${iam_auth_ecs_secret_access_key}")
465465
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -486,8 +486,8 @@ functions:
486486
script: |
487487
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
488488
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
489-
alias urlencode='python -c "import sys, urllib as ul; sys.stdout.write(ul.quote_plus(sys.argv[1]))"'
490-
alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
489+
alias urlencode='${python3_binary} -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
490+
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'
491491
USER=$(jsonkey AccessKeyId)
492492
USER=$(urlencode $USER)
493493
PASS=$(jsonkey SecretAccessKey)
@@ -661,7 +661,7 @@ functions:
661661
script: |
662662
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
663663
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
664-
alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
664+
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'
665665
export AWS_ACCESS_KEY_ID=$(jsonkey AccessKeyId)
666666
export AWS_SECRET_ACCESS_KEY=$(jsonkey SecretAccessKey)
667667
export AWS_SESSION_TOKEN=$(jsonkey SessionToken)
@@ -1714,18 +1714,21 @@ axes:
17141714
display_name: "Windows 64-bit"
17151715
variables:
17161716
OS: "windows-64"
1717+
python3_binary: "C:/python/Python38/python.exe"
17171718
skip_ECS_auth_test: true
17181719
skip_web_identity_auth_test: true
17191720
run_on: windows-64-vs2017-test
17201721
- id: "ubuntu-1804"
17211722
display_name: "Ubuntu 18.04"
17221723
variables:
17231724
OS: "ubuntu-1804"
1725+
python3_binary: "/opt/python/3.8/bin/python3"
17241726
run_on: ubuntu1804-test
17251727
- id: "macos-1100"
17261728
display_name: "macOS 11.00"
17271729
variables:
17281730
OS: "macos-1100"
1731+
python3_binary: /Library/Frameworks/Python.framework/Versions/3.8/bin/python3
17291732
skip_EC2_auth_test: true
17301733
skip_ECS_auth_test: true
17311734
skip_web_identity_auth_test: true
@@ -1734,6 +1737,7 @@ axes:
17341737
display_name: "macOS 11.00 M1"
17351738
variables:
17361739
OS: "macos-1100-arm64"
1740+
python3_binary: /Library/Frameworks/Python.framework/Versions/3.8/bin/python3
17371741
skip_EC2_auth_test: true
17381742
skip_ECS_auth_test: true
17391743
skip_web_identity_auth_test: true

0 commit comments

Comments
 (0)