Commit eb393f1

authored

Merge v1.21 into v1.x (#1707)

2 parents 1ca9d0f + c5b87c0 commit eb393f1Copy full SHA for eb393f1

File tree

1 file changed

-6

lines changed

tests/SpecTests
- ClientSideEncryptionSpecTest.php

1 file changed

-6

lines changed

`‎tests/SpecTests/ClientSideEncryptionSpecTest.php`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ public function testCustomEndpoint(Closure $test): void`
`762`	`762`	`'kmsProviders' => [`
`763`	`763`	`'azure' => Context::getAzureCredentials() + ['identityPlatformEndpoint' => 'doesnotexist.invalid:443'],`
`764`	`764`	`'gcp' => Context::getGCPCredentials() + ['endpoint' => 'doesnotexist.invalid:443'],`
`765`		`- 'kmip' => ['endpoint' => 'doesnotexist.local:5698'],`
	`765`	`+ 'kmip' => ['endpoint' => 'doesnotexist.invalid:5698'],`
`766`	`766`	`],`
`767`	`767`	`'tlsOptions' => [`
`768`	`768`	`'kmip' => Context::getKmsTlsOptions(),`
`@@ -810,9 +810,9 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio`
`810`	`810`	`];`
`811`	`811`
`812`	`812`	`yield 'Test 4' => [`
`813`		`- static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($awsMasterKey): void {`
	`813`	`+ static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($kmipMasterKey): void {`
`814`	`814`	`$test->expectException(ConnectionException::class);`
`815`		`- $clientEncryption->createDataKey('aws', ['masterKey' => $awsMasterKey + ['endpoint' => 'kms.us-east-1.amazonaws.com:12345']]);`
	`815`	`+ $clientEncryption->createDataKey('kmip', ['masterKey' => $kmipMasterKey + ['endpoint' => 'localhost:12345']]);`
`816`	`816`	`},`
`817`	`817`	`];`
`818`	`818`
`@@ -873,7 +873,7 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio`
`873`	`873`	`$test->assertSame('test', $clientEncryption->decrypt($encrypted));`
`874`	`874`
`875`	`875`	`$test->expectException(RuntimeException::class);`
`876`		`- $test->expectExceptionMessageMatches('#doesnotexist.local#');`
	`876`	`+ $test->expectExceptionMessageMatches('#doesnotexist.invalid#');`
`877`	`877`	`$clientEncryptionInvalid->createDataKey('kmip', ['masterKey' => $kmipMasterKey]);`
`878`	`878`	`},`
`879`	`879`	`];`
`@@ -890,10 +890,10 @@ static function (self $test, ClientEncryption $clientEncryption, ClientEncryptio`
`890`	`890`
`891`	`891`	`yield 'Test 12' => [`
`892`	`892`	`static function (self $test, ClientEncryption $clientEncryption, ClientEncryption $clientEncryptionInvalid) use ($kmipMasterKey): void {`
`893`		`- $kmipMasterKey['endpoint'] = 'doesnotexist.local:5698';`
	`893`	`+ $kmipMasterKey['endpoint'] = 'doesnotexist.invalid:5698';`
`894`	`894`
`895`	`895`	`$test->expectException(RuntimeException::class);`
`896`		`- $test->expectExceptionMessageMatches('#doesnotexist.local#');`
	`896`	`+ $test->expectExceptionMessageMatches('#doesnotexist.invalid#');`
`897`	`897`	`$clientEncryption->createDataKey('kmip', ['masterKey' => $kmipMasterKey]);`
`898`	`898`	`},`
`899`	`899`	`];`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit eb393f1

File tree

1 file changed

1 file changed

`‎tests/SpecTests/ClientSideEncryptionSpecTest.php`

0 commit comments