8000 minor #52965 [Mailer] Stop using the (local) AWS shared configuration… · fancyweb/symfony@ff864b1 · GitHub
[go: up one dir, main page]
Skip to content

Commit ff864b1

Browse files
fabpotfabpot
committed
minor symfony#52965 [Mailer] Stop using the (local) AWS shared configuration in PHPUnit (cafferata)
This PR was merged into the 5.4 branch. Discussion ---------- [Mailer] Stop using the (local) AWS shared configuration in PHPUnit | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT Replaces symfony#52958 Found an (other) way to stop using the (local) [AWS shared configuration](https://async-aws.com/authentication/credentials-file.html) in the Composer package [async-aws/core](https://github.com/async-aws/core) in the PHPUnit tests. 🥳 _This was an great Symfony hackday pair session with `@TmEuMail`-2020._ Also big shout out to `@xabbuh` and `@OskarStark` for the heads up in the right direction! 👍 ```shell ./phpunit src/Symfony/Component/Mailer ``` **Before** <details> <summary>PHPUnit output</summary> ```shell PHPUnit 9.6.15 by Sebastian Bergmann and contributors. Testing /symfony/symfony/src/Symfony/Component/Mailer F...F...F.F...F...F............................................ 63 / 495 ( 12%) ............................................................... 126 / 495 ( 25%) ............................................................... 189 / 495 ( 38%) ............................................................... 252 / 495 ( 50%) ............................................................... 315 / 495 ( 63%) ............................................................... 378 / 495 ( 76%) .......................................SSS...SS.............S.. 441 / 495 ( 89%) ..................SS.................................. 495 / 495 (100%) Time: 00:02.082, Memory: 24.00 MB There were 6 failures: 1) Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport\SesApiAsyncAwsTransportTest::testToString with data set #0 (Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiAsyncAwsTransport Object (...), 'ses+api://ACCESS_KEY@us-east-1') Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ -'ses+api://ACCESS_KEY@us-east-1' +'ses+api://ACCESS_KEY@eu-west-1' /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php:34 2) Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport\SesApiAsyncAwsTransportTest::testToString with data set #4 (Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiAsyncAwsTransport Object (...), 'ses+api://ACCESS_KEY@us-east-1') Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ -'ses+api://ACCESS_KEY@us-east-1' +'ses+api://ACCESS_KEY@eu-west-1' /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php:34 3) Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport\SesApiAsyncAwsTransportTest::testSend Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ -'https://email.us-east-1.amazonaws.com/v2/email/outbound-emails' +'https://email.eu-west-1.amazonaws.com/v2/email/outbound-emails' /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php:79 /symfony/symfony/src/Symfony/Component/HttpClient/MockHttpClient.php:70 /symfony/symfony/vendor/async-aws/core/src/AbstractApi.php:161 /symfony/symfony/vendor/async-aws/ses/src/SesClient.php:67 /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php:55 /symfony/symfony/src/Symfony/Component/Mailer/Transport/AbstractTransport.php:69 /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php:119 4) Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport\SesHttpAsyncAwsTransportTest::testToString with data set #0 (Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport Object (...), 'ses+https://ACCESS_KEY@us-east-1') Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ -'ses+https://ACCESS_KEY@us-east-1' +'ses+https://ACCESS_KEY@eu-west-1' /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php:34 5) Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport\SesHttpAsyncAwsTransportTest::testToString with data set #4 (Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport Object (...), 'ses+https://ACCESS_KEY@us-east-1') Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ -'ses+https://ACCESS_KEY@us-east-1' +'ses+https://ACCESS_KEY@eu-west-1' /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php:34 6) Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport\SesHttpAsyncAwsTransportTest::testSend Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ -'https://email.us-east-1.amazonaws.com/v2/email/outbound-emails' +'https://email.eu-west-1.amazonaws.com/v2/email/outbound-emails' /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php:79 /symfony/symfony/src/Symfony/Component/HttpClient/MockHttpClient.php:70 /symfony/symfony/vendor/async-aws/core/src/AbstractApi.php:161 /symfony/symfony/vendor/async-aws/ses/src/SesClient.php:67 /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php:55 /symfony/symfony/src/Symfony/Component/Mailer/Transport/AbstractTransport.php:69 /symfony/symfony/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php:112 FAILURES! Tests: 495, Assertions: 923, Failures: 6, Skipped: 8. ``` </details> **After** <details> <summary>PHPUnit output</summary> ```shell PHPUnit 9.6.15 by Sebastian Bergmann and contributors. Testing /symfony/symfony/src/Symfony/Component/Mailer ............................................................... 63 / 495 ( 12%) ............................................................... 126 / 495 ( 25%) ............................................................... 189 / 495 ( 38%) ............................................................... 252 / 495 ( 50%) ............................................................... 315 / 495 ( 63%) ............................................................... 378 / 495 ( 76%) .......................................SSS...SS.............S.. 441 / 495 ( 89%) ..................SS.................................. 495 / 495 (100%) Time: 00:02.387, Memory: 24.00 MB OK, but incomplete, skipped, or risky tests! Tests: 495, Assertions: 943, Skipped: 8. ``` </details> Commits ------- b156c33 [Mailer] Stop using the (local) AWS shared configuration in the PHPUnit tests.
2 parents 7121397 + b156c33 commit ff864b1

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@ public static function getTransportData()
3737
{
3838
return [
3939
[
40-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY']))),
40+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY']))),
4141
'ses+api://ACCESS_KEY@us-east-1',
4242
],
4343
[
44-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1']))),
44+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1']))),
4545
'ses+api://ACCESS_KEY@us-west-1',
4646
],
4747
[
48-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com']))),
48+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com']))),
4949
'ses+api://ACCESS_KEY@example.com',
5050
],
5151
[
52-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99']))),
52+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99']))),
5353
'ses+api://ACCESS_KEY@example.com:99',
5454
],
5555
[
56-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'sessionToken' => 'SESSION_TOKEN']))),
56+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'sessionToken' => 'SESSION_TOKEN']))),
5757
'ses+api://ACCESS_KEY@us-east-1',
5858
],
5959
[
60-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1', 'sessionToken' => 'SESSION_TOKEN']))),
60+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1', 'sessionToken' => 'SESSION_TOKEN']))),
6161
'ses+api://ACCESS_KEY@us-west-1',
6262
],
6363
[
64-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com', 'sessionToken' => 'SESSION_TOKEN']))),
64+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com', 'sessionToken' => 'SESSION_TOKEN']))),
6565
'ses+api://ACCESS_KEY@example.com',
6666
],
6767
[
68-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99', 'sessionToken' => 'SESSION_TOKEN']))),
68+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99', 'sessionToken' => 'SESSION_TOKEN']))),
6969
'ses+api://ACCESS_KEY@example.com:99',
7070
],
7171
];
@@ -97,7 +97,7 @@ public function testSend()
9797
]);
9898
});
9999

100-
$transport = new SesApiAsyncAwsTransport(new SesClient(Configuration::create([]), new NullProvider(), $client));
100 8000 +
$transport = new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false]), new NullProvider(), $client));
101101

102102
$mail = new Email();
103103
$mail->subject('Hello!')

‎src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@ public static function getTransportData()
3737
{
3838
return [
3939
[
40-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY']))),
40+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY']))),
4141
'ses+https://ACCESS_KEY@us-east-1',
4242
],
4343
[
44-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1']))),
44+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1']))),
4545
'ses+https://ACCESS_KEY@us-west-1',
4646
],
4747
[
48-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com']))),
48+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com']))),
4949
'ses+https://ACCESS_KEY@example.com',
5050
],
5151
[
52-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99']))),
52+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99']))),
5353
'ses+https://ACCESS_KEY@example.com:99',
5454
],
5555
[
56-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'sessionToken' => 'SESSION_TOKEN']))),
56+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'sessionToken' => 'SESSION_TOKEN']))),
5757
'ses+https://ACCESS_KEY@us-east-1',
5858
],
5959
[
60-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1', 'sessionToken' => 'SESSION_TOKEN']))),
60+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'region' => 'us-west-1', 'sessionToken' => 'SESSION_TOKEN']))),
6161
'ses+https://ACCESS_KEY@us-west-1',
6262
],
6363
[
64-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com', 'sessionToken' => 'SESSION_TOKEN']))),
64+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com', 'sessionToken' => 'SESSION_TOKEN']))),
6565
'ses+https://ACCESS_KEY@example.com',
6666
],
6767
[
68-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99', 'sessionToken' => 'SESSION_TOKEN']))),
68+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false, 'accessKeyId' => 'ACCESS_KEY', 'accessKeySecret' => 'SECRET_KEY', 'endpoint' => 'https://example.com:99', 'sessionToken' => 'SESSION_TOKEN']))),
6969
'ses+https://ACCESS_KEY@example.com:99',
7070
],
7171
];
@@ -94,7 +94,7 @@ public function testSend()
9494
]);
9595
});
9696

97-
$transport = new SesHttpAsyncAwsTransport(new SesClient(Configuration::create([]), new NullProvider(), $client));
97+
$transport = new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['sharedConfigFile' => false]), new NullProvider(), $client));
9898

9999
$mail = new Email();
100100
$mail->subject('Hello!')

0 commit comments

Comments
 (0)
0