diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php b/src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php index d76584534d..498a274280 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php @@ -58,10 +58,14 @@ class XList extends Base $specs = []; foreach ($allSpecs as $spec) { $spec['enabled'] = true; + $spec['buildEnabled'] = true; if (array_key_exists('runtimeSpecifications', $plan)) { $spec['enabled'] = in_array($spec['slug'], $plan['runtimeSpecifications']); } + if (array_key_exists('buildSpecifications', $plan)) { + $spec['buildEnabled'] = in_array($spec['slug'], $plan['buildSpecifications']); + } $maxCpus = System::getEnv('_APP_COMPUTE_CPUS', 0); $maxMemory = System::getEnv('_APP_COMPUTE_MEMORY', 0); diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Specifications/XList.php b/src/Appwrite/Platform/Modules/Sites/Http/Specifications/XList.php index 4bda37df73..d5b6515de7 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Specifications/XList.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Specifications/XList.php @@ -58,10 +58,14 @@ class XList extends Base $specs = []; foreach ($allSpecs as $spec) { $spec['enabled'] = true; + $spec['buildEnabled'] = true; if (array_key_exists('runtimeSpecifications', $plan)) { $spec['enabled'] = in_array($spec['slug'], $plan['runtimeSpecifications']); } + if (array_key_exists('buildSpecifications', $plan)) { + $spec['buildEnabled'] = in_array($spec['slug'], $plan['buildSpecifications']); + } $maxCpus = System::getEnv('_APP_COMPUTE_CPUS', 0); $maxMemory = System::getEnv('_APP_COMPUTE_MEMORY', 0); diff --git a/src/Appwrite/Utopia/Response/Model/Specification.php b/src/Appwrite/Utopia/Response/Model/Specification.php index 4fa7fb9bc7..034d399a75 100644 --- a/src/Appwrite/Utopia/Response/Model/Specification.php +++ b/src/Appwrite/Utopia/Response/Model/Specification.php @@ -24,7 +24,13 @@ class Specification extends Model ]); $this->addRule('enabled', [ 'type' => self::TYPE_BOOLEAN, - 'description' => 'Is size enabled.', + 'description' => 'Is size enabled for runtime.', + 'default' => false, + 'example' => true + ]); + $this->addRule('buildEnabled', [ + 'type' => self::TYPE_BOOLEAN, + 'description' => 'Is size enabled for builds.', 'default' => false, 'example' => true ]); diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 1aba466944..86aa67df32 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -208,10 +208,12 @@ final class FunctionsCustomServerTest extends Scope $this->assertArrayHasKey('memory', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('cpus', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('enabled', $specifications['body']['specifications'][0]); + $this->assertArrayHasKey('buildEnabled', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('slug', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('memory', $specifications['body']['specifications'][1]); $this->assertArrayHasKey('cpus', $specifications['body']['specifications'][1]); $this->assertArrayHasKey('enabled', $specifications['body']['specifications'][1]); + $this->assertArrayHasKey('buildEnabled', $specifications['body']['specifications'][1]); $this->assertArrayHasKey('slug', $specifications['body']['specifications'][1]); $function = $this->createFunction([ diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index 1eee0ecbc8..8a326d1023 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -34,10 +34,12 @@ final class SitesCustomServerTest extends Scope $this->assertArrayHasKey('memory', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('cpus', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('enabled', $specifications['body']['specifications'][0]); + $this->assertArrayHasKey('buildEnabled', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('slug', $specifications['body']['specifications'][0]); $this->assertArrayHasKey('memory', $specifications['body']['specifications'][1]); $this->assertArrayHasKey('cpus', $specifications['body']['specifications'][1]); $this->assertArrayHasKey('enabled', $specifications['body']['specifications'][1]); + $this->assertArrayHasKey('buildEnabled', $specifications['body']['specifications'][1]); $this->assertArrayHasKey('slug', $specifications['body']['specifications'][1]); $site = $this->createSite([