CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-01 17:58:02 +13:00
Code Issues Projects Releases Wiki Activity

Remove vcs prefix

Browse source
This commit is contained in:
Matej Bačo 2023-07-30 21:10:25 +02:00
parent 57a4d5ad66
commit c7605b85e0
7 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/config/collections.php
View file

@ -2254,10 +2254,10 @@ $collections = [
],
],
'vcsInstallations' => [
'installations' => [
'$collection' => ID::custom(Database::METADATA),
'$id' => ID::custom('vcsInstallations'),
'name' => 'vcsInstallations',
'$id' => ID::custom('installations'),
'name' => 'installations',
'attributes' => [
[
'$id' => ID::custom('projectId'),
@ -2352,10 +2352,10 @@ $collections = [
],
],
'vcsRepositories' => [
'repositories' => [
'$collection' => ID::custom(Database::METADATA),
'$id' => ID::custom('vcsRepositories'),
'name' => 'vcsRepositories',
'$id' => ID::custom('repositories'),
'name' => 'repositories',
'attributes' => [
[
'$id' => ID::custom('installationId'),

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

@ -143,7 +143,7 @@ App::post('/v1/functions')
->setAttribute('branch', $templateBranch);
}
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -184,7 +184,7 @@ App::post('/v1/functions')
// Git connect logic
if (!empty($providerRepositoryId)) {
$repository = $dbForConsole->createDocument('vcsRepositories', new Document([
$repository = $dbForConsole->createDocument('repositories', new Document([
'$id' => ID::unique(),
'$permissions' => [
Permission::read(Role::any()),
@ -651,7 +651,7 @@ App::put('/v1/functions/:functionId')
throw new Exception(Exception::FUNCTION_NOT_FOUND);
}
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -676,7 +676,7 @@ App::put('/v1/functions/:functionId')
// Git disconnect logic
if ($isConnected && empty($providerRepositoryId)) {
$repositories = $dbForConsole->find('vcsRepositories', [
$repositories = $dbForConsole->find('repositories', [
Query::equal('projectInternalId', [$project->getInternalId()]),
Query::equal('resourceInternalId', [$function->getInternalId()]),
Query::equal('resourceType', ['function']),
@ -684,7 +684,7 @@ App::put('/v1/functions/:functionId')
]);
foreach ($repositories as $repository) {
$dbForConsole->deleteDocument('vcsRepositories', $repository->getId());
$dbForConsole->deleteDocument('repositories', $repository->getId());
}
$providerRepositoryId = '';
@ -700,7 +700,7 @@ App::put('/v1/functions/:functionId')
if (!$isConnected && !empty($providerRepositoryId)) {
$teamId = $project->getAttribute('teamId', '');
$repository = $dbForConsole->createDocument('vcsRepositories', new Document([
$repository = $dbForConsole->createDocument('repositories', new Document([
'$id' => ID::unique(),
'$permissions' => [
Permission::read(Role::team(ID::custom($teamId))),
@ -1306,7 +1306,7 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
// TODO: Somehow set commit SHA & ownerName & repoName for git deployments, and file path for manual. Redeploy should use exact same source code
$installation = $dbForConsole->getDocument('vcsInstallations', $deployment->getAttribute('installationId', ''));
$installation = $dbForConsole->getDocument('installations', $deployment->getAttribute('installationId', ''));
$redeployVcs($request, $function, $project, $installation, $dbForProject, new Document([]));

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

@ -325,7 +325,7 @@ App::get('/v1/vcs/github/callback')
$projectInternalId = $project->getInternalId();
$installation = $dbForConsole->findOne('vcsInstallations', [
$installation = $dbForConsole->findOne('installations', [
Query::equal('providerInstallationId', [$providerInstallationId]),
Query::equal('projectInternalId', [$projectInternalId])
]);
@ -350,12 +350,12 @@ App::get('/v1/vcs/github/callback')
'personal' => $personalSlug === $owner
]);
$installation = $dbForConsole->createDocument('vcsInstallations', $installation);
$installation = $dbForConsole->createDocument('installations', $installation);
} else {
$installation = $installation
->setAttribute('organization', $owner)
->setAttribute('personal', $personalSlug === $owner);
$installation = $dbForConsole->updateDocument('vcsInstallations', $installation->getId(), $installation);
$installation = $dbForConsole->updateDocument('installations', $installation->getId(), $installation);
}
} else {
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Installation of the Appwrite GitHub App on organization accounts is restricted to organization owners. As a member of the organization, you do not have the necessary permissions to install this GitHub App. Please contact the organization owner to create the installation from the Appwrite console.');
@ -385,7 +385,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:pr
->inject('project')
->inject('dbForConsole')
->action(function (string $installationId, string $providerRepositoryId, string $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -456,7 +456,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
$search = "";
}
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -583,7 +583,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
->inject('project')
->inject('dbForConsole')
->action(function (string $installationId, string $name, bool $private, GitHub $github, Document $user, Response $response, Document $project, Database $dbForConsole) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -655,7 +655,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
->inject('project')
->inject('dbForConsole')
->action(function (string $installationId, string $providerRepositoryId, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -702,7 +702,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
->inject('project')
->inject('dbForConsole')
->action(function (string $installationId, string $providerRepositoryId, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -767,7 +767,7 @@ App::post('/v1/vcs/github/events')
$github->initialiseVariables($providerInstallationId, $privateKey, $githubAppId);
//find functionId from functions table
$repositories = $dbForConsole->find('vcsRepositories', [
$repositories = $dbForConsole->find('repositories', [
Query::equal('providerRepositoryId', [$providerRepositoryId]),
Query::limit(100),
]);
@ -778,22 +778,22 @@ App::post('/v1/vcs/github/events')
// TODO: Use worker for this job instead (update function as well)
$providerInstallationId = $parsedPayload["installationId"];
$installations = $dbForConsole->find('vcsInstallations', [
$installations = $dbForConsole->find('installations', [
Query::equal('providerInstallationId', [$providerInstallationId]),
Query::limit(1000)
]);
foreach ($installations as $installation) {
$repositories = $dbForConsole->find('vcsRepositories', [
$repositories = $dbForConsole->find('repositories', [
Query::equal('installationInternalId', [$installation->getInternalId()]),
Query::limit(1000)
]);
foreach ($repositories as $repository) {
$dbForConsole->deleteDocument('vcsRepositories', $repository->getId());
$dbForConsole->deleteDocument('repositories', $repository->getId());
}
$dbForConsole->deleteDocument('vcsInstallations', $installation->getId());
$dbForConsole->deleteDocument('installations', $installation->getId());
}
}
} elseif ($event == $github::EVENT_PULL_REQUEST) {
@ -812,7 +812,7 @@ App::post('/v1/vcs/github/events')
$github->initialiseVariables($providerInstallationId, $privateKey, $githubAppId);
$repositories = $dbForConsole->find('vcsRepositories', [
$repositories = $dbForConsole->find('repositories', [
Query::equal('providerRepositoryId', [$providerRepositoryId]),
Query::orderDesc('$createdAt')
]);
@ -826,7 +826,7 @@ App::post('/v1/vcs/github/events')
$external = $parsedPayload["external"] ?? true;
if ($external) {
$repositories = $dbForConsole->find('vcsRepositories', [
$repositories = $dbForConsole->find('repositories', [
Query::equal('providerRepositoryId', [$providerRepositoryId]),
Query::orderDesc('$createdAt')
]);
@ -837,7 +837,7 @@ App::post('/v1/vcs/github/events')
if (\in_array($providerPullRequestId, $providerPullRequestIds)) {
$providerPullRequestIds = \array_diff($providerPullRequestIds, [$providerPullRequestId]);
$repository = $repository->setAttribute('providerPullRequestIds', $providerPullRequestIds);
$repository = Authorization::skip(fn () => $dbForConsole->updateDocument('vcsRepositories', $repository->getId(), $repository));
$repository = Authorization::skip(fn () => $dbForConsole->updateDocument('repositories', $repository->getId(), $repository));
}
}
}
@ -880,7 +880,7 @@ App::get('/v1/vcs/installations')
if ($cursor) {
/** @var Query $cursor */
$installationId = $cursor->getValue();
$cursorDocument = $dbForConsole->getDocument('vcsInstallations', $installationId);
$cursorDocument = $dbForConsole->getDocument('installations', $installationId);
if ($cursorDocument->isEmpty()) {
throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Installation '{$installationId}' for the 'cursor' value not found.");
@ -891,8 +891,8 @@ App::get('/v1/vcs/installations')
$filterQueries = Query::groupByType($queries)['filters'];
$results = $dbForConsole->find('vcsInstallations', $queries);
$total = $dbForConsole->count('vcsInstallations', $filterQueries, APP_LIMIT_COUNT);
$results = $dbForConsole->find('installations', $queries);
$total = $dbForConsole->count('installations', $filterQueries, APP_LIMIT_COUNT);
$response->dynamic(new Document([
'installations' => $results,
@ -916,7 +916,7 @@ App::get('/v1/vcs/installations/:installationId')
->inject('project')
->inject('dbForConsole')
->action(function (string $installationId, Response $response, Document $project, Database $dbForConsole) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId);
$installation = $dbForConsole->getDocument('installations', $installationId);
if ($installation === false || $installation->isEmpty()) {
throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@ -945,7 +945,7 @@ App::delete('/v1/vcs/installations/:installationId')
->inject('dbForConsole')
->inject('deletes')
->action(function (string $installationId, Response $response, Document $project, Database $dbForConsole, Delete $deletes) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -953,7 +953,7 @@ App::delete('/v1/vcs/installations/:installationId')
throw new Exception(Exception::INSTALLATION_NOT_FOUND);
}
if (!$dbForConsole->deleteDocument('vcsInstallations', $installation->getId())) {
if (!$dbForConsole->deleteDocument('installations', $installation->getId())) {
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove installation from DB');
}
@ -983,7 +983,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
->inject('dbForConsole')
->inject('getProjectDB')
->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForConsole, callable $getProjectDB) use ($createGitDeployments) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -991,7 +991,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
throw new Exception(Exception::INSTALLATION_NOT_FOUND);
}
$repository = $dbForConsole->getDocument('vcsRepositories', $repositoryId, [
$repository = $dbForConsole->getDocument('repositories', $repositoryId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
@ -1008,7 +1008,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
// TODO: Delete from array when PR is closed
$repository = $dbForConsole->updateDocument('vcsRepositories', $repository->getId(), $repository);
$repository = $dbForConsole->updateDocument('repositories', $repository->getId(), $repository);
$privateKey = App::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
$githubAppId = App::getEnv('_APP_VCS_GITHUB_APP_ID');

2
app/init.php
View file

@ -154,7 +154,7 @@ const DELETE_TYPE_ABUSE = 'abuse';
const DELETE_TYPE_USAGE = 'usage';
const DELETE_TYPE_REALTIME = 'realtime';
const DELETE_TYPE_BUCKETS = 'buckets';
const DELETE_TYPE_INSTALLATIONS = 'vcsInstallations';
const DELETE_TYPE_INSTALLATIONS = 'installations';
const DELETE_TYPE_RULES = 'rules';
const DELETE_TYPE_SESSIONS = 'sessions';
const DELETE_TYPE_CACHE_BY_TIMESTAMP = 'cacheByTimeStamp';

2
app/workers/builds.php
View file

@ -153,7 +153,7 @@ class BuildsV1 extends Worker
try {
if ($isNewBuild) {
if ($isVcsEnabled) {
$installation = $dbForConsole->getDocument('vcsInstallations', $installationId, [
$installation = $dbForConsole->getDocument('installations', $installationId, [
Query::equal('projectInternalId', [$project->getInternalId()])
]);
$providerInstallationId = $installation->getAttribute('providerInstallationId');

2
app/workers/deletes.php
View file

@ -752,7 +752,7 @@ class DeletesV1 extends Worker
$this->listByGroup('functions', [
Query::equal('installationInternalId', [$document->getInternalId()])
], $dbForProject, function ($function) use ($dbForProject, $dbForConsole) {
$dbForConsole->deleteDocument('vcsRepositories', $function->getAttribute('repositoryId'));
$dbForConsole->deleteDocument('repositories', $function->getAttribute('repositoryId'));
$function = $function
->setAttribute('installationId', '')

2
src/Appwrite/Utopia/Database/Validator/Queries/Installations.php
View file

@ -15,6 +15,6 @@ class Installations extends Base
*/
public function __construct()
{
parent::__construct('vcsInstallations', self::ALLOWED_ATTRIBUTES);
parent::__construct('installations', self::ALLOWED_ATTRIBUTES);
}
}