Add production branch as param in updateFunction
This commit is contained in:
parent
f86284fe21
commit
df17c8a3dc
3 changed files with 16 additions and 3 deletions
|
@ -2461,6 +2461,16 @@ $collections = [
|
||||||
'array' => false,
|
'array' => false,
|
||||||
'filters' => [],
|
'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'),
|
'$id' => ID::custom('logging'),
|
||||||
'type' => Database::VAR_BOOLEAN,
|
'type' => Database::VAR_BOOLEAN,
|
||||||
|
|
|
@ -525,13 +525,14 @@ App::put('/v1/functions/:functionId')
|
||||||
->param('installCommand', '', new Text('1028'), 'Install Command.', true)
|
->param('installCommand', '', new Text('1028'), 'Install Command.', true)
|
||||||
->param('installationId', '', new Text(128), 'Appwrite Installation ID for vcs deployment.', 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('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('response')
|
||||||
->inject('dbForProject')
|
->inject('dbForProject')
|
||||||
->inject('project')
|
->inject('project')
|
||||||
->inject('user')
|
->inject('user')
|
||||||
->inject('events')
|
->inject('events')
|
||||||
->inject('dbForConsole')
|
->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);
|
$function = $dbForProject->getDocument('functions', $functionId);
|
||||||
|
|
||||||
|
@ -611,7 +612,7 @@ App::put('/v1/functions/:functionId')
|
||||||
'vcsInstallationInternalId' => $installation->getInternalId(),
|
'vcsInstallationInternalId' => $installation->getInternalId(),
|
||||||
'vcsRepoId' => $vcsRepoId,
|
'vcsRepoId' => $vcsRepoId,
|
||||||
'vcsRepoInternalId' => $vcsRepoInternalId,
|
'vcsRepoInternalId' => $vcsRepoInternalId,
|
||||||
'branch' => "main",
|
'branch' => $branch,
|
||||||
'search' => implode(' ', [$deploymentId, $entrypoint]),
|
'search' => implode(' ', [$deploymentId, $entrypoint]),
|
||||||
'activate' => true,
|
'activate' => true,
|
||||||
]));
|
]));
|
||||||
|
@ -639,6 +640,7 @@ App::put('/v1/functions/:functionId')
|
||||||
'vcsInstallationInternalId' => $installation->getInternalId(),
|
'vcsInstallationInternalId' => $installation->getInternalId(),
|
||||||
'vcsRepoId' => $vcsRepoId ?? $function->getAttribute('vcsRepoId', ''),
|
'vcsRepoId' => $vcsRepoId ?? $function->getAttribute('vcsRepoId', ''),
|
||||||
'vcsRepoInternalId' => $vcsRepoInternalId ?? $function->getAttribute('vcsRepoInternalId', ''),
|
'vcsRepoInternalId' => $vcsRepoInternalId ?? $function->getAttribute('vcsRepoInternalId', ''),
|
||||||
|
'branch'=> $branch,
|
||||||
'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]),
|
'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]),
|
||||||
])));
|
])));
|
||||||
|
|
||||||
|
|
|
@ -213,10 +213,11 @@ App::post('/v1/vcs/github/incomingwebhook')
|
||||||
$vcsRepoInternalId = $resource->getInternalId();
|
$vcsRepoInternalId = $resource->getInternalId();
|
||||||
$vcsInstallationId = $resource->getAttribute('vcsInstallationId');
|
$vcsInstallationId = $resource->getAttribute('vcsInstallationId');
|
||||||
$vcsInstallationInternalId = $resource->getAttribute('vcsInstallationInternalId');
|
$vcsInstallationInternalId = $resource->getAttribute('vcsInstallationInternalId');
|
||||||
|
$productionBranch = $resource->getAttribute('branch', 'main');
|
||||||
$activate = false;
|
$activate = false;
|
||||||
|
|
||||||
// TODO: Configurable in function settings
|
// TODO: Configurable in function settings
|
||||||
if ($branchName == "main") {
|
if ($branchName == $productionBranch) {
|
||||||
$activate = true;
|
$activate = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue