Merge branch 'main' into 1.5.x

2024-06-14 00:34:51 +12:00 · 2024-01-09 22:03:35 +13:00 · 2024-01-09 22:03:35 +13:00 · af019369e9
parent ecc254547d b0a8aac0b7
commit af019369e9
6 changed files with 64 additions and 22 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -75,8 +75,32 @@ jobs:
      - name: Run Unit Tests
        run: docker compose exec appwrite test /usr/src/code/tests/unit

-  e2e_test:
-    name: E2E Test
+  e2e_general_test:
+    name: E2E General Test
+    runs-on: ubuntu-latest
+    needs: setup
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Load Cache
+        uses: actions/cache@v3
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          sleep 10
+
+      - name: Run General Tests
+        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/General --debug
+
+  e2e_service_test:
+    name: E2E Service Test
    runs-on: ubuntu-latest
    needs: setup
    strategy:
@ -120,4 +144,4 @@ jobs:
          sleep 10

      - name: Run ${{matrix.service}} Tests
-        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -876,7 +876,7 @@ App::get('/v1/account/identities')
    });

 App::delete('/v1/account/identities/:identityId')
-    ->desc('Delete Identity')
+    ->desc('Delete identity')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
    ->label('event', 'users.[userId].identities.[identityId].delete')
@ -893,7 +893,8 @@ App::delete('/v1/account/identities/:identityId')
    ->param('identityId', '', new UID(), 'Identity ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->action(function (string $identityId, Response $response, Database $dbForProject) {
+    ->inject('queueForEvents')
+    ->action(function (string $identityId, Response $response, Database $dbForProject, Event $queueForEvents) {

        $identity = $dbForProject->getDocument('identities', $identityId);

@ -903,6 +904,11 @@ App::delete('/v1/account/identities/:identityId')

        $dbForProject->deleteDocument('identities', $identityId);

+        $queueForEvents
+            ->setParam('userId', $identity->getAttribute('userId'))
+            ->setParam('identityId', $identity->getId())
+            ->setPayload($response->output($identity, Response::MODEL_IDENTITY));
+
        return $response->noContent();
    });

--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -1598,7 +1598,7 @@ App::delete('/v1/users/:userId/targets/:targetId')
    });

 App::delete('/v1/users/identities/:identityId')
-    ->desc('Delete Identity')
+    ->desc('Delete identity')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].identities.[identityId].delete')
    ->label('scope', 'users.write')
@ -1614,7 +1614,8 @@ App::delete('/v1/users/identities/:identityId')
    ->param('identityId', '', new UID(), 'Identity ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->action(function (string $identityId, Response $response, Database $dbForProject) {
+    ->inject('queueForEvents')
+    ->action(function (string $identityId, Response $response, Database $dbForProject, Event $queueForEvents) {

        $identity = $dbForProject->getDocument('identities', $identityId);

@ -1624,6 +1625,11 @@ App::delete('/v1/users/identities/:identityId')

        $dbForProject->deleteDocument('identities', $identityId);

+        $queueForEvents
+            ->setParam('userId', $identity->getAttribute('userId'))
+            ->setParam('identityId', $identity->getId())
+            ->setPayload($response->output($identity, Response::MODEL_IDENTITY));
+
        return $response->noContent();
    });

--- a/src/Appwrite/Platform/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@ -8,6 +8,7 @@ use Appwrite\Docker\Env;
 use Appwrite\Utopia\View;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Platform\Action;

@ -24,15 +25,16 @@ class Install extends Action
    {
        $this
            ->desc('Install Appwrite')
-            ->param('httpPort', '', new Text(4), 'Server HTTP port', true)
-            ->param('httpsPort', '', new Text(4), 'Server HTTPS port', true)
+            ->param('http-port', '', new Text(4), 'Server HTTP port', true)
+            ->param('https-port', '', new Text(4), 'Server HTTPS port', true)
            ->param('organization', 'appwrite', new Text(0), 'Docker Registry organization', true)
            ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
            ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
-            ->callback(fn ($httpPort, $httpsPort, $organization, $image, $interactive) => $this->action($httpPort, $httpsPort, $organization, $image, $interactive));
+            ->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
+            ->callback(fn ($httpPort, $httpsPort, $organization, $image, $interactive, $noStart) => $this->action($httpPort, $httpsPort, $organization, $image, $interactive, $noStart));
    }

-    public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive): void
+    public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive, bool $noStart): void
    {
        $config = Config::getParam('variables');
        $defaultHTTPPort = '80';
@ -220,9 +222,11 @@ class Install extends Action
            }
        }

-        Console::log("Running \"docker compose up -d --remove-orphans --renew-anon-volumes\"");
-
-        $exit = Console::execute("$env docker compose --project-directory $this->path up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
+        $exit = 0;
+        if (!$noStart) {
+            Console::log("Running \"docker compose up -d --remove-orphans --renew-anon-volumes\"");
+            $exit = Console::execute("$env docker compose --project-directory $this->path up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
+        }

        if ($exit !== 0) {
            $message = 'Failed to install Appwrite dockers';
--- a/src/Appwrite/Platform/Tasks/Upgrade.php
+++ b/src/Appwrite/Platform/Tasks/Upgrade.php
@ -3,6 +3,7 @@
 namespace Appwrite\Platform\Tasks;

 use Utopia\CLI\Console;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;

 class Upgrade extends Install
@ -16,15 +17,16 @@ class Upgrade extends Install
    {
        $this
            ->desc('Upgrade Appwrite')
-            ->param('httpPort', '', new Text(4), 'Server HTTP port', true)
-            ->param('httpsPort', '', new Text(4), 'Server HTTPS port', true)
+            ->param('http-port', '', new Text(4), 'Server HTTP port', true)
+            ->param('https-port', '', new Text(4), 'Server HTTPS port', true)
            ->param('organization', 'appwrite', new Text(0), 'Docker Registry organization', true)
            ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
            ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
-            ->callback(fn ($httpPort, $httpsPort, $organization, $image, $interactive) => $this->action($httpPort, $httpsPort, $organization, $image, $interactive));
+            ->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
+            ->callback(fn ($httpPort, $httpsPort, $organization, $image, $interactive, $noStart) => $this->action($httpPort, $httpsPort, $organization, $image, $interactive, $noStart));
    }

-    public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive): void
+    public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive, bool $noStart): void
    {
        // Check for previous installation
        $data = @file_get_contents($this->path . '/docker-compose.yml');
@ -37,6 +39,6 @@ class Upgrade extends Install
            Console::log('      └── docker-compose.yml');
            Console::exit(1);
        }
-        parent::action($httpPort, $httpsPort, $organization, $image, $interactive);
+        parent::action($httpPort, $httpsPort, $organization, $image, $interactive, $noStart);
    }
 }
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@ -72,6 +72,7 @@ class Executor
    ) {
        $runtimeId = "$projectId-$deploymentId-build";
        $route = "/runtimes";
+        $timeout = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
        $params = [
            'runtimeId' => $runtimeId,
            'source' => $source,
@ -84,10 +85,9 @@ class Executor
            'cpus' => $this->cpus,
            'memory' => $this->memory,
            'version' => $version,
+            'timeout' => $timeout,
        ];

-        $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
-
        $response = $this->call(self::METHOD_POST, $route, [ 'x-opr-runtime-id' => $runtimeId ], $params, true, $timeout);

        $status = $response['headers']['status-code'];
@ -111,7 +111,7 @@ class Executor
        string $projectId,
        callable $callback
    ) {
-        $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
+        $timeout = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);

        $runtimeId = "$projectId-$deploymentId-build";
        $route = "/runtimes/{$runtimeId}/logs";