Merge branch '1.7.x' into pla-2677

chore: fix console audits delete

.env

@@ -86,6 +86,7 @@ _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
+_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000

app/config/runtimes/specifications.php

@@ -1,51 +0,0 @@
-<?php
-
-use Appwrite\Functions\Specification;
-
-return [
-    Specification::S_05VCPU_512MB => [
-        'slug' => Specification::S_05VCPU_512MB,
-        'memory' => 512,
-        'cpus' => 0.5
-    ],
-    Specification::S_1VCPU_512MB => [
-        'slug' => Specification::S_1VCPU_512MB,
-        'memory' => 512,
-        'cpus' => 1
-    ],
-    Specification::S_1VCPU_1GB => [
-        'slug' => Specification::S_1VCPU_1GB,
-        'memory' => 1024,
-        'cpus' => 1
-    ],
-    Specification::S_2VCPU_2GB => [
-        'slug' => Specification::S_2VCPU_2GB,
-        'memory' => 2048,
-        'cpus' => 2
-    ],
-    Specification::S_2VCPU_4GB => [
-        'slug' => Specification::S_2VCPU_4GB,
-        'memory' => 4096,
-        'cpus' => 2
-    ],
-    Specification::S_4VCPU_4GB => [
-        'slug' => Specification::S_4VCPU_4GB,
-        'memory' => 4096,
-        'cpus' => 4
-    ],
-    Specification::S_4VCPU_8GB => [
-        'slug' => Specification::S_4VCPU_8GB,
-        'memory' => 8192,
-        'cpus' => 4
-    ],
-    Specification::S_8VCPU_4GB => [
-        'slug' => Specification::S_8VCPU_4GB,
-        'memory' => 4096,
-        'cpus' => 8
-    ],
-    Specification::S_8VCPU_8GB => [
-        'slug' => Specification::S_8VCPU_8GB,
-        'memory' => 8192,
-        'cpus' => 8
-    ]
-];

app/config/variables.php

@@ -1048,13 +1048,22 @@ return [
             ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                 'introduction' => '0.7.0',
                 'default' => '1209600',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
+                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
+                'introduction' => '1.6.2',
+                'default' => '15778800',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                 'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',

app/controllers/api/functions.php

@@ -183,7 +183,13 @@ App::post('/v1/functions')
     ->param('templateVersion', '', new Text(128, 0), 'Version (tag) for the repo linked to the function template.', true)
     ->param('specification', APP_FUNCTION_SPECIFICATION_DEFAULT, fn (array $plan) => new RuntimeSpecification(
         $plan,
-        Config::getParam('runtime-specifications', []),
+        Config::getParam('runtime-specifications', [
+            APP_FUNCTION_SPECIFICATION_DEFAULT => [
+                'slug ' => APP_FUNCTION_SPECIFICATION_DEFAULT,
+                'memory' => APP_FUNCTION_MEMORY_DEFAULT,
+                'cpus' => APP_FUNCTION_CPUS_DEFAULT
+            ]
+        ]),
         App::getEnv('_APP_FUNCTIONS_CPUS', APP_FUNCTION_CPUS_DEFAULT),
         App::getEnv('_APP_FUNCTIONS_MEMORY', APP_FUNCTION_MEMORY_DEFAULT)
     ), 'Runtime specification for the function and builds.', true, ['plan'])
@@ -857,7 +863,13 @@ App::put('/v1/functions/:functionId')
     ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true)
     ->param('specification', APP_FUNCTION_SPECIFICATION_DEFAULT, fn (array $plan) => new RuntimeSpecification(
         $plan,
-        Config::getParam('runtime-specifications', []),
+        Config::getParam('runtime-specifications', [
+            APP_FUNCTION_SPECIFICATION_DEFAULT => [
+                'slug ' => APP_FUNCTION_SPECIFICATION_DEFAULT,
+                'memory' => APP_FUNCTION_MEMORY_DEFAULT,
+                'cpus' => APP_FUNCTION_CPUS_DEFAULT
+            ]
+        ]),
         App::getEnv('_APP_FUNCTIONS_CPUS', APP_FUNCTION_CPUS_DEFAULT),
         App::getEnv('_APP_FUNCTIONS_MEMORY', APP_FUNCTION_MEMORY_DEFAULT)
     ), 'Runtime specification for the function and builds.', true, ['plan'])
@@ -968,8 +980,6 @@ App::put('/v1/functions/:functionId')
             $live = false;
         }
 
-        $spec = Config::getParam('runtime-specifications')[$specification] ?? [];
-
         // Enforce Cold Start if spec limits change.
         if ($function->getAttribute('specification') !== $specification && !empty($function->getAttribute('deployment'))) {
             $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
@@ -1883,11 +1893,12 @@ App::post('/v1/functions/:functionId/executions')
     ->inject('dbForProject')
     ->inject('dbForPlatform')
     ->inject('user')
+    ->inject('specifications')
     ->inject('queueForEvents')
     ->inject('queueForStatsUsage')
     ->inject('queueForFunctions')
     ->inject('geodb')
-    ->action(function (string $functionId, string $body, mixed $async, string $path, string $method, mixed $headers, ?string $scheduledAt, Response $response, Request $request, Document $project, Database $dbForProject, Database $dbForPlatform, Document $user, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb) {
+    ->action(function (string $functionId, string $body, mixed $async, string $path, string $method, mixed $headers, ?string $scheduledAt, Response $response, Request $request, Document $project, Database $dbForProject, Database $dbForPlatform, Document $user, array $specifications, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb) {
         $async = \strval($async) === 'true' || \strval($async) === '1';
 
         if (!$async && !is_null($scheduledAt)) {
@@ -1928,7 +1939,7 @@ App::post('/v1/functions/:functionId/executions')
 
         $version = $function->getAttribute('version', 'v2');
         $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
+        $spec = $specifications[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
 
         $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
 

app/controllers/general.php

@@ -50,7 +50,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, array $specifications)
 {
     $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');
 
@@ -185,7 +185,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
 
         $version = $function->getAttribute('version', 'v2');
         $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
+        $spec = $specifications[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
 
         $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
 
@@ -505,7 +505,8 @@ App::init()
     ->inject('queueForFunctions')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname) {
+    ->inject('specifications')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname, array $specifications) {
         /*
         * Appwrite Router
         */
@@ -513,7 +514,7 @@ App::init()
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
         if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $specifications)) {
                 return;
             }
         }
@@ -746,7 +747,8 @@ App::options()
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
     ->inject('project')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project) {
+    ->inject('specifications')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project, array $specifications) {
         /*
         * Appwrite Router
         */
@@ -754,7 +756,7 @@ App::options()
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
         if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $specifications)) {
                 return;
             }
         }
@@ -1064,7 +1066,8 @@ App::get('/robots.txt')
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
+    ->inject('specifications')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, array $specifications) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
 
@@ -1072,7 +1075,7 @@ App::get('/robots.txt')
             $template = new View(__DIR__ . '/../views/general/robots.phtml');
             $response->text($template->render(false));
         } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $specifications);
         }
     });
 
@@ -1092,7 +1095,8 @@ App::get('/humans.txt')
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
+    ->inject('specifications')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, array $specifications) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
 
@@ -1100,7 +1104,7 @@ App::get('/humans.txt')
             $template = new View(__DIR__ . '/../views/general/humans.phtml');
             $response->text($template->render(false));
         } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $specifications);
         }
     });
 

app/init/configs.php

@@ -33,5 +33,4 @@ Config::load('storage-logos', __DIR__ . '/../config/storage/logos.php');
 Config::load('storage-mimes', __DIR__ . '/../config/storage/mimes.php');
 Config::load('storage-inputs', __DIR__ . '/../config/storage/inputs.php');
 Config::load('storage-outputs', __DIR__ . '/../config/storage/outputs.php');
-Config::load('runtime-specifications', __DIR__ . '/../config/runtimes/specifications.php');
 Config::load('function-templates', __DIR__ . '/../config/function-templates.php');

app/init/resources.php

@@ -822,3 +822,13 @@ App::setResource('apiKey', function (Request $request, Document $project): ?Key
 
     return Key::decode($project, $key);
 }, ['request', 'project']);
+
+App::setResource('specifications', function () {
+    return Config::getParam('runtime-specifications', [
+        APP_FUNCTION_SPECIFICATION_DEFAULT => [
+            'slug ' => APP_FUNCTION_SPECIFICATION_DEFAULT,
+            'memory' => APP_FUNCTION_MEMORY_DEFAULT,
+            'cpus' => APP_FUNCTION_CPUS_DEFAULT
+        ]
+    ]);
+});

app/views/install/compose.phtml

@@ -148,6 +148,7 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -340,6 +341,7 @@ $image = $this->getParam('image', '');
       - _APP_EXECUTOR_HOST
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_EMAIL_CERTIFICATES
@@ -651,6 +653,7 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 

app/worker.php

@@ -215,15 +215,18 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
 }, ['pools', 'cache']);
 
 Server::setResource('abuseRetention', function () {
-    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400);
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
 });
 
 Server::setResource('auditRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
+    return [
+        'project' => DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)), // 14 days
+        'console' => DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)) // 6 months
+    ];
 });
 
 Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
 });
 
 Server::setResource('cache', function (Registry $register) {
@@ -412,6 +415,16 @@ Server::setResource('logError', function (Registry $register, Document $project)
     };
 }, ['register', 'project']);
 
+Server::setResource('specifications', function () {
+    return Config::getParam('runtime-specifications', [
+        APP_FUNCTION_SPECIFICATION_DEFAULT => [
+            'slug ' => APP_FUNCTION_SPECIFICATION_DEFAULT,
+            'memory' => APP_FUNCTION_MEMORY_DEFAULT,
+            'cpus' => APP_FUNCTION_CPUS_DEFAULT
+        ]
+    ]);
+});
+
 $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');

composer.json

@@ -19,14 +19,14 @@
     "autoload": {
         "psr-4": {
             "Appwrite\\": "src/Appwrite",
-            "Executor\\": "src/Executor"
+            "Executor\\": "src/Executor",
+            "Appwrite\\Tests\\": "tests/extensions"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Tests\\E2E\\": "tests/e2e",
-            "Tests\\Unit\\": "tests/unit",
-            "Appwrite\\Tests\\": "tests/extensions"
+            "Tests\\Unit\\": "tests/unit"
         }
     },
     "require": {

composer.lock

@@ -8403,7 +8403,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

docker-compose.yml

@@ -171,6 +171,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -389,6 +390,8 @@ services:
       - _APP_DATABASE_SHARED_TABLES
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_EMAIL_CERTIFICATES
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
 
   appwrite-worker-databases:
     entrypoint: worker-databases
@@ -721,6 +724,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_MAINTENANCE_DELAY

phpunit.xml

@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         stopOnFailure="true"
 >
     <extensions>
         <extension class="Appwrite\Tests\TestHook" />

src/Appwrite/Platform/Workers/Builds.php

@@ -59,8 +59,9 @@ class Builds extends Action
             ->inject('deviceForFunctions')
             ->inject('isResourceBlocked')
             ->inject('log')
-            ->callback(fn ($message, Document $project, Database $dbForPlatform, Event $queueForEvents, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, StatsUsage $usage, Cache $cache, Database $dbForProject, Device $deviceForFunctions, callable $isResourceBlocked, Log $log) =>
-                $this->action($message, $project, $dbForPlatform, $queueForEvents, $queueForWebhooks, $queueForFunctions, $queueForRealtime, $usage, $cache, $dbForProject, $deviceForFunctions, $isResourceBlocked, $log));
+            ->inject('specifications')
+            ->callback(fn ($message, Document $project, Database $dbForPlatform, Event $queueForEvents, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, StatsUsage $usage, Cache $cache, Database $dbForProject, Device $deviceForFunctions, callable $isResourceBlocked, Log $log, $specifications) =>
+                $this->action($message, $project, $dbForPlatform, $queueForEvents, $queueForWebhooks, $queueForFunctions, $queueForRealtime, $usage, $cache, $dbForProject, $deviceForFunctions, $isResourceBlocked, $log, $specifications));
     }
 
     /**
@@ -79,7 +80,7 @@ class Builds extends Action
      * @return void
      * @throws \Utopia\Database\Exception
      */
-    public function action(Message $message, Document $project, Database $dbForPlatform, Event $queueForEvents, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, StatsUsage $queueForStatsUsage, Cache $cache, Database $dbForProject, Device $deviceForFunctions, callable $isResourceBlocked, Log $log): void
+    public function action(Message $message, Document $project, Database $dbForPlatform, Event $queueForEvents, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, StatsUsage $queueForStatsUsage, Cache $cache, Database $dbForProject, Device $deviceForFunctions, callable $isResourceBlocked, Log $log, $specifications): void
     {
         $payload = $message->getPayload() ?? [];
 
@@ -100,7 +101,7 @@ class Builds extends Action
             case BUILD_TYPE_RETRY:
                 Console::info('Creating build for deployment: ' . $deployment->getId());
                 $github = new GitHub($cache);
-                $this->buildDeployment($deviceForFunctions, $queueForWebhooks, $queueForFunctions, $queueForRealtime, $queueForEvents, $queueForStatsUsage, $dbForPlatform, $dbForProject, $github, $project, $resource, $deployment, $template, $isResourceBlocked, $log);
+                $this->buildDeployment($deviceForFunctions, $queueForWebhooks, $queueForFunctions, $queueForRealtime, $queueForEvents, $queueForStatsUsage, $dbForPlatform, $dbForProject, $github, $project, $resource, $deployment, $template, $isResourceBlocked, $log, $specifications);
                 break;
 
             default:
@@ -127,7 +128,7 @@ class Builds extends Action
      * @throws \Utopia\Database\Exception
      * @throws Exception
      */
-    protected function buildDeployment(Device $deviceForFunctions, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, Event $queueForEvents, StatsUsage $queueForStatsUsage, Database $dbForPlatform, Database $dbForProject, GitHub $github, Document $project, Document $function, Document $deployment, Document $template, callable $isResourceBlocked, Log $log): void
+    protected function buildDeployment(Device $deviceForFunctions, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, Event $queueForEvents, StatsUsage $queueForStatsUsage, Database $dbForPlatform, Database $dbForProject, GitHub $github, Document $project, Document $function, Document $deployment, Document $template, callable $isResourceBlocked, Log $log, array $specifications): void
     {
         $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
 
@@ -156,7 +157,7 @@ class Builds extends Action
         }
 
         $version = $function->getAttribute('version', 'v2');
-        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
+        $spec = $specifications[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
         $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
         $key = $function->getAttribute('runtime');
         $runtime = $runtimes[$key] ?? null;

src/Appwrite/Platform/Workers/Deletes.php

@@ -57,7 +57,7 @@ class Deletes extends Action
             ->inject('auditRetention')
             ->inject('log')
             ->callback(
-                fn ($message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, string $auditRetention, Log $log) =>
+                fn ($message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, array $auditRetention, Log $log) =>
                     $this->action($message, $project, $dbForPlatform, $getProjectDB, $getLogsDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $certificates, $executionRetention, $auditRetention, $log)
             );
     }
@@ -66,7 +66,7 @@ class Deletes extends Action
      * @throws Exception
      * @throws Throwable
      */
-    public function action(Message $message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, string $auditRetention, Log $log): void
+    public function action(Message $message, Document $project, Database $dbForPlatform, callable $getProjectDB, callable $getLogsDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $executionRetention, array $auditRetention, Log $log): void
     {
         $payload = $message->getPayload() ?? [];
 
@@ -746,14 +746,14 @@ class Deletes extends Action
      * @return void
      * @throws Exception
      */
-    private function deleteAuditLogs(Document $project, callable $getProjectDB, string $auditRetention): void
+    private function deleteAuditLogs(Document $project, callable $getProjectDB, array $auditRetention): void
     {
         $projectId = $project->getId();
         $dbForProject = $getProjectDB($project);
 
         try {
             $this->deleteByGroup(Audit::COLLECTION, [
-                Query::lessThan('time', $auditRetention),
+                Query::lessThan('time', ($projectId === 'console' ? $auditRetention['console'] : $auditRetention['project'])),
                 Query::orderDesc('time'),
                 Query::orderDesc('$internalId'),
             ], $dbForProject);

src/Appwrite/Platform/Workers/Functions.php

@@ -52,10 +52,11 @@ class Functions extends Action
             ->inject('queueForStatsUsage')
             ->inject('log')
             ->inject('isResourceBlocked')
-            ->callback(fn (Document $project, Message $message, Database $dbForProject, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, Event $queueForEvents, StatsUsage $queueForStatsUsage, Log $log, callable $isResourceBlocked) => $this->action($project, $message, $dbForProject, $queueForWebhooks, $queueForFunctions, $queueForRealtime, $queueForEvents, $queueForStatsUsage, $log, $isResourceBlocked));
+            ->inject('specifications')
+            ->callback(fn (Document $project, Message $message, Database $dbForProject, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, Event $queueForEvents, StatsUsage $queueForStatsUsage, Log $log, callable $isResourceBlocked, $specifications) => $this->action($project, $message, $dbForProject, $queueForWebhooks, $queueForFunctions, $queueForRealtime, $queueForEvents, $queueForStatsUsage, $log, $isResourceBlocked, $specifications));
     }
 
-    public function action(Document $project, Message $message, Database $dbForProject, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, Event $queueForEvents, StatsUsage $queueForStatsUsage, Log $log, callable $isResourceBlocked): void
+    public function action(Document $project, Message $message, Database $dbForProject, Webhook $queueForWebhooks, Func $queueForFunctions, Realtime $queueForRealtime, Event $queueForEvents, StatsUsage $queueForStatsUsage, Log $log, callable $isResourceBlocked, array $specifications): void
     {
         $payload = $message->getPayload() ?? [];
 
@@ -153,6 +154,7 @@ class Functions extends Action
                             'user-agent' => 'Appwrite/' . APP_VERSION_STABLE,
                             'content-type' => 'application/json'
                         ],
+                        specifications: $specifications,
                         data: null,
                         user: $user,
                         jwt: null,
@@ -192,6 +194,7 @@ class Functions extends Action
                     path: $path,
                     method: $method,
                     headers: $headers,
+                    specifications: $specifications,
                     data: $data,
                     user: $user,
                     jwt: $jwt,
@@ -216,6 +219,7 @@ class Functions extends Action
                     path: $path,
                     method: $method,
                     headers: $headers,
+                    specifications: $specifications,
                     data: $data,
                     user: $user,
                     jwt: $jwt,
@@ -302,6 +306,7 @@ class Functions extends Action
      * @param string $path
      * @param string $method
      * @param array $headers
+     * @param array $specifications
      * @param string|null $data
      * @param Document|null $user
      * @param string|null $jwt
@@ -328,6 +333,7 @@ class Functions extends Action
         string $path,
         string $method,
         array $headers,
+        array $specifications,
         string $data = null,
         ?Document $user = null,
         string $jwt = null,
@@ -338,7 +344,7 @@ class Functions extends Action
         $user ??= new Document();
         $functionId = $function->getId();
         $deploymentId = $function->getAttribute('deployment', '');
-        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
+        $spec = $specifications[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
 
         $log->addTag('deploymentId', $deploymentId);
 

tests/e2e/General/UsageTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests\E2E\General;
 
-use Appwrite\Functions\Specification;
 use Appwrite\Tests\Retry;
 use CURLFile;
 use DateTime;
@@ -870,8 +869,7 @@ class UsageTest extends Scope
                     'users.*.delete',
                 ],
                 'schedule' => '0 0 1 1 *',
-                'timeout' => 10,
-                'specification' => Specification::S_8VCPU_8GB
+                'timeout' => 10
             ]
         );
 

tests/e2e/Services/Functions/FunctionsCustomServerTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests\E2E\Services\Functions;
 
-use Appwrite\Functions\Specification;
 use Tests\E2E\Client;
 use Tests\E2E\Scopes\ProjectCustom;
 use Tests\E2E\Scopes\Scope;
@@ -1054,96 +1053,6 @@ class FunctionsCustomServerTest extends Scope
         return $data;
     }
 
-
-
-    /**
-     * @depends testGetExecution
-     */
-    public function testUpdateSpecs($data): array
-    {
-        /**
-         * Test for SUCCESS
-         */
-        // Change the function specs
-        $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'name' => 'Test1',
-            'events' => [
-                'users.*.update.name',
-                'users.*.update.email',
-            ],
-            'timeout' => 15,
-            'runtime' => 'php-8.0',
-            'entrypoint' => 'index.php',
-            'specification' => Specification::S_1VCPU_1GB,
-        ]);
-
-        $this->assertEquals(200, $function['headers']['status-code']);
-        $this->assertNotEmpty($function['body']['$id']);
-        $this->assertEquals(Specification::S_1VCPU_1GB, $function['body']['specification']);
-
-        // Verify the updated specs
-        $execution = $this->createExecution($data['functionId']);
-
-        $output = json_decode($execution['body']['responseBody'], true);
-
-        $this->assertEquals(1, $output['APPWRITE_FUNCTION_CPUS']);
-        $this->assertEquals(1024, $output['APPWRITE_FUNCTION_MEMORY']);
-
-        // Change the specs to 1vcpu 512mb
-        $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'name' => 'Test1',
-            'events' => [
-                'users.*.update.name',
-                'users.*.update.email',
-            ],
-            'timeout' => 15,
-            'runtime' => 'php-8.0',
-            'entrypoint' => 'index.php',
-            'specification' => Specification::S_1VCPU_512MB,
-        ]);
-
-        $this->assertEquals(200, $function['headers']['status-code']);
-        $this->assertNotEmpty($function['body']['$id']);
-        $this->assertEquals(Specification::S_1VCPU_512MB, $function['body']['specification']);
-
-        // Verify the updated specs
-        $execution = $this->createExecution($data['functionId']);
-
-        $output = json_decode($execution['body']['responseBody'], true);
-
-        $this->assertEquals(1, $output['APPWRITE_FUNCTION_CPUS']);
-        $this->assertEquals(512, $output['APPWRITE_FUNCTION_MEMORY']);
-
-        /**
-         * Test for FAILURE
-         */
-        $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'name' => 'Test1',
-            'events' => [
-                'users.*.update.name',
-                'users.*.update.email',
-            ],
-            'timeout' => 15,
-            'runtime' => 'php-8.0',
-            'entrypoint' => 'index.php',
-            'specification' => 's-2vcpu-512mb', // Invalid specification
-        ]);
-
-        $this->assertEquals(400, $function['headers']['status-code']);
-        $this->assertStringStartsWith('Invalid `specification` param: Specification must be one of:', $function['body']['message']);
-
-        return $data;
-    }
-
     /**
      * @depends testGetExecution
      */
@@ -1980,47 +1889,4 @@ class FunctionsCustomServerTest extends Scope
 
         $this->cleanupFunction($functionId);
     }
-
-    public function testFunctionSpecifications()
-    {
-        // Check if the function specifications are correctly set in builds
-        $function = $this->createFunction([
-            'functionId' => ID::unique(),
-            'runtime' => 'node-18.0',
-            'name' => 'Specification Test',
-            'entrypoint' => 'index.js',
-            'logging' => false,
-            'execute' => ['any'],
-            'specification' => Specification::S_2VCPU_2GB,
-            'commands' => 'echo $APPWRITE_FUNCTION_MEMORY:$APPWRITE_FUNCTION_CPUS',
-        ]);
-
-        $this->assertEquals(201, $function['headers']['status-code']);
-        $this->assertEquals(Specification::S_2VCPU_2GB, $function['body']['specification']);
-        $this->assertNotEmpty($function['body']['$id']);
-
-        $functionId = $functionId = $function['body']['$id'] ?? '';
-
-        $deploymentId = $this->setupDeployment($functionId, [
-            'code' => $this->packageFunction('node'),
-            'activate' => true
-        ]);
-
-        $this->assertEventually(function () use ($functionId, $deploymentId) {
-            $deployment = $this->getDeployment($functionId, $deploymentId);
-            $this->assertTrue(str_contains($deployment['body']['buildLogs'], '2048:2'));
-        }, 10000, 500);
-
-        // Check if the function specifications are correctly set in executions
-        $execution = $this->createExecution($functionId);
-
-        $this->assertEquals(201, $execution['headers']['status-code']);
-        $this->assertNotEmpty($execution['body']['$id']);
-
-        $executionResponse = json_decode($execution['body']['responseBody'], true);
-        $this->assertEquals('2048', $executionResponse['APPWRITE_FUNCTION_MEMORY']);
-        $this->assertEquals('2', $executionResponse['APPWRITE_FUNCTION_CPUS']);
-
-        $this->cleanupFunction($functionId);
-    }
 }