CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-04 06:00:53 +12:00
Code Issues Projects Releases Wiki Activity

Add production branch as param in updateFunction

Browse source
This commit is contained in:
Khushboo Verma 2023-05-23 16:04:38 +05:30
parent f86284fe21
commit df17c8a3dc
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/config/collections.php
View file

@ -2461,6 +2461,16 @@ $collections = [
'array' => false,
'filters' => [],
],
[
'$id' => ID::custom('branch'),
'type' => Database::VAR_STRING,
'signed' => true,
'size' => Database::LENGTH_KEY,
'format' => '',
'filters' => [],
'required' => false,
'array' => false,
],
[
'$id' => ID::custom('logging'),
'type' => Database::VAR_BOOLEAN,

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

@ -525,13 +525,14 @@ App::put('/v1/functions/:functionId')
->param('installCommand', '', new Text('1028'), 'Install Command.', true)
->param('installationId', '', new Text(128), 'Appwrite Installation ID for vcs deployment.', true)
->param('repositoryId', '', new Text(128), 'Repository ID of the repo linked to the function', true)
->param('branch', 'main', new Text(128), 'Production branch for the repo linked to the function', true)
->inject('response')
->inject('dbForProject')
->inject('project')
->inject('user')
->inject('events')
->inject('dbForConsole')
->action(function (string $functionId, string $name, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $buildCommand, string $installCommand, string $vcsInstallationId, string $repositoryId, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventsInstance, Database $dbForConsole) {
->action(function (string $functionId, string $name, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $buildCommand, string $installCommand, string $vcsInstallationId, string $repositoryId, string $branch, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventsInstance, Database $dbForConsole) {
$function = $dbForProject->getDocument('functions', $functionId);
@ -611,7 +612,7 @@ App::put('/v1/functions/:functionId')
'vcsInstallationInternalId' => $installation->getInternalId(),
'vcsRepoId' => $vcsRepoId,
'vcsRepoInternalId' => $vcsRepoInternalId,
'branch' => "main",
'branch' => $branch,
'search' => implode(' ', [$deploymentId, $entrypoint]),
'activate' => true,
]));
@ -639,6 +640,7 @@ App::put('/v1/functions/:functionId')
'vcsInstallationInternalId' => $installation->getInternalId(),
'vcsRepoId' => $vcsRepoId ?? $function->getAttribute('vcsRepoId', ''),
'vcsRepoInternalId' => $vcsRepoInternalId ?? $function->getAttribute('vcsRepoInternalId', ''),
'branch'=> $branch,
'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]),
])));

3
app/controllers/api/vcs.php
View file

@ -213,10 +213,11 @@ App::post('/v1/vcs/github/incomingwebhook')
$vcsRepoInternalId = $resource->getInternalId();
$vcsInstallationId = $resource->getAttribute('vcsInstallationId');
$vcsInstallationInternalId = $resource->getAttribute('vcsInstallationInternalId');
$productionBranch = $resource->getAttribute('branch', 'main');
$activate = false;
// TODO: Configurable in function settings
if ($branchName == "main") {
if ($branchName == $productionBranch) {
$activate = true;
}