Merge v2.1 into v2.x

.evergreen/config.yml

@@ -9,9 +9,9 @@ command_type: system
 # Fail builds when pre tasks fail.
 pre_error_fails_task: true
 
-# Protect ourselves against rogue test case that runs forever. Tasks are killed after 20 minutes, which shouldn't occur
+# Protect ourselves against rogue test case that runs forever. Tasks are killed after 30 minutes, which shouldn't occur
 # under normal circumstances.
-exec_timeout_secs: 1200
+exec_timeout_secs: 1800
 
 # These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local
 # MongoDB instances. All other tasks that require special preparation should be run from within a task group

.evergreen/config/functions.yml

@@ -158,6 +158,7 @@ functions:
   "bootstrap mongohoused":
     - command: shell.exec
       params:
+        include_expansions_in_env: [AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]
         script: |
           cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake
 

tests/SpecTests/ClientSideEncryptionSpecTest.php

@@ -753,7 +753,7 @@ public function testCustomEndpoint(Closure $test): void
             'kmsProviders' => [
                 'azure' => Context::getAzureCredentials() + ['identityPlatformEndpoint' => 'doesnotexist.invalid:443'],
                 'gcp' => Context::getGCPCredentials() + ['endpoint' => 'doesnotexist.invalid:443'],
-                'kmip' => ['endpoint' => 'doesnotexist.local:5698'],
+                'kmip' => ['endpoint' => 'doesnotexist.invalid:5698'],
             ],
             'tlsOptions' => [
                 'kmip' => Context::getKmsTlsOptions(),
@@ -801,9 +801,9 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio
         ];
 
         yield 'Test 4' => [
-            static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($awsMasterKey): void {
+            static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($kmipMasterKey): void {
                 $test->expectException(ConnectionException::class);
-                $clientEncryption->createDataKey('aws', ['masterKey' => $awsMasterKey + ['endpoint' => 'kms.us-east-1.amazonaws.com:12345']]);
+                $clientEncryption->createDataKey('kmip', ['masterKey' => $kmipMasterKey + ['endpoint' => 'localhost:12345']]);
             },
         ];
 
@@ -864,7 +864,7 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio
                 $test->assertSame('test', $clientEncryption->decrypt($encrypted));
 
                 $test->expectException(RuntimeException::class);
-                $test->expectExceptionMessageMatches('#doesnotexist.local#');
+                $test->expectExceptionMessageMatches('#doesnotexist.invalid#');
                 $clientEncryptionInvalid->createDataKey('kmip', ['masterKey' => $kmipMasterKey]);
             },
         ];
@@ -881,10 +881,10 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio
 
         yield 'Test 12' => [
             static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($kmipMasterKey): void {
-                $kmipMasterKey['endpoint'] = 'doesnotexist.local:5698';
+                $kmipMasterKey['endpoint'] = 'doesnotexist.invalid:5698';
 
                 $test->expectException(RuntimeException::class);
-                $test->expectExceptionMessageMatches('#doesnotexist.local#');
+                $test->expectExceptionMessageMatches('#doesnotexist.invalid#');
                 $clientEncryption->createDataKey('kmip', ['masterKey' => $kmipMasterKey]);
             },
         ];