Merge pull request #2 from appwrite-labs/logs

fix: make logs return plain-text instead of wrapping as resource

Author: loks0n

src/KubernetesCluster.php

@@ -213,9 +213,7 @@ public function runOperation(string $operation, string $path, $payload = '', arr
             default: break;
         }
 
-        $method = static::$operations[$operation] ?? static::$operations[static::GET_OP];
-
-        return $this->makeRequest($method, $path, $payload, $query);
+        return $this->makeRequest($operation, $path, $payload, $query);
     }
 
     /**
@@ -303,7 +301,7 @@ protected function execPath(
         array $query = ['pretty' => 1, 'stdin' => 1, 'stdout' => 1, 'stderr' => 1, 'tty' => 1]
     ) {
         try {
-            return $this->makeRequest(static::$operations[static::EXEC_OP], $path, '', $query);
+            return $this->makeRequest(static::EXEC_OP, $path, '', $query);
         } catch (KubernetesAPIException $e) {
             $payload = $e->getPayload();
 
@@ -336,7 +334,7 @@ protected function attachPath(
         array $query = ['pretty' => 1, 'stdin' => 1, 'stdout' => 1, 'stderr' => 1, 'tty' => 1]
     ) {
         try {
-            return $this->makeRequest(static::$operations[static::ATTACH_OP], $path, '', $query);
+            return $this->makeRequest(static::ATTACH_OP, $path, '', $query);
         } catch (KubernetesAPIException $e) {
             $payload = $e->getPayload();
 

src/Traits/Cluster/MakesHttpCalls.php

@@ -99,27 +99,32 @@ public function call(string $method, string $path, string $payload = '', array $
     /**
      * Call the API with the specified method and path.
      *
-     * @param  string  $method
+     * @param  string  $operation
      * @param  string  $path
      * @param  string  $payload
      * @param  array  $query
      * @return mixed
      *
      * @throws \RenokiCo\PhpK8s\Exceptions\KubernetesAPIException
      */
-    protected function makeRequest(string $method, string $path, string $payload = '', array $query = ['pretty' => 1])
+    protected function makeRequest(string $operation, string $path, string $payload = '', array $query = ['pretty' => 1])
     {
         $resourceClass = $this->resourceClass;
 
+        $method = static::$operations[$operation] ?? static::$operations[static::GET_OP];
         $response = $this->call($method, $path, $payload, $query);
 
+        if ($operation === static::LOG_OP) {
+            return (string) $response->getBody();
+        }
+
         $json = @json_decode($response->getBody(), true);
 
         // If the output is not JSONable, return the response itself.
         // This can be encountered in case of a pod log request, for example,
         // where the data returned are just console logs.
 
-        if (! $json) {
+        if (!$json) {
             return (string) $response->getBody();
         }