Merge pull request #1216 from alcaeus/1.17-merge-master

Merge branch '1.17' into master

Author: alcaeus

.evergreen/config/functions.yml

@@ -141,7 +141,7 @@ functions:
       params:
         script: |
           ${PREPARE_SHELL}
-          SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+          SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with MONGODB_URI and CRYPT_SHARED_LIB_PATH
     - command: expansions.update
       params:
@@ -152,7 +152,7 @@ functions:
       params:
         script: |
           ${PREPARE_SHELL}
-          sh ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
+          ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
 
   "bootstrap mongohoused":
     - command: shell.exec
@@ -161,14 +161,14 @@ functions:
           cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake
 
           DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
-          bash pull-mongohouse-image.sh
+          ./pull-mongohouse-image.sh
     - command: shell.exec
       params:
         script: |
           cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake
 
           DRIVERS_TOOLS="${DRIVERS_TOOLS}" \
-          bash run-mongohouse-image.sh
+          ./run-mongohouse-image.sh
 
   "create serverless instance":
     - command: shell.exec
@@ -277,7 +277,7 @@ functions:
           PHP_VERSION=${PHP_VERSION} \
           SSL=${SSL} \
           TESTS=${TESTS} \
-          sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
+          ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "run atlas data lake test":
     - command: shell.exec
@@ -290,7 +290,7 @@ functions:
           
           MONGODB_URI="mongodb://mhuser:[email protected]:27017" \
           TESTS="atlas-data-lake" \
-          sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
+          ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "run serverless tests":
     - command: shell.exec
@@ -323,7 +323,7 @@ functions:
           CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
           MONGODB_URI="${SERVERLESS_URI}" \
           TESTS="serverless" \
-          sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
+          ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "cleanup":
     - command: shell.exec

tests/SpecTests/ClientSideEncryptionSpecTest.php

@@ -1762,7 +1762,7 @@ public function testOnDemandAwsCredentials(bool $shouldSucceed): void
         ];
 
         if (! $shouldSucceed) {
-            $this->expectException(AuthenticationException::class);
+            $this->expectException(RuntimeException::class);
         }
 
         $dataKeyId = $clientEncryption->createDataKey('aws', $dataKeyOpts);

tests/UnifiedSpecTests/UnifiedSpecTest.php

@@ -87,6 +87,8 @@ class UnifiedSpecTest extends FunctionalTestCase
         'valid-pass/entity-commandCursor: runCursorCommand creates and exhausts cursor by running getMores' => 'commandCursor API is not yet implemented (PHPLIB-1077)',
         'valid-pass/entity-commandCursor: createCommandCursor creates a cursor and stores it as an entity that can be iterated one document at a time' => 'commandCursor API is not yet implemented (PHPLIB-1077)',
         'valid-pass/entity-commandCursor: createCommandCursor\'s cursor can be closed and will perform a killCursors operation' => 'commandCursor API is not yet implemented (PHPLIB-1077)',
+        // libmongoc always adds readConcern to aggregate command
+        'index-management/search index operations ignore read and write concern: listSearchIndexes ignores read and write concern' => 'libmongoc appends readConcern to aggregate command',
     ];
 
     private static UnifiedTestRunner $runner;

tests/UnifiedSpecTests/index-management/createSearchIndex.json

@@ -55,7 +55,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -102,7 +102,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],

tests/UnifiedSpecTests/index-management/createSearchIndexes.json

@@ -49,7 +49,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -89,7 +89,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -138,7 +138,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],

tests/UnifiedSpecTests/index-management/dropSearchIndex.json

@@ -49,7 +49,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],

tests/UnifiedSpecTests/index-management/listSearchIndexes.json

@@ -46,7 +46,7 @@
           "object": "collection0",
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -81,7 +81,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -122,7 +122,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],