Fixing instance profile error case

devluis · May 18, 2015 · 2694946 · 2694946
1 parent 9bee50b
commit 2694946
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/Credentials/InstanceProfileProvider.php b/src/Credentials/InstanceProfileProvider.php
@@ -73,15 +73,12 @@ private function request($url)
         return $fn($request, ['timeout' => $this->timeout])
             ->then(function (ResponseInterface $response) {
                 return (string) $response->getBody();
-            })->otherwise(function ($reason) {
-                if ($reason instanceof \Exception) {
-                    throw new CredentialsException(
-                        $this->createErrorMessage($reason->getMessage()),
-                        $reason->getCode(),
-                        $reason
-                    );
-                }
-                throw new CredentialsException($this->createErrorMessage($reason));
+            })->otherwise(function (array $reason) {
+                $reason = $reason['exception'];
+                $msg = $reason->getMessage();
+                throw new CredentialsException(
+                    $this->createErrorMessage($msg, 0, $reason)
+                );
             });
     }
 

diff --git a/tests/Credentials/InstanceProfileProviderTest.php b/tests/Credentials/InstanceProfileProviderTest.php
@@ -69,8 +69,10 @@ public function testSeedsInitialCredentials()
      */
     public function testRejectsIfProfileIsNotAvailable()
     {
-        $client = function (RequestInterface $req, array $options) use (&$responses) {
-            return Promise\rejection_for('error');
+        $client = function () use (&$responses) {
+            return Promise\rejection_for([
+                'exception' => new \Exception('error')
+            ]);
         };
         $p = new InstanceProfileProvider(['client' => $client]);
         $p()->wait();
@@ -83,7 +85,9 @@ public function testRejectsIfProfileIsNotAvailable()
     public function testThrowsExceptionIfCredentialsNotAvailable()
     {
         $client = function () use (&$responses) {
-            return Promise\rejection_for('error');
+            return Promise\rejection_for([
+                'exception' => new \Exception('error')
+            ]);
         };
         $args['client'] = $client;
         $args['profile'] = 'foo';