Added logging on HTTP exception (#507)

* Added logging on HTTP exception

* Fixed tests

* Test fix

* Added name to please "composer normalize"

* Dont log in constructor

* Mniir

* PHPStan fix

Author: Nyholm

src/AbstractApi.php

@@ -48,6 +48,11 @@ abstract class AbstractApi
      */
     private $signers;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Configuration|array $configuration
      */
@@ -60,13 +65,13 @@ public function __construct($configuration = [], ?CredentialProvider $credential
         }
 
         $this->httpClient = $httpClient ?? HttpClient::create();
-        $logger = $logger ?? new NullLogger();
+        $this->logger = $logger ?? new NullLogger();
         $this->configuration = $configuration;
         $this->credentialProvider = $credentialProvider ?? new CacheProvider(new ChainProvider([
             new ConfigurationProvider(),
-            new WebIdentityProvider($logger),
-            new IniFileProvider($logger),
-            new InstanceProvider($this->httpClient, $logger),
+            new WebIdentityProvider($this->logger),
+            new IniFileProvider($this->logger),
+            new InstanceProvider($this->httpClient, $this->logger),
         ]));
     }
 
@@ -121,7 +126,7 @@ final protected function getResponse(Request $request, ?RequestContext $context
             ]
         );
 
-        return new Response($response, $this->httpClient);
+        return new Response($response, $this->httpClient, $this->logger);
     }
 
     /**

src/Response.php

@@ -16,6 +16,7 @@
 use AsyncAws\Core\Stream\ResponseBodyResourceStream;
 use AsyncAws\Core\Stream\ResponseBodyStream;
 use AsyncAws\Core\Stream\ResultStream;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -61,10 +62,16 @@ class Response
      */
     private $didThrow = false;
 
-    public function __construct(ResponseInterface $response, HttpClientInterface $httpClient)
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(ResponseInterface $response, HttpClientInterface $httpClient, LoggerInterface $logger)
     {
         $this->httpResponse = $response;
         $this->httpClient = $httpClient;
+        $this->logger = $logger;
     }
 
     public function __destruct()
@@ -349,6 +356,20 @@ private function getResolveStatus(): bool
             /** @psalm-suppress PropertyTypeCoercion */
             $this->resolveResult = new $class(...$args);
         }
+
+        if ($this->resolveResult instanceof HttpException) {
+            /** @var int $code */
+            $code = $this->httpResponse->getInfo('http_code');
+            /** @var string $url */
+            $url = $this->httpResponse->getInfo('url');
+            $this->logger->error(sprintf('HTTP %d returned for "%s".', $code, $url), [
+                'aws_code' => $this->resolveResult->getAwsCode(),
+                'aws_message' => $this->resolveResult->getAwsMessage(),
+                'aws_type' => $this->resolveResult->getAwsType(),
+                'aws_detail' => $this->resolveResult->getAwsDetail(),
+            ]);
+        }
+
         if ($this->resolveResult instanceof Exception) {
             $this->didThrow = true;
 

src/Test/ResultMockFactory.php

@@ -8,6 +8,7 @@
 use AsyncAws\Core\Result;
 use AsyncAws\Core\Test\Http\SimpleMockedResponse;
 use AsyncAws\Core\Waiter;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 
 /**
@@ -40,7 +41,7 @@ public static function createFailing(string $class, int $code, ?string $message
 
         $httpResponse = new SimpleMockedResponse(\json_encode(['message' => $message]), ['content-type' => 'application/json'], $code);
         $client = new MockHttpClient($httpResponse);
-        $response = new Response($client->request('POST', 'http://localhost'), $client);
+        $response = new Response($client->request('POST', 'http://localhost'), $client, new NullLogger());
 
         $reflectionClass = new \ReflectionClass($class);
 

tests/Unit/Result/AssumeRoleResponseTest.php

@@ -6,6 +6,7 @@
 use AsyncAws\Core\Sts\Result\AssumeRoleResponse;
 use AsyncAws\Core\Test\Http\SimpleMockedResponse;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 
 class AssumeRoleResponseTest extends TestCase
@@ -40,7 +41,7 @@ public function testAssumeRoleResponse(): void
         ');
 
         $client = new MockHttpClient($response);
-        $result = new AssumeRoleResponse(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new AssumeRoleResponse(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         self::assertSame('arn:aws:sts::123456789012:assumed-role/demo/TestAR', $result->getAssumedRoleUser()->getArn());
         self::assertSame('ARO123EXAMPLE123:TestAR', $result->getAssumedRoleUser()->getAssumedRoleId());

tests/Unit/Result/AssumeRoleWithWebIdentityResponseTest.php

@@ -6,6 +6,7 @@
 use AsyncAws\Core\Sts\Result\AssumeRoleWithWebIdentityResponse;
 use AsyncAws\Core\Test\Http\SimpleMockedResponse;
 use AsyncAws\Core\Test\TestCase;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 
 class AssumeRoleWithWebIdentityResponseTest extends TestCase
@@ -35,7 +36,7 @@ public function testAssumeRoleWithWebIdentityResponse(): void
         </AssumeRoleWithWebIdentityResponse>');
 
         $client = new MockHttpClient($response);
-        $result = new AssumeRoleWithWebIdentityResponse(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new AssumeRoleWithWebIdentityResponse(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         // self::assertTODO(expected, $result->getCredentials());
         self::assertSame('amzn1.account.AF6RHO7KZU5XRVQJGXK6HB56KR2A', $result->getSubjectFromWebIdentityToken());

tests/Unit/Result/GetCallerIdentityResponseTest.php

@@ -6,6 +6,7 @@
 use AsyncAws\Core\Sts\Result\GetCallerIdentityResponse;
 use AsyncAws\Core\Test\Http\SimpleMockedResponse;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 
 class GetCallerIdentityResponseTest extends TestCase
@@ -27,7 +28,7 @@ public function testGetCallerIdentityResponse(): void
         ');
 
         $client = new MockHttpClient($response);
-        $result = new GetCallerIdentityResponse(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new GetCallerIdentityResponse(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         self::assertStringContainsString('ARO123EXAMPLE123:my-role-session-name', $result->getUserId());
         self::assertStringContainsString('123456789012', $result->getAccount());

tests/Unit/ResultTest.php

@@ -10,6 +10,7 @@
 use AsyncAws\Core\Result;
 use AsyncAws\Core\Test\Http\SimpleMockedResponse;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 
 class ResultTest extends TestCase
@@ -58,7 +59,7 @@ public function testThrowExceptionDestruct()
     {
         $response = new SimpleMockedResponse('Bad request', [], 400);
         $client = new MockHttpClient($response);
-        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         $this->expectException(ClientException::class);
         unset($result);
@@ -68,7 +69,7 @@ public function testThrowExceptionOnlyOnce()
     {
         $response = new SimpleMockedResponse('Bad request', [], 400);
         $client = new MockHttpClient($response);
-        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         try {
             $result->resolve();
@@ -90,7 +91,7 @@ public function testWait()
         $results = [];
         $client = new MockHttpClient((function () { while (true) { yield new SimpleMockedResponse('OK', [], 200); } })());
         for ($i = 0; $i < 10; ++$i) {
-            $results[] = new Result(new Response($client->request('POST', 'http://localhost'), $client));
+            $results[] = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
         }
 
         $counter = 0;
@@ -106,8 +107,8 @@ public function testWait()
     public function testWaitWithMixException()
     {
         $client = new MockHttpClient([new SimpleMockedResponse('Bad request', [], 400), new SimpleMockedResponse('OK', [], 200)]);
-        $result1 = new Result(new Response($client->request('POST', 'http://localhost'), $client));
-        $result2 = new Result(new Response($client->request('POST', 'http://localhost'), $client));
+        $result1 = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
+        $result2 = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         $counter = 0;
         foreach (Result::wait([$result1, $result2]) as $result) {
@@ -123,7 +124,7 @@ public function testWaitWithMixException()
     public function testWaitWithExceptionOnDestruct()
     {
         $client = new MockHttpClient(new SimpleMockedResponse('Bad request', [], 400));
-        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         foreach (Result::wait([$result]) as $r) {
             self::assertTrue($r->info()['resolved']);
@@ -136,7 +137,7 @@ public function testWaitWithExceptionOnDestruct()
     public function testWaitWithBody()
     {
         $client = new MockHttpClient(new SimpleMockedResponse('OK', [], 200));
-        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         foreach (Result::wait([$result], null, true) as $result) {
             self::assertTrue($result->info()['resolved']);
@@ -147,7 +148,7 @@ public function testWaitWithBody()
     public function testWaitWithBodyAfterManuallyResolve()
     {
         $client = new MockHttpClient(new SimpleMockedResponse('OK', [], 200));
-        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client));
+        $result = new Result(new Response($client->request('POST', 'http://localhost'), $client, new NullLogger()));
 
         $result->resolve();
         self::assertTrue($result->info()['resolved']);