Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 85ab922

Browse files
Merge v2.0 into v2.1 (#1710)
2 parents 3bbe7ba + d92e223 commit 85ab922

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

‎.evergreen/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ command_type: system
99
# Fail builds when pre tasks fail.
1010
pre_error_fails_task: true
1111

12-
# Protect ourselves against rogue test case that runs forever. Tasks are killed after 20 minutes, which shouldn't occur
12+
# Protect ourselves against rogue test case that runs forever. Tasks are killed after 30 minutes, which shouldn't occur
1313
# under normal circumstances.
14-
exec_timeout_secs: 1200
14+
exec_timeout_secs: 1800
1515

1616
# These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local
1717
# MongoDB instances. All other tasks that require special preparation should be run from within a task group

‎.evergreen/config/functions.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ functions:
158158
"bootstrap mongohoused":
159159
- command: shell.exec
160160
params:
161+
include_expansions_in_env: [AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]
161162
script: |
162163
cd ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake
163164

‎tests/SpecTests/ClientSideEncryptionSpecTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ public function testCustomEndpoint(Closure $test): void
753753
'kmsProviders' => [
754754
'azure' => Context::getAzureCredentials() + ['identityPlatformEndpoint' => 'doesnotexist.invalid:443'],
755755
'gcp' => Context::getGCPCredentials() + ['endpoint' => 'doesnotexist.invalid:443'],
756-
'kmip' => ['endpoint' => 'doesnotexist.local:5698'],
756+
'kmip' => ['endpoint' => 'doesnotexist.invalid:5698'],
757757
],
758758
'tlsOptions' => [
759759
'kmip' => Context::getKmsTlsOptions(),
@@ -801,9 +801,9 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio
801801
];
802802

803803
yield 'Test 4' => [
804-
static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($awsMasterKey): void {
804+
static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($kmipMasterKey): void {
805805
$test->expectException(ConnectionException::class);
806-
$clientEncryption->createDataKey('aws', ['masterKey' => $awsMasterKey + ['endpoint' => 'kms.us-east-1.amazonaws.com:12345']]);
806+
$clientEncryption->createDataKey('kmip', ['masterKey' => $kmipMasterKey + ['endpoint' => 'localhost:12345']]);
807807
},
808808
];
809809

@@ -864,7 +864,7 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio
864864
$test->assertSame('test', $clientEncryption->decrypt($encrypted));
865865

866866
$test->expectException(RuntimeException::class);
867-
$test->expectExceptionMessageMatches('#doesnotexist.local#');
867+
$test->expectExceptionMessageMatches('#doesnotexist.invalid#');
868868
$clientEncryptionInvalid->createDataKey('kmip', ['masterKey' => $kmipMasterKey]);
869869
},
870870
];
@@ -881,10 +881,10 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio
881881

882882
yield 'Test 12' => [
883883
static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($kmipMasterKey): void {
884-
$kmipMasterKey['endpoint'] = 'doesnotexist.local:5698';
884+
$kmipMasterKey['endpoint'] = 'doesnotexist.invalid:5698';
885885

886886
$test->expectException(RuntimeException::class);
887-
$test->expectExceptionMessageMatches('#doesnotexist.local#');
887+
$test->expectExceptionMessageMatches('#doesnotexist.invalid#');
888888
$clientEncryption->createDataKey('kmip', ['masterKey' => $kmipMasterKey]);
889889
},
890890
];

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /