Merge branch 'release/1.8.4'

Attlaz-Platform · Jan 9, 2023 · da021a0 · da021a0
2 parents 93625f9 + c408ef7
commit da021a0
Show file tree

Hide file tree

Showing 12 changed files with 348 additions and 413 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Client.php b/src/Client.php
@@ -35,6 +35,10 @@ class Client
     private LogEndpoint $logEndpoint;
     private ConnectionEndpoint $connectionEndpoint;
 
+    private bool $profileRequests = false;
+
+    private array $profiles = [];
+
     public function __construct(string $clientId, string $clientSecret, bool $storeToken = false)
     {
         if (empty($clientId)) {
@@ -61,7 +65,7 @@ public function setEndPoint(string $endPoint): void
         $this->endPoint = rtrim($endPoint, "/");
     }
 
-    private function authenticate()
+    private function authenticate(): void
     {
 
 
@@ -110,12 +114,12 @@ public function getAccessToken(): ?AccessToken
         return $this->accessToken;
     }
 
-    public function setAccessToken(AccessToken $accessToken)
+    public function setAccessToken(AccessToken $accessToken): void
     {
         $this->accessToken = $accessToken;
     }
 
-    public function setTimeout(int $timeout)
+    public function setTimeout(int $timeout): void
     {
         $this->timeout = $timeout;
     }
@@ -139,17 +143,34 @@ public function createRequest(string $method, string $uri, $body = null): Reques
         return $this->provider->getAuthenticatedRequest($method, $url, $this->accessToken, $options);
     }
 
+
     public function sendRequest(RequestInterface $request): array
     {
+        $response = null;
         try {
+
+            $startTime = \microtime(true);
+
             $response = $this->provider->getHttpClient()
                 ->send($request, ['debug' => $this->debug]);
 
+
             $jsonResponse = \json_decode($response->getBody()
                 ->getContents(), true);
 
         } catch (\Throwable $ex) {
             throw new RequestException($ex->getMessage());
+        } finally {
+            if ($this->profileRequests) {
+                $seconds = \microtime(true) - $startTime;
+
+                $this->profiles[] = [
+                    'Uri'           => $request->getUri(),
+                    'Method'        => $request->getMethod(),
+                    'Response code' => $response === null ? '' : $response->getStatusCode(),
+                    'Duration'      => $seconds
+                ];
+            }
         }
 
         return $jsonResponse;
@@ -247,7 +268,9 @@ public function getTasks(string $projectId): array
         $request = $this->createRequest('GET', $uri);
 
         $rawTasks = $this->sendRequest($request);
-
+        if (isset($rawTasks['data'])) {
+            $rawTasks = $rawTasks['data'];
+        }
         $tasks = [];
         if (!\is_null($rawTasks)) {
             foreach ($rawTasks as $rawTask) {
@@ -256,9 +279,15 @@ public function getTasks(string $projectId): array
                 $task->key = $rawTask['key'];
                 $task->name = $rawTask['name'];
                 $task->description = $rawTask['description'];
-                $task->project = $rawTask['project'];
+                $task->project = $this->getProjectIdFromRawValue($rawTask);
+
+                if (isset($rawTask['isDirect'])) {
+                    $task->direct = $rawTask['isDirect'];
+                } else {
+                    $task->direct = $rawTask['direct'];
+                }
                 $task->state = $rawTask['state'];
-                $task->direct = $rawTask['direct'];
+
 
                 $tasks[] = $task;
             }
@@ -290,9 +319,7 @@ public function getTaskExecution(string $taskExecutionId): ?array
         //TODO: handle when no execution is found
         $request = $this->createRequest('GET', $uri);
 
-        $response = $this->sendRequest($request);
-
-        return $response;
+        return $this->sendRequest($request);
     }
 
     public function updateTaskExecution(string $taskExecutionId, string $status, int $time = null): void
@@ -302,7 +329,7 @@ public function updateTaskExecution(string $taskExecutionId, string $status, int
             'time'   => $time,
         ];
 
-        $uri = '/taskexecutions/' . $taskExecutionId . '';
+        $uri = '/taskexecutions/' . $taskExecutionId;
 
         $request = $this->createRequest('POST', $uri, $body);
 
@@ -335,8 +362,10 @@ public function getConfigByProject(string $projectId, string $projectEnvironment
                 $configValue->inheritable = $rawConfigValue['inheritable'];
                 $configValue->sensitive = $rawConfigValue['sensitive'];
                 $configValue->state = $rawConfigValue['state'];
-                $configValue->project = $rawConfigValue['project'];
-                $configValue->projectEnvironment = (string)$rawConfigValue['projectEnvironment'];
+                $configValue->project = $this->getProjectIdFromRawValue($rawConfigValue);
+                $configValue->projectEnvironment = $this->getProjectEnvironmentIdFromRawValue($rawConfigValue);
+
+
                 $configValue->key = $rawConfigValue['key'];
                 $configValue->value = $rawConfigValue['value'];
 
@@ -347,6 +376,29 @@ public function getConfigByProject(string $projectId, string $projectEnvironment
         return $result;
     }
 
+    private function getProjectIdFromRawValue(array $rawValue): string
+    {
+        $tries = ['project', 'project_id', 'projectId'];
+        foreach ($tries as $try) {
+            if (isset($rawValue[$try])) {
+                return $rawValue[$try];
+            }
+        }
+        throw new \Error('Project not found in raw value');
+    }
+
+    private function getProjectEnvironmentIdFromRawValue(array $rawValue): string
+    {
+        $tries = ['project_environment', 'project_environment_id', 'projectEnvironment', 'projectEnvironmentId'];
+        foreach ($tries as $try) {
+            if (isset($rawValue[$try])) {
+                return $rawValue[$try];
+            }
+        }
+        throw new \Error('Project environment not found in raw value');
+    }
+
+
     public function getProjectById(string $projectId): Project
     {
         $projects = $this->getProjects();
@@ -488,16 +540,31 @@ public function getApiVersion(): ?string
         return null;
     }
 
-    public function enableDebug()
+    public function enableDebug(): void
     {
         $this->debug = true;
     }
 
-    public function disableDebug()
+    public function disableDebug(): void
     {
         $this->debug = false;
     }
 
+    public function enableRequestProfiling(): void
+    {
+        $this->profileRequests = true;
+    }
+
+    public function disableRequestProfiling(): void
+    {
+        $this->profileRequests = false;
+    }
+
+    public function getProfiles(): array
+    {
+        return $this->profiles;
+    }
+
     public function getStorageEndpoint(): StorageEndpoint
     {
         return $this->storageEndpoint;

diff --git a/src/Endpoint/ConnectionEndpoint.php b/src/Endpoint/ConnectionEndpoint.php
@@ -45,12 +45,12 @@ public function getConnections(string $projectId): array
      */
     public function getConnection(string $connectionKey): ?AdapterConnection
     {
-        $uri = '/connections/' . $connectionKey . '';
+        $uri = '/connections/' . $connectionKey;
 
         $request = $this->client->createRequest('GET', $uri);
 
         $response = $this->client->sendRequest($request);
-        
+
         if (isset($response['errors']) && count($response['errors']) > 0) {
             return null;
         }

diff --git a/src/Endpoint/StorageEndpoint.php b/src/Endpoint/StorageEndpoint.php
@@ -5,6 +5,7 @@
 
 use Attlaz\Client;
 use Attlaz\Model\StorageItem;
+use DateTimeInterface;
 
 class StorageEndpoint
 {
@@ -47,7 +48,7 @@ public function getItem(string $projectEnvironmentId, string $storageType, strin
         $item->value = $this->thawValue($rawItem['value']);
 
         if ($rawItem['expiration'] !== null) {
-            $rawItem['expiration'] = \DateTime::createFromFormat(\DateTime::RFC3339_EXTENDED, $rawItem['expiration']);
+            $rawItem['expiration'] = \DateTime::createFromFormat(DateTimeInterface::RFC3339_EXTENDED, $rawItem['expiration']);
         }
         return $item;
     }
@@ -91,11 +92,10 @@ public function setItem(string $projectEnvironmentId, string $storageType, Stora
             $uri = '/projectenvironments/' . $projectEnvironmentId . '/storage/' . $storageType . '/items/' . $storageItem->key;
         }
 
+        $data = clone $storageItem;
+        $data->value = $this->freezeValue($data->value);
 
-        $copy = clone $storageItem;
-        $copy->value = $this->freezeValue($copy->value);
-
-        $request = $this->client->createRequest('POST', $uri, $copy);
+        $request = $this->client->createRequest('POST', $uri, $data);
 
         $rawResult = $this->client->sendRequest($request);
 

diff --git a/src/Helper/TokenStorage.php b/src/Helper/TokenStorage.php
@@ -22,13 +22,11 @@ public static function loadAccessToken(string $clientId, string $clientSecret):
 
             if (!is_null($accessToken) && is_a($accessToken, AccessToken::class) && !$accessToken->hasExpired()) {
                 return $accessToken;
-            } else {
-
-                try {
-                    \unlink($file);
-                } catch (\Throwable $ex) {
+            }
+            try {
+                \unlink($file);
+            } catch (\Throwable $ex) {
 
-                }
             }
         }
 
@@ -45,7 +43,7 @@ private static function getData(string $clientId, string $clientSecret): array
         ];
     }
 
-    public static function saveAccessToken(AccessToken $accessToken, string $clientId, string $clientSecret)
+    public static function saveAccessToken(AccessToken $accessToken, string $clientId, string $clientSecret): void
     {
         $data = self::getData($clientId, $clientSecret);
 

diff --git a/src/Model/Log/LogEntry.php b/src/Model/Log/LogEntry.php
@@ -3,6 +3,8 @@
 
 namespace Attlaz\Model\Log;
 
+use DateTimeInterface;
+
 class LogEntry implements \JsonSerializable
 {
     public ?string $id;
@@ -35,7 +37,7 @@ public function jsonSerialize(): array
     {
         return [
             'logStream' => ['id' => $this->logStreamId->__toString()],
-            'date'      => $this->date->format(\DateTime::RFC3339_EXTENDED),
+            'date'      => $this->date->format(DateTimeInterface::RFC3339_EXTENDED),
             'level'     => $this->level,
             'message'   => $this->message,
             'context'   => $this->context,

diff --git a/src/Model/StorageItem.php b/src/Model/StorageItem.php
@@ -3,7 +3,9 @@
 
 namespace Attlaz\Model;
 
-class StorageItem
+use DateTimeInterface;
+
+class StorageItem implements \JsonSerializable
 {
     public string $key;
     /** @var string|int|float|array|object|null|bool */
@@ -15,7 +17,7 @@ public function jsonSerialize(): array
         return [
             'key'        => $this->key,
             'value'      => $this->value,
-            'expiration' => $this->expiration->format(\DateTime::RFC3339_EXTENDED),
+            'expiration' => $this->expiration === null ? null : $this->expiration->format(DateTimeInterface::RFC3339_EXTENDED),
         ];
     }
 }
diff --git a/tests/AuthenticationTest.php b/tests/AuthenticationTest.php
@@ -40,6 +40,8 @@ public function testWriteItem()
 //}
         $accessToken = $client->getAccessToken();
         $secondsToExpireToken = ($accessToken->getExpires() - time());
+
+        $this->assertGreaterThanOrEqual(5, $secondsToExpireToken);
         echo 'Token expires in ' . $secondsToExpireToken . ' seconds' . PHP_EOL;
         $secondsToSleep = $secondsToExpireToken + 5;
         echo 'Sleep ' . $secondsToSleep . ' seconds so the token expires' . PHP_EOL;