Add specification type parameter

This commit is contained in:
Torsten Dittmann committed 2026-06-22 19:51:26 +04:00
1 parent 7f536750b4
commit 23be75a87f
7 files changed
+31 -35

No files matched your search

@@ -12,6 +12,7 @@ use Utopia\Database\Document;
use Utopia\Platform\Action;
use Utopia\Platform\Scope\HTTP;
use Utopia\System\System;
use Utopia\Validator\WhiteList;
class XList extends Base
{
@@ -46,25 +47,23 @@ class XList extends Base
)
]
))
->param('type', 'runtimes', new WhiteList(['runtimes', 'builds']), 'Specification type to list. Can be one of: runtimes, builds.', true)
->inject('response')
->inject('plan')
->callback($this->action(...));
}
public function action(Response $response, array $plan)
public function action(string $type, Response $response, array $plan)
{
$allSpecs = Config::getParam('specifications', []);
$planKey = $type === 'builds' ? 'buildSpecifications' : 'runtimeSpecifications';
$specs = [];
foreach ($allSpecs as $spec) {
$spec['enabled'] = true;
$spec['enabledForBuilds'] = true;
if (array_key_exists('runtimeSpecifications', $plan)) {
$spec['enabled'] = in_array($spec['slug'], $plan['runtimeSpecifications']);
}
if (array_key_exists('buildSpecifications', $plan)) {
$spec['enabledForBuilds'] = in_array($spec['slug'], $plan['buildSpecifications']);
if (array_key_exists($planKey, $plan)) {
$spec['enabled'] = in_array($spec['slug'], $plan[$planKey]);
}
$maxCpus = System::getEnv('_APP_COMPUTE_CPUS', 0);
@@ -12,6 +12,7 @@ use Utopia\Database\Document;
use Utopia\Platform\Action;
use Utopia\Platform\Scope\HTTP;
use Utopia\System\System;
use Utopia\Validator\WhiteList;
class XList extends Base
{
@@ -46,25 +47,23 @@ class XList extends Base
)
]
))
->param('type', 'runtimes', new WhiteList(['runtimes', 'builds']), 'Specification type to list. Can be one of: runtimes, builds.', true)
->inject('response')
->inject('plan')
->callback($this->action(...));
}
public function action(Response $response, array $plan)
public function action(string $type, Response $response, array $plan)
{
$allSpecs = Config::getParam('specifications', []);
$planKey = $type === 'builds' ? 'buildSpecifications' : 'runtimeSpecifications';
$specs = [];
foreach ($allSpecs as $spec) {
$spec['enabled'] = true;
$spec['enabledForBuilds'] = true;
if (array_key_exists('runtimeSpecifications', $plan)) {
$spec['enabled'] = in_array($spec['slug'], $plan['runtimeSpecifications']);
}
if (array_key_exists('buildSpecifications', $plan)) {
$spec['enabledForBuilds'] = in_array($spec['slug'], $plan['buildSpecifications']);
if (array_key_exists($planKey, $plan)) {
$spec['enabled'] = in_array($spec['slug'], $plan[$planKey]);
}
$maxCpus = System::getEnv('_APP_COMPUTE_CPUS', 0);
@@ -24,13 +24,7 @@ class Specification extends Model
]);
$this->addRule('enabled', [
'type' => self::TYPE_BOOLEAN,
'description' => 'Is size enabled for runtime.',
'default' => false,
'example' => true
]);
$this->addRule('enabledForBuilds', [
'type' => self::TYPE_BOOLEAN,
'description' => 'Is size enabled for builds.',
'description' => 'Is size enabled.',
'default' => false,
'example' => true
]);
@@ -494,11 +494,11 @@ trait FunctionsBase
return $deployment;
}
protected function listSpecifications(): mixed
protected function listSpecifications(array $params = []): mixed
{
$specifications = $this->client->call(Client::METHOD_GET, '/functions/specifications', array_merge([
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()));
], $this->getHeaders()), $params);
return $specifications;
}
@@ -208,28 +208,30 @@ 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('enabledForBuilds', $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('enabledForBuilds', $specifications['body']['specifications'][1]);
$this->assertArrayHasKey('slug', $specifications['body']['specifications'][1]);
$buildSpecifications = $this->listSpecifications(['type' => 'builds']);
$this->assertEquals(200, $buildSpecifications['headers']['status-code']);
$this->assertEquals($specifications['body']['total'], $buildSpecifications['body']['total']);
$function = $this->createFunction([
'functionId' => ID::unique(),
'name' => 'Specs function',
'runtime' => 'node-22',
'buildSpecification' => $specifications['body']['specifications'][0]['slug'],
'buildSpecification' => $buildSpecifications['body']['specifications'][0]['slug'],
'runtimeSpecification' => $specifications['body']['specifications'][1]['slug'],
]);
$this->assertEquals(201, $function['headers']['status-code']);
$this->assertEquals($specifications['body']['specifications'][0]['slug'], $function['body']['buildSpecification']);
$this->assertEquals($buildSpecifications['body']['specifications'][0]['slug'], $function['body']['buildSpecification']);
$this->assertEquals($specifications['body']['specifications'][1]['slug'], $function['body']['runtimeSpecification']);
$function = $this->getFunction($function['body']['$id']);
$this->assertEquals(200, $function['headers']['status-code']);
$this->assertEquals($specifications['body']['specifications'][0]['slug'], $function['body']['buildSpecification']);
$this->assertEquals($buildSpecifications['body']['specifications'][0]['slug'], $function['body']['buildSpecification']);
$this->assertEquals($specifications['body']['specifications'][1]['slug'], $function['body']['runtimeSpecification']);
$this->cleanupFunction($function['body']['$id']);
+2 -2
View File
@@ -489,11 +489,11 @@ trait SitesBase
return $deployment;
}
protected function listSpecifications(): mixed
protected function listSpecifications(array $params = []): mixed
{
$specifications = $this->client->call(Client::METHOD_GET, '/sites/specifications', array_merge([
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()));
], $this->getHeaders()), $params);
return $specifications;
}
@@ -34,29 +34,31 @@ 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('enabledForBuilds', $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('enabledForBuilds', $specifications['body']['specifications'][1]);
$this->assertArrayHasKey('slug', $specifications['body']['specifications'][1]);
$buildSpecifications = $this->listSpecifications(['type' => 'builds']);
$this->assertEquals(200, $buildSpecifications['headers']['status-code']);
$this->assertEquals($specifications['body']['total'], $buildSpecifications['body']['total']);
$site = $this->createSite([
'buildRuntime' => 'node-22',
'framework' => 'other',
'name' => 'Specs site',
'siteId' => ID::unique(),
'buildSpecification' => $specifications['body']['specifications'][0]['slug'],
'buildSpecification' => $buildSpecifications['body']['specifications'][0]['slug'],
'runtimeSpecification' => $specifications['body']['specifications'][1]['slug'],
]);
$this->assertEquals(201, $site['headers']['status-code']);
$this->assertEquals($specifications['body']['specifications'][0]['slug'], $site['body']['buildSpecification']);
$this->assertEquals($buildSpecifications['body']['specifications'][0]['slug'], $site['body']['buildSpecification']);
$this->assertEquals($specifications['body']['specifications'][1]['slug'], $site['body']['runtimeSpecification']);
$site = $this->getSite($site['body']['$id']);
$this->assertEquals(200, $site['headers']['status-code']);
$this->assertEquals($specifications['body']['specifications'][0]['slug'], $site['body']['buildSpecification']);
$this->assertEquals($buildSpecifications['body']['specifications'][0]['slug'], $site['body']['buildSpecification']);
$this->assertEquals($specifications['body']['specifications'][1]['slug'], $site['body']['runtimeSpecification']);
$this->cleanupSite($site['body']['$id']);