CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-26 18:20:43 +12:00
Code Issues Projects Releases Wiki Activity

feat: rename tag to deployments across worker

Browse source
This commit is contained in:
Christy Jacob 2022-01-26 17:09:32 +04:00
parent c1d71904e8
commit c595f4eea9
4 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/functions.php
View file

@ -584,7 +584,7 @@ App::post('/v1/functions/:functionId/deployments')
'projectId' => $project->getId(),
'functionId' => $function->getId(),
'deploymentId' => $deploymentId,
'type' => BUILD_TYPE_TAG
'type' => BUILD_TYPE_DEPLOYMENT
]);
$usage

22
app/executor.php
View file

@ -688,7 +688,7 @@ function runBuildStage(string $buildId, string $projectID): Document
return $build;
}
// Update Tag Status
// Update deployment Status
$build->setAttribute('status', 'building');
$database->updateDocument('builds', $build->getId(), $build);
@ -700,7 +700,7 @@ function runBuildStage(string $buildId, string $projectID): Document
throw new Exception('Runtime "' . $build->getAttribute('runtime', '') . '" is not supported');
}
// Grab Tag Files
// Grab Deployment Files
$deploymentPath = $build->getAttribute('source', '');
$sourceType = $build->getAttribute('sourceType', '');
@ -999,24 +999,24 @@ App::delete('/v1/functions/:functionId')
}
);
App::post('/v1/functions/:functionId/tags/:tagId/runtime')
->desc('Create a new runtime server for a tag')
App::post('/v1/functions/:functionId/deployments/:deploymentId/runtime')
->desc('Create a new runtime server for a deployment')
->param('functionId', '', new UID(), 'Function unique ID.')
->param('tagId', '', new UID(), 'Tag unique ID.')
->param('deploymentId', '', new UID(), 'Deployment unique ID.')
->inject('response')
->inject('dbForProject')
->inject('projectID')
->action(function (string $functionId, string $tagId, Response $response, Database $dbForProject, string $projectID) use ($runtimes) {
->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, string $projectID) use ($runtimes) {
// Get function document
$function = $dbForProject->getDocument('functions', $functionId);
if ($function->isEmpty()) {
throw new Exception('Function not found', 404);
}
// Get tag document
$tag = $dbForProject->getDocument('tags', $tagId);
if ($tag->isEmpty()) {
throw new Exception('Tag not found', 404);
// Get deployment document
$deployment = $dbForProject->getDocument('deployments', $deploymentId);
if ($deployment->isEmpty()) {
throw new Exception('Deployment not found', 404);
}
$runtime = $runtimes[$function->getAttribute('runtime')] ?? null;
@ -1024,7 +1024,7 @@ App::post('/v1/functions/:functionId/tags/:tagId/runtime')
throw new Exception('Runtime "' . $function->getAttribute('runtime', '') . '" not found.', 404);
}
createRuntimeServer($functionId, $projectID, $tagId, $dbForProject);
createRuntimeServer($functionId, $projectID, $deploymentId, $dbForProject);
$response
->setStatusCode(201)

2
app/init.php
View file

@ -93,7 +93,7 @@ const DATABASE_TYPE_CREATE_INDEX = 'createIndex';
const DATABASE_TYPE_DELETE_ATTRIBUTE = 'deleteAttribute';
const DATABASE_TYPE_DELETE_INDEX = 'deleteIndex';
// Build Worker Types
const BUILD_TYPE_TAG = 'tag';
const BUILD_TYPE_DEPLOYMENT = 'deployment';
const BUILD_TYPE_RETRY = 'retry';
// Deletion Types
const DELETE_TYPE_DOCUMENT = 'document';

64
app/workers/builds.php
View file

@ -34,11 +34,11 @@ class BuildsV1 extends Worker
$projectId = $this->args['projectId'] ?? '';
switch ($type) {
case BUILD_TYPE_TAG:
case BUILD_TYPE_DEPLOYMENT:
$functionId = $this->args['functionId'] ?? '';
$tagId = $this->args['tagId'] ?? '';
Console::info("[ INFO ] Creating build for tag: $tagId");
$this->buildTag($projectId, $functionId, $tagId);
$deploymentId = $this->args['deploymentId'] ?? '';
Console::info("[ INFO ] Creating build for deployment: $deploymentId");
$this->buildDeployment($projectId, $functionId, $deploymentId);
break;
case BUILD_TYPE_RETRY:
@ -83,10 +83,10 @@ class BuildsV1 extends Worker
}
}
protected function triggerCreateRuntimeServer(string $projectId, string $functionId, string $tagId)
protected function triggerCreateRuntimeServer(string $projectId, string $functionId, string $deploymentId)
{
$ch = \curl_init();
\curl_setopt($ch, CURLOPT_URL, "http://appwrite-executor/v1/functions/$functionId/tags/$tagId/runtime");
\curl_setopt($ch, CURLOPT_URL, "http://appwrite-executor/v1/functions/$functionId/deployments/$deploymentId/runtime");
\curl_setopt($ch, CURLOPT_POST, true);
\curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
\curl_setopt($ch, CURLOPT_TIMEOUT, 900);
@ -112,7 +112,7 @@ class BuildsV1 extends Worker
}
}
protected function buildTag(string $projectId, string $functionId, string $tagId)
protected function buildDeployment(string $projectId, string $functionId, string $deploymentId)
{
$dbForProject = $this->getProjectDB($projectId);
@ -122,10 +122,10 @@ class BuildsV1 extends Worker
throw new Exception('Function not found', 404);
}
// Get tag document
$tag = $dbForProject->getDocument('tags', $tagId);
if ($tag->isEmpty()) {
throw new Exception('Tag not found', 404);
// Get deployment document
$deployment = $dbForProject->getDocument('deployments', $deploymentId);
if ($deployment->isEmpty()) {
throw new Exception('Deployment not found', 404);
}
$runtimes = Config::getParam('runtimes', []);
@ -135,13 +135,13 @@ class BuildsV1 extends Worker
throw new Exception('Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
}
$buildId = $tag->getAttribute('buildId', '');
$buildId = $deployment->getAttribute('buildId', '');
// If build ID is empty, create a new build
if (empty($buildId)) {
try {
$buildId = $dbForProject->getId();
// TODO : There is no way to associate a build with a tag. So we need to add a tagId attribute to the build document
// TODO : There is no way to associate a build with a deployment. So we need to add a deploymentId attribute to the build document
// TODO : What should be the read and write permissions for a build ?
$dbForProject->createDocument('builds', new Document([
'$id' => $buildId,
@ -151,13 +151,13 @@ class BuildsV1 extends Worker
'status' => 'processing',
'runtime' => $function->getAttribute('runtime'),
'outputPath' => '',
'source' => $tag->getAttribute('path'),
'source' => $deployment->getAttribute('path'),
'sourceType' => Storage::DEVICE_LOCAL,
'stdout' => '',
'stderr' => '',
'time' => 0,
'vars' => [
'ENTRYPOINT_NAME' => $tag->getAttribute('entrypoint'),
'ENTRYPOINT_NAME' => $deployment->getAttribute('entrypoint'),
'APPWRITE_FUNCTION_ID' => $function->getId(),
'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name', ''),
'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'],
@ -166,14 +166,14 @@ class BuildsV1 extends Worker
]
]));
$tag->setAttribute('buildId', $buildId);
$tag = $dbForProject->updateDocument('tags', $tagId, $tag);
$deployment->setAttribute('buildId', $buildId);
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
} catch (\Throwable $th) {
Console::error($th->getMessage());
$tag->setAttribute('status', 'failed');
$tag->setAttribute('buildId', '');
$tag = $dbForProject->updateDocument('tags', $tagId, $tag);
$deployment->setAttribute('status', 'failed');
$deployment->setAttribute('buildId', '');
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
return;
}
}
@ -181,13 +181,13 @@ class BuildsV1 extends Worker
// Build the Code
try {
Console::info("[ INFO ] Creating build with id: $buildId");
$tag->setAttribute('status', 'building');
$tag = $dbForProject->updateDocument('tags', $tagId, $tag);
$deployment->setAttribute('status', 'building');
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
$this->triggerBuild($projectId, $buildId);
} catch (\Throwable $th) {
Console::error($th->getMessage());
$tag->setAttribute('status', 'failed');
$tag = $dbForProject->updateDocument('tags', $tagId, $tag);
$deployment->setAttribute('status', 'failed');
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
return;
}
@ -195,8 +195,8 @@ class BuildsV1 extends Worker
// Update the schedule
$schedule = $function->getAttribute('schedule', '');
$cron = (empty($function->getAttribute('tag')) && !empty($schedule)) ? new CronExpression($schedule) : null;
$next = (empty($function->getAttribute('tag')) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : 0;
$cron = (empty($function->getAttribute('deployment')) && !empty($schedule)) ? new CronExpression($schedule) : null;
$next = (empty($function->getAttribute('deployment')) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : 0;
// Grab build
$build = $dbForProject->getDocument('builds', $buildId);
@ -206,10 +206,10 @@ class BuildsV1 extends Worker
throw new Exception('Build failed', 500);
}
if ($tag->getAttribute('automaticDeploy') === true) {
// Update the function document setting the tag as the active one
if ($deployment->getAttribute('deploy') === true) {
// Update the function document setting the deployment as the active one
$function
->setAttribute('tag', $tag->getId())
->setAttribute('deployment', $deployment->getId())
->setAttribute('scheduleNext', (int)$next);
$function = $dbForProject->updateDocument('functions', $functionId, $function);
@ -218,11 +218,11 @@ class BuildsV1 extends Worker
// Deploy Runtime Server
try {
Console::info("[ INFO ] Creating runtime server");
$this->triggerCreateRuntimeServer($projectId, $functionId, $tagId, $dbForProject);
$this->triggerCreateRuntimeServer($projectId, $functionId, $deploymentId, $dbForProject);
} catch (\Throwable $th) {
Console::error($th->getMessage());
$tag->setAttribute('status', 'failed');
$tag = $dbForProject->updateDocument('tags', $tagId, $tag);
$deployment->setAttribute('status', 'failed');
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
return;
}