diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a7537cf1d..343d22fdf2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -761,11 +761,11 @@ jobs: run: | docker tag ${{ env.IMAGE }}:before ${{ env.IMAGE }} docker compose up -d --wait --no-build - for attempt in $(seq 1 5); do - if curl -fsS http://localhost/v1/health; then + for attempt in $(seq 1 10); do + if curl -fsS http://localhost/v1/health/version; then break fi - if [ "$attempt" -eq 5 ]; then + if [ "$attempt" -eq 10 ]; then exit 1 fi sleep 1 @@ -825,11 +825,11 @@ jobs: run: | docker tag ${{ env.IMAGE }}:after ${{ env.IMAGE }} docker compose up -d --wait --no-build - for attempt in $(seq 1 5); do - if curl -fsS http://localhost/v1/health; then + for attempt in $(seq 1 10); do + if curl -fsS http://localhost/v1/health/version; then break fi - if [ "$attempt" -eq 5 ]; then + if [ "$attempt" -eq 10 ]; then exit 1 fi sleep 1 diff --git a/Dockerfile b/Dockerfile index 9a61635415..58150321d6 100755 --- a/Dockerfile +++ b/Dockerfile @@ -89,7 +89,6 @@ RUN chmod +x /usr/local/bin/doctor && \ chmod +x /usr/local/bin/worker-certificates && \ chmod +x /usr/local/bin/worker-databases && \ chmod +x /usr/local/bin/worker-deletes && \ - chmod +x /usr/local/bin/worker-executions && \ chmod +x /usr/local/bin/worker-functions && \ chmod +x /usr/local/bin/worker-mails && \ chmod +x /usr/local/bin/worker-messaging && \ diff --git a/app/controllers/general.php b/app/controllers/general.php index 219c14774f..c53e0c29dd 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -714,10 +714,11 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S spec: $spec, resource: $resource->getArrayCopy(), )); - } - $execution->setAttribute('logs', ''); - $execution->setAttribute('errors', ''); + $execution->setAttribute('logs', ''); + $execution->setAttribute('errors', ''); + $execution = $authorization->skip(fn () => $dbForProject->createDocument('executions', $execution)); + } $headers = []; foreach (($executionResponse['headers'] ?? []) as $key => $value) { diff --git a/app/init/resources.php b/app/init/resources.php index 34f66d3de7..b9f2e90a15 100644 --- a/app/init/resources.php +++ b/app/init/resources.php @@ -7,7 +7,6 @@ use Appwrite\Event\Publisher\Build as BuildPublisher; use Appwrite\Event\Publisher\Certificate as CertificatePublisher; use Appwrite\Event\Publisher\Database as DatabasePublisher; use Appwrite\Event\Publisher\Delete as DeletePublisher; -use Appwrite\Event\Publisher\Execution as ExecutionPublisher; use Appwrite\Event\Publisher\Func as FunctionPublisher; use Appwrite\Event\Publisher\Mail as MailPublisher; use Appwrite\Event\Publisher\Messaging as MessagingPublisher; @@ -105,11 +104,6 @@ $container->set('publisherForUsage', fn (Publisher $publisher) => new UsagePubli new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME)) ), ['publisher']); -$container->set('publisherForExecutions', fn (Publisher $publisher) => new ExecutionPublisher( - $publisher, - new Queue(System::getEnv('_APP_EXECUTIONS_QUEUE_NAME', Event::EXECUTIONS_QUEUE_NAME)) -), ['publisher']); - $container->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher( $publisher, new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL) diff --git a/app/listeners.php b/app/listeners.php index 240225dc45..9f959ac6ab 100644 --- a/app/listeners.php +++ b/app/listeners.php @@ -1,11 +1,9 @@ getParam('hostPath', ''), '/'); - _APP_DB_PASS - _APP_LOGGING_CONFIG - appwrite-worker-executions: - image: /: - entrypoint: worker-executions - <<: *x-logging - container_name: appwrite-worker-executions - restart: unless-stopped - networks: - - appwrite - depends_on: - redis: - condition: service_healthy - : - condition: service_healthy - environment: - - _APP_ENV - - _APP_WORKER_PER_CORE - - _APP_REDIS_HOST - - _APP_REDIS_PORT - - _APP_REDIS_USER - - _APP_REDIS_PASS - - _APP_ENV - - _APP_DB_ADAPTER - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS - - _APP_LOGGING_CONFIG - appwrite-worker-functions: image: /: entrypoint: worker-functions diff --git a/bin/worker-executions b/bin/worker-executions deleted file mode 100755 index 6789fb8da8..0000000000 --- a/bin/worker-executions +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec php /usr/src/code/app/worker.php executions "$@" diff --git a/docker-compose.yml b/docker-compose.yml index 7d3f6bdc5f..e2a5a7161e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -690,37 +690,6 @@ services: - _APP_LOGGING_CONFIG - _APP_DATABASE_SHARED_TABLES - appwrite-worker-executions: - entrypoint: worker-executions - <<: [*x-logging, *x-build] - container_name: appwrite-worker-executions - image: appwrite-dev - networks: - - appwrite - volumes: - - ./app:/usr/src/code/app - - ./src:/usr/src/code/src - depends_on: - - redis - - ${_APP_DB_HOST:-mongodb} - environment: - - _APP_ENV - - _APP_WORKER_PER_CORE - - _APP_POOL_ADAPTER - - _APP_OPENSSL_KEY_V1 - - _APP_REDIS_HOST - - _APP_REDIS_PORT - - _APP_REDIS_USER - - _APP_REDIS_PASS - - _APP_DB_ADAPTER - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS - - _APP_LOGGING_CONFIG - - _APP_DATABASE_SHARED_TABLES - appwrite-worker-functions: entrypoint: worker-functions <<: [*x-logging, *x-build] diff --git a/src/Appwrite/Bus/Events/ExecutionLogged.php b/src/Appwrite/Bus/Events/ExecutionLogged.php new file mode 100644 index 0000000000..eabdc618e8 --- /dev/null +++ b/src/Appwrite/Bus/Events/ExecutionLogged.php @@ -0,0 +1,18 @@ + $execution + * @param array $project + */ + public function __construct( + public readonly array $execution, + public readonly array $project, + ) { + } +} diff --git a/src/Appwrite/Bus/Listeners/Log.php b/src/Appwrite/Bus/Listeners/Log.php deleted file mode 100644 index e0376a4f81..0000000000 --- a/src/Appwrite/Bus/Listeners/Log.php +++ /dev/null @@ -1,50 +0,0 @@ -desc('Persists execution logs to database via queue') - ->inject('publisherForExecutions') - ->callback($this->handle(...)); - } - - public function handle(ExecutionCompleted $event, ExecutionPublisher $publisherForExecutions): void - { - $project = new Document($event->project); - $execution = new Document($event->execution); - - if ($execution->getAttribute('resourceType', '') === 'functions') { - Span::add('project.id', $project->getId()); - Span::add('function.id', $execution->getAttribute('resourceId', '')); - Span::add('execution.id', $execution->getId()); - Span::add('deployment.id', $execution->getAttribute('deploymentId', '')); - Span::add('execution.status', $execution->getAttribute('status', '')); - } - - $publisherForExecutions->enqueue(new ExecutionMessage( - project: $project, - execution: $execution, - )); - } -} diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php index ba36b47884..092cb772a5 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php @@ -3,6 +3,7 @@ namespace Appwrite\Platform\Modules\Functions\Http\Executions; use Ahc\Jwt\JWT; +use Appwrite\Bus\Events\ExecutionLogged; use Appwrite\Event\Event; use Appwrite\Event\Message\Delete as DeleteMessage; use Appwrite\Event\Message\Func as FunctionMessage; @@ -24,6 +25,7 @@ use Executor\Executor; use MaxMind\Db\Reader; use Utopia\Auth\Proofs\Token; use Utopia\Auth\Store; +use Utopia\Bus\Bus; use Utopia\Config\Config; use Utopia\Console; use Utopia\Database\Database; @@ -107,6 +109,7 @@ class Create extends Base ->inject('authorization') ->inject('publisherForDeletes') ->inject('executionsRetentionCount') + ->inject('bus') ->callback($this->action(...)); } @@ -135,6 +138,7 @@ class Create extends Base Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount, + Bus $bus, ) { $async = \strval($async) === 'true' || \strval($async) === '1'; @@ -337,6 +341,11 @@ class Create extends Base ->setAttribute('scheduledAt', $scheduledAt); $execution = $authorization->skip(fn () => $dbForProject->createDocument('executions', $execution)); + + $bus->dispatch(new ExecutionLogged( + execution: $execution->getArrayCopy(), + project: $project->getArrayCopy(), + )); } if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) { @@ -507,6 +516,11 @@ class Create extends Base ; $execution = $authorization->skip(fn () => $dbForProject->createDocument('executions', $execution)); + + $bus->dispatch(new ExecutionLogged( + execution: $execution->getArrayCopy(), + project: $project->getArrayCopy(), + )); } $executionResponse['headers']['x-appwrite-execution-id'] = $execution->getId(); diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php index f04f7c3807..92e00cd4e6 100644 --- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php +++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php @@ -298,6 +298,9 @@ class Builds extends Action $templateRootDirectory = $template->getAttribute('rootDirectory', ''); $templateRootDirectory = \trim($templateRootDirectory, '/'); + while (\str_starts_with($templateRootDirectory, './')) { + $templateRootDirectory = \substr($templateRootDirectory, 2); + } if ($templateRootDirectory !== '' && \preg_match('#(^|/)\.\.(/|$)#', $templateRootDirectory)) { throw new \Exception('Invalid template root directory'); } @@ -423,6 +426,9 @@ class Builds extends Action $templateRootDirectory = $template->getAttribute('rootDirectory', ''); $templateRootDirectory = \trim($templateRootDirectory, '/'); + while (\str_starts_with($templateRootDirectory, './')) { + $templateRootDirectory = \substr($templateRootDirectory, 2); + } if ($templateRootDirectory !== '' && \preg_match('#(^|/)\.\.(/|$)#', $templateRootDirectory)) { throw new \Exception('Invalid template root directory'); } diff --git a/src/Appwrite/Platform/Services/Workers.php b/src/Appwrite/Platform/Services/Workers.php index fa77725f7a..f2cbeb390a 100644 --- a/src/Appwrite/Platform/Services/Workers.php +++ b/src/Appwrite/Platform/Services/Workers.php @@ -5,7 +5,6 @@ namespace Appwrite\Platform\Services; use Appwrite\Platform\Workers\Audits; use Appwrite\Platform\Workers\Certificates; use Appwrite\Platform\Workers\Deletes; -use Appwrite\Platform\Workers\Executions; use Appwrite\Platform\Workers\Functions; use Appwrite\Platform\Workers\Mails; use Appwrite\Platform\Workers\Messaging; @@ -24,7 +23,6 @@ class Workers extends Service ->addAction(Audits::getName(), new Audits()) ->addAction(Certificates::getName(), new Certificates()) ->addAction(Deletes::getName(), new Deletes()) - ->addAction(Executions::getName(), new Executions()) ->addAction(Functions::getName(), new Functions()) ->addAction(Mails::getName(), new Mails()) ->addAction(Messaging::getName(), new Messaging()) diff --git a/src/Appwrite/Platform/Workers/Executions.php b/src/Appwrite/Platform/Workers/Executions.php deleted file mode 100644 index 8dbf10cae6..0000000000 --- a/src/Appwrite/Platform/Workers/Executions.php +++ /dev/null @@ -1,51 +0,0 @@ -desc('Executions worker') - ->groups(['executions']) - ->inject('message') - ->inject('dbForProject') - ->callback($this->action(...)); - } - - public function action( - Message $message, - Database $dbForProject, - ): void { - $executionMessage = Execution::fromArray($message->getPayload()); - $execution = $executionMessage->execution; - - if ($execution->isEmpty()) { - throw new Exception('Missing execution'); - } - - Span::add('project.id', $executionMessage->project->getId()); - Span::add('function.id', $execution->getAttribute('resourceId', '')); - Span::add('execution.id', $execution->getId()); - Span::add('deployment.id', $execution->getAttribute('deploymentId', '')); - Span::add('resource.type', $execution->getAttribute('resourceType', '')); - - $dbForProject->upsertDocument('executions', $execution); - } -} diff --git a/src/Appwrite/Platform/Workers/Functions.php b/src/Appwrite/Platform/Workers/Functions.php index 73c1db9444..273847859b 100644 --- a/src/Appwrite/Platform/Workers/Functions.php +++ b/src/Appwrite/Platform/Workers/Functions.php @@ -263,6 +263,7 @@ class Functions extends Action /** * @param string $message + * @param Database $dbForProject * @param Document $function * @param string $trigger * @param string $path @@ -274,6 +275,7 @@ class Functions extends Action */ private function fail( string $message, + Database $dbForProject, Document $project, Bus $bus, Document $function, @@ -313,19 +315,24 @@ class Functions extends Action 'requestPath' => $path, 'requestMethod' => $method, 'requestHeaders' => $headersFiltered, - 'errors' => $message, + 'errors' => '', 'logs' => '', 'duration' => 0.0, ]); + $executionForEvent = (new Document($execution->getArrayCopy())) + ->setAttribute('errors', $message); + Span::add('function.id', $function->getId()); Span::add('execution.id', $execution->getId()); Span::add('deployment.id', $execution->getAttribute('deploymentId', '')); Span::add('execution.trigger', $trigger); Span::add('execution.status', $execution->getAttribute('status', '')); + $dbForProject->upsertDocument('executions', $execution); + $bus->dispatch(new ExecutionCompleted( - execution: $execution->getArrayCopy(), + execution: $executionForEvent->getArrayCopy(), project: $project->getArrayCopy(), )); } @@ -390,19 +397,19 @@ class Functions extends Action if ($deployment->getAttribute('resourceId') !== $functionId) { $errorMessage = 'The execution could not be completed because a corresponding deployment was not found. A function deployment needs to be created before it can be executed. Please create a deployment for your function and try again.'; - $this->fail($errorMessage, $project, $bus, $function, $trigger, $path, $method, $user, $jwt, $event); + $this->fail($errorMessage, $dbForProject, $project, $bus, $function, $trigger, $path, $method, $user, $jwt, $event); return; } if ($deployment->isEmpty()) { $errorMessage = 'The execution could not be completed because a corresponding deployment was not found. A function deployment needs to be created before it can be executed. Please create a deployment for your function and try again.'; - $this->fail($errorMessage, $project, $bus, $function, $trigger, $path, $method, $user, $jwt, $event); + $this->fail($errorMessage, $dbForProject, $project, $bus, $function, $trigger, $path, $method, $user, $jwt, $event); return; } if ($deployment->getAttribute('status') !== 'ready') { $errorMessage = 'The execution could not be completed because the build is not ready. Please wait for the build to complete and try again.'; - $this->fail($errorMessage, $project, $bus, $function, $trigger, $path, $method, $user, $jwt, $event); + $this->fail($errorMessage, $dbForProject, $project, $bus, $function, $trigger, $path, $method, $user, $jwt, $event); return; } @@ -471,6 +478,8 @@ class Functions extends Action 'duration' => 0.0, ]); + $dbForProject->upsertDocument('executions', $execution); + $durationStart = \microtime(true); $body = $eventData ?? ''; @@ -626,6 +635,13 @@ class Functions extends Action /** Persist final execution status and record usage */ Span::add('execution.status', $execution->getAttribute('status', '')); + $dbForProject->updateDocument('executions', $execution->getId(), new Document([ + 'status' => $execution->getAttribute('status'), + 'responseStatusCode' => $execution->getAttribute('responseStatusCode'), + 'responseHeaders' => $execution->getAttribute('responseHeaders'), + 'duration' => $execution->getAttribute('duration'), + ])); + $bus->dispatch(new ExecutionCompleted( execution: $execution->getArrayCopy(), project: $project->getArrayCopy(), diff --git a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php index 1208121077..18c99e856f 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php @@ -590,9 +590,7 @@ class FunctionsCustomClientTest extends Scope 'data' => ['name' => 'Test Document'], ]); $this->assertEquals(201, $document['headers']['status-code']); - $documentId = $document['body']['$id']; - - $this->assertEventually(function () use ($functionId, $documentId) { + $this->assertEventually(function () use ($functionId) { $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], @@ -605,7 +603,6 @@ class FunctionsCustomClientTest extends Scope $lastExecution = $executions['body']['executions'][0]; $this->assertEquals('completed', $lastExecution['status']); $this->assertEquals(204, $lastExecution['responseStatusCode']); - $this->assertStringContainsString($documentId, $lastExecution['logs']); }, 20000, 500); $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId, [ diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 44d5d274da..0d189e0c69 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -745,15 +745,13 @@ class FunctionsCustomServerTest extends Scope $executionId = $execution['body']['$id'] ?? ''; - $this->assertEventually(function () use ($functionId, $executionId, $totalUsers) { + $this->assertEventually(function () use ($functionId, $executionId) { $execution = $this->getExecution($functionId, $executionId); $this->assertEquals(200, $execution['headers']['status-code']); $this->assertEquals(200, $execution['body']['responseStatusCode']); $this->assertEquals('completed', $execution['body']['status']); $this->assertEmpty($execution['body']['responseBody']); - $this->assertEmpty($execution['body']['errors']); - $this->assertStringContainsString("Total users: " . $totalUsers, $execution['body']['logs']); }, 10000, 500); $deployment = $this->getDeployment($functionId, $deployment['body']['$id']); @@ -2123,8 +2121,6 @@ class FunctionsCustomServerTest extends Scope $this->assertGreaterThan(2, $execution['body']['duration']); $this->assertLessThan(20, $execution['body']['duration']); $this->assertEquals('', $execution['body']['responseBody']); - $this->assertEquals('', $execution['body']['logs']); - $this->assertStringContainsString('timed out', $execution['body']['errors']); }, 10000, 500); $this->cleanupFunction($functionId); @@ -2347,7 +2343,7 @@ class FunctionsCustomServerTest extends Scope $userId = $user['body']['$id'] ?? ''; - $this->assertEventually(function () use ($functionId, $userId) { + $this->assertEventually(function () use ($functionId) { $executions = $this->listExecutions($functionId); $this->assertEquals(200, $executions['headers']['status-code']); @@ -2357,8 +2353,6 @@ class FunctionsCustomServerTest extends Scope $this->assertEquals('completed', $lastExecution['status']); $this->assertEquals(204, $lastExecution['responseStatusCode']); - $this->assertStringContainsString($userId, $lastExecution['logs']); - $this->assertStringContainsString('Event User', $lastExecution['logs']); $this->assertNotEmpty($lastExecution['$id']); $headers = array_column($lastExecution['requestHeaders'] ?? [], 'value', 'name'); $this->assertEmpty($headers['x-appwrite-client-ip'] ?? ''); @@ -2426,8 +2420,6 @@ class FunctionsCustomServerTest extends Scope $this->assertEquals('completed', $execution['body']['status']); $this->assertEquals(200, $execution['body']['responseStatusCode']); $this->assertGreaterThan(0, $execution['body']['duration']); - $this->assertNotEmpty($execution['body']['logs']); - $this->assertStringContainsString("total", $execution['body']['logs']); }, 10000, 500); $this->cleanupFunction($functionId); diff --git a/tests/e2e/Services/FunctionsSchedule/FunctionsScheduleTest.php b/tests/e2e/Services/FunctionsSchedule/FunctionsScheduleTest.php index f4a70b5a9e..c1e79b1d68 100644 --- a/tests/e2e/Services/FunctionsSchedule/FunctionsScheduleTest.php +++ b/tests/e2e/Services/FunctionsSchedule/FunctionsScheduleTest.php @@ -58,8 +58,6 @@ class FunctionsScheduleTest extends Scope $this->assertEquals('completed', $asyncExecution['status']); $this->assertEquals(200, $asyncExecution['responseStatusCode']); $this->assertEquals('', $asyncExecution['responseBody']); - $this->assertNotEmpty($asyncExecution['logs']); - $this->assertNotEmpty($asyncExecution['errors']); $this->assertGreaterThan(0, $asyncExecution['duration']); $this->assertNotEmpty($asyncExecution['$id']); $headers = array_column($asyncExecution['requestHeaders'] ?? [], 'value', 'name'); @@ -132,12 +130,6 @@ class FunctionsScheduleTest extends Scope $this->assertEquals('completed', $execution['body']['status']); $this->assertEquals('/custom-path', $execution['body']['requestPath']); $this->assertEquals('PATCH', $execution['body']['requestMethod']); - $this->assertStringContainsString('body-is-custom-body', $execution['body']['logs']); - $this->assertStringContainsString('custom-header-is-custom-value', $execution['body']['logs']); - $this->assertStringContainsString('method-is-patch', $execution['body']['logs']); - $this->assertStringContainsString('path-is-/custom-path', $execution['body']['logs']); - $this->assertStringContainsString('user-is-' . $this->getUser()['$id'], $execution['body']['logs']); - $this->assertStringContainsString('jwt-is-valid', $execution['body']['logs']); $this->assertGreaterThan(0, $execution['body']['duration']); }, 120000, 500); diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index 9cca689780..e1b55d4dfb 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -2770,9 +2770,8 @@ class SitesCustomServerTest extends Scope $this->assertEquals(200, $response['headers']['status-code']); $this->assertStringContainsString("Inline logs printed.", $response['body']); - // Poll for execution logs to be written (async) + // Poll for execution entry to be written (async) // Filter by requestPath to avoid picking up screenshot worker executions - // Wait for both the execution entry AND its logs field to be populated $logs = null; $timeout = 120; $start = \time(); @@ -2782,21 +2781,16 @@ class SitesCustomServerTest extends Scope Query::equal('requestPath', ['/logs-inline'])->toString(), Query::limit(1)->toString(), ]); - if (!empty($logs['body']['executions']) && !empty($logs['body']['executions'][0]['logs'])) { + if (!empty($logs['body']['executions'])) { break; } \usleep(500000); } $this->assertNotEmpty($logs['body']['executions'], 'Execution logs were not available within timeout'); - $this->assertNotNull($logs['body']['executions'][0]['logs'], 'Execution logs content was not populated within timeout'); $this->assertEquals(200, $logs['headers']['status-code']); $this->assertStringContainsString($deploymentId, $logs['body']['executions'][0]['deploymentId']); $this->assertStringContainsString("GET", $logs['body']['executions'][0]['requestMethod']); $this->assertStringContainsString("/logs-inline", $logs['body']['executions'][0]['requestPath']); - $this->assertStringContainsString("Log1", $logs['body']['executions'][0]['logs']); - $this->assertStringContainsString("Log2", $logs['body']['executions'][0]['logs']); - $this->assertStringContainsString("Error1", $logs['body']['executions'][0]['errors']); - $this->assertStringContainsString("Error2", $logs['body']['executions'][0]['errors']); $log1Id = $logs['body']['executions'][0]['$id']; $this->assertNotEmpty($log1Id); @@ -2830,21 +2824,16 @@ class SitesCustomServerTest extends Scope Query::equal('requestPath', ['/logs-action'])->toString(), Query::limit(1)->toString(), ]); - if (!empty($logs['body']['executions']) && !empty($logs['body']['executions'][0]['logs'])) { + if (!empty($logs['body']['executions'])) { break; } \usleep(500000); } $this->assertNotEmpty($logs['body']['executions'], 'Action execution logs were not available within timeout'); - $this->assertNotNull($logs['body']['executions'][0]['logs'], 'Action execution logs content was not populated within timeout'); $this->assertEquals(200, $logs['headers']['status-code']); $this->assertStringContainsString($deploymentId, $logs['body']['executions'][0]['deploymentId']); $this->assertStringContainsString("GET", $logs['body']['executions'][0]['requestMethod']); $this->assertStringContainsString("/logs-action", $logs['body']['executions'][0]['requestPath']); - $this->assertStringContainsString("Log1", $logs['body']['executions'][0]['logs']); - $this->assertStringContainsString("Log2", $logs['body']['executions'][0]['logs']); - $this->assertStringContainsString("Error1", $logs['body']['executions'][0]['errors']); - $this->assertStringContainsString("Error2", $logs['body']['executions'][0]['errors']); $log2Id = $logs['body']['executions'][0]['$id']; $this->assertNotEmpty($log2Id); diff --git a/tests/resources/docker/docker-compose.yml b/tests/resources/docker/docker-compose.yml index 47a69f077b..735e88525e 100644 --- a/tests/resources/docker/docker-compose.yml +++ b/tests/resources/docker/docker-compose.yml @@ -216,27 +216,6 @@ services: - _APP_DB_USER - _APP_DB_PASS - appwrite-worker-executions: - entrypoint: worker-executions - container_name: appwrite-worker-executions - build: - context: . - restart: unless-stopped - networks: - - appwrite - depends_on: - - redis - - mariadb - environment: - - _APP_ENV - - _APP_REDIS_HOST - - _APP_REDIS_PORT - - _APP_DB_HOST - - _APP_DB_PORT - - _APP_DB_SCHEMA - - _APP_DB_USER - - _APP_DB_PASS - appwrite-worker-functions: entrypoint: worker-functions container_name: appwrite-worker-functions diff --git a/tests/unit/Docker/ComposeTest.php b/tests/unit/Docker/ComposeTest.php index e63d877baf..74779230ac 100644 --- a/tests/unit/Docker/ComposeTest.php +++ b/tests/unit/Docker/ComposeTest.php @@ -23,7 +23,7 @@ class ComposeTest extends TestCase public function testServices(): void { - $this->assertCount(16, $this->object->getServices()); + $this->assertCount(15, $this->object->getServices()); $this->assertEquals('appwrite', $this->object->getService('appwrite')->getContainerName()); $this->assertEquals('', $this->object->getService('appwrite')->getImageVersion()); $this->assertEquals('3.6', $this->object->getService('traefik')->getImageVersion());