Merge branch 'v1.17'

* v1.17:
  PHPC-2356: Remove explicit env variables (#1514)
  Upgrade to latest libmongoc and libmongocrypt versions (#1509)

Author: alcaeus

.evergreen/atlas-uris.txt.enc

@@ -167,9 +167,19 @@ functions:
   "bootstrap mongo-orchestration":
     - command: shell.exec
       params:
+        include_expansions_in_env:
+          - MONGODB_VERSION
+          - TOPOLOGY
+          - AUTH
+          - SSL
+          - STORAGE_ENGINE
+          - LOAD_BALANCER
+          - REQUIRE_API_VERSION
+          - ORCHESTRATION_FILE
         script: |
           ${PREPARE_SHELL}
-          SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+          SKIP_LEGACY_SHELL=true \
+          sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with MONGODB_URI and CRYPT_SHARED_LIB_PATH
     - command: expansions.update
       params:
@@ -185,28 +195,32 @@ functions:
   "run OCSP responder":
     - command: shell.exec
       params:
+        include_expansions_in_env:
+          - TEST_COLUMN
+          - CERT_TYPE
+          - USE_DELEGATE
         shell: bash
         script: |
           ${PREPARE_SHELL}
-          TEST_COLUMN=${TEST_COLUMN} \
-          CERT_TYPE=${CERT_TYPE} \
-          USE_DELEGATE=${USE_DELEGATE} \
           ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-responder.sh
 
   "run tests":
     - command: shell.exec
       type: test
       params:
+        include_expansions_in_env:
+          - API_VERSION
+          - ATLAS_CONNECTIVITY_URIS
+          - CRYPT_SHARED_LIB_PATH
+          - MONGODB_URI
+          - APPEND_URI
+          - SKIP_CRYPT_SHARED
+          - SSL
+          - SSL_DIR
+          - TESTS
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          API_VERSION=${API_VERSION} \
-          CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
-          MONGODB_URI="${MONGODB_URI}${APPEND_URI}" \
-          SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} \
-          SSL=${SSL} \
-          SSL_DIR=${SSL_DIR} \
-          TESTS=${TESTS} \
           sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "cleanup":
@@ -242,12 +256,6 @@ functions:
           # Don't use ${file} syntax here because evergreen treats it as an empty expansion.
           [ -f "$file" ] && sh $file || echo "$file not available, skipping"
 
-  "decrypt atlas URI list":
-    - command: shell.exec
-      params:
-        script: |
-          openssl aes-256-cbc -S "${encrypted_uris_salt}" -K "${encrypted_uris_key}" -iv "${encrypted_uris_iv}" -in ${PROJECT_DIRECTORY}/.evergreen/atlas-uris.txt.enc -out ${PROJECT_DIRECTORY}/.evergreen/atlas-uris.txt -d
-
   "start load balancer":
     - command: shell.exec
       params:

.evergreen/config/functions.yml

@@ -2,7 +2,6 @@ tasks:
   - name: "test-atlas-connectivity"
     tags: ["atlas", "nodb"]
     commands:
-      - func: "decrypt atlas URI list"
       - func: "run tests"
         vars:
           TESTS: "tests/atlas.phpt"

.evergreen/config/test-tasks.yml

@@ -5,6 +5,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 API_VERSION=${API_VERSION:-} # Optional API_VERSION environment variable for run-tests.php
 CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH:-}" # Optional path to crypt_shared library
 MONGODB_URI=${MONGODB_URI:-} # Connection string (including credentials and topology info)
+APPEND_URI=${APPEND_URI:-} # Additional URI options to append to the URI. Used in OCSP tests
 SKIP_CRYPT_SHARED="${SKIP_CRYPT_SHARED:-no}" # Specify "yes" to ignore CRYPT_SHARED_LIB_PATH. Defaults to "no"
 SSL=${SSL:-no} # Specify "yes" to enable SSL. Defaults to "no"
 SSL_DIR=${SSL_DIR-} # Optional SSL_DIR environment variable for run-tests.php
@@ -15,6 +16,9 @@ OS=$(uname -s | tr '[:upper:]' '[:lower:]')
 
 export REPORT_EXIT_STATUS=1
 
+# Append test-specific URI options
+MONGODB_URI=${MONGODB_URI}${APPEND_URI}
+
 # Determine if MONGODB_URI already has a query string
 SUFFIX=$(echo "$MONGODB_URI" | grep -Eo "\?(.*)" | cat)
 

.evergreen/run-tests.sh

@@ -52,7 +52,6 @@ php.ini
 !.github/
 !tests/utils/*.php
 !.evergreen
-.evergreen/atlas-uris.txt
 
 
 !scripts

.gitignore

@@ -293,15 +293,15 @@ if test "$PHP_MONGODB" != "no"; then
     ])
 
     if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then
-      PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.8.2], [
+      PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.8.4], [
         PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
         PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)"
 
         PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOCRYPT_CFLAGS"
         PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD)
         AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt])
       ],[
-        AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.8.2)
+        AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.8.4)
       ])
     fi
   fi

config.m4

@@ -1 +1 @@
-1.8.2
+1.8.4

src/LIBMONGOCRYPT_VERSION_CURRENT

@@ -1 +1 @@
-1.25.2
+1.25.4

src/LIBMONGOC_VERSION_CURRENT

@@ -1,25 +1,17 @@
 --TEST--
 Atlas Connectivity Tests
 --SKIPIF--
-<?php
-if (!file_exists('.evergreen/atlas-uris.txt')) { echo "skip Atlas URIs not found\n"; }
-if (filesize('.evergreen/atlas-uris.txt') < 10) { echo "skip Atlas URI file empty\n"; }
-if (getenv('TESTS') !== 'tests/atlas.phpt') { echo "skip Atlas tests not wanted\n"; }
-?>
+<?php require __DIR__ . "/utils/basic-skipif.inc"; ?>
+<?php skip_if_no_atlas_connectivity_urls(); ?>
+<?php if (getenv('TESTS') !== 'tests/atlas.phpt') { die('skip Atlas tests not wanted'); } ?>
 --FILE--
 <?php
-$urls = explode("\n", file_get_contents('.evergreen/atlas-uris.txt'));
+require_once __DIR__ . "/utils/basic.inc";
 
 $command = new \MongoDB\Driver\Command(['ping' => 1]);
 $query = new \MongoDB\Driver\Query([]);
 
-foreach ($urls as $url) {
-	$url = trim($url);
-
-	if ($url == '') {
-		continue;
-	}
-
+foreach (getAtlasConnectivityUrls() as $url) {
 	if (strpos($url, '#') === 0) {
 		echo trim(substr($url, 1)), "\n";
 		continue;

src/libmongocrypt

@@ -494,3 +494,10 @@ function skip_if_no_crypt_shared()
         exit('skip crypt_shared is not available');
     }
 }
+
+function skip_if_no_atlas_connectivity_urls()
+{
+    if (getAtlasConnectivityUrls() === []) {
+        exit('skip No Atlas URIs found');
+    }
+}

tests/atlas.phpt

@@ -847,3 +847,26 @@ function failGetMore(Manager $manager)
 
     throw new Exception("Trying to configure a getMore fail point for a server version ($version) that doesn't support it");
 }
+
+function getAtlasConnectivityUrls(): array
+{
+    $atlasUriString = getenv('ATLAS_CONNECTIVITY_URIS') ?: '';
+    if (!$atlasUriString) {
+        return [];
+    }
+
+    $rawUrls = explode("\n", $atlasUriString);
+
+    $urls = [];
+    foreach ($rawUrls as $url) {
+        $url = trim($url);
+
+        if ($url == '') {
+            continue;
+        }
+
+        $urls[] = $url;
+    }
+
+    return $urls;
+}