Use full body content as exception message when catching ClientExcept…

…ion (with Guzzle 6)
maclof · Apr 19, 2018 · 0e34e6b · 0e34e6b
1 parent bb0bfa8
commit 0e34e6b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -145,7 +145,7 @@ class Client
 		'events'                 => 'Repositories\EventRepository',
 		'configMaps'             => 'Repositories\ConfigMapRepository',
 		'endpoints'              => 'Repositories\EndpointRepository',
-	  'persistentVolume'       => 'Repositories\PersistentVolumeRepository',
+		'persistentVolume'       => 'Repositories\PersistentVolumeRepository',
 		'persistentVolumeClaims' => 'Repositories\PersistentVolumeClaimRepository',
 		'namespaces'             => 'Repositories\NamespaceRepository',
 
@@ -312,7 +312,7 @@ public function getGuzzleClient()
 	 * @param  boolean $namespace
 	 * @param  string  $apiVersion
 	 * @return array|string
-	 * @throws \Exception
+	 * @throws \Maclof\Kubernetes\Exceptions\BadRequestException
 	 */
 	public function sendRequest($method, $uri, $query = [], $body = [], $namespace = true, $apiVersion = null)
 	{
@@ -339,7 +339,7 @@ public function sendRequest($method, $uri, $query = [], $body = [], $namespace =
 				$request = $this->guzzleClient->createRequest($method, $requestUri, $requestOptions);
 				$response = $this->guzzleClient->send($request);
 			} catch (ClientException $e) {
-				throw new BadRequestException($e->getMessage());
+				throw new BadRequestException($e->getMessage(), 0, $e);
 			}
 
 			try {
@@ -349,15 +349,28 @@ public function sendRequest($method, $uri, $query = [], $body = [], $namespace =
 			}
 		}
 
-		$response = $this->guzzleClient->request($method, $requestUri, $requestOptions);
+		try {
+			$response = $this->guzzleClient->request($method, $requestUri, $requestOptions);
 
-		$bodyResponse = (string) $response->getBody();
-		$jsonResponse = json_decode($bodyResponse, true);
+			$bodyResponse = (string) $response->getBody();
+			$jsonResponse = json_decode($bodyResponse, true);
 
-		return is_array($jsonResponse) ? $jsonResponse : $bodyResponse;
+			return is_array($jsonResponse) ? $jsonResponse : $bodyResponse;
+		} catch (ClientException $e) {
+			$fullMessage = (string) $e->getResponse()->getBody();
+			throw new BadRequestException($fullMessage, 0, $e);
+		}
 	}
 
-	public function __call($name, $args)
+	/**
+	 * Magic call method to grab a class instance.
+	 * 
+	 * @param  string $name
+	 * @param  array  $args
+	 * @return \stdClass
+	 * @throws \BadMethodCallException
+	 */
+	public function __call($name, array $args)
 	{
 		if (isset($this->classMap[$name])) {
 			$class = 'Maclof\Kubernetes\\' . $this->classMap[$name];

diff --git a/src/Exceptions/BadRequestException.php b/src/Exceptions/BadRequestException.php
@@ -4,5 +4,5 @@
 
 class BadRequestException extends Exception
 {
-	
-}
+
+}
diff --git a/src/Exceptions/MissingOptionException.php b/src/Exceptions/MissingOptionException.php
@@ -4,5 +4,5 @@
 
 class MissingOptionException extends Exception
 {
-	
-}
+
+}