Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch '1.7.x' into chore-cli-release

Browse source
This commit is contained in:
Jake Barnby 2025-05-27 01:25:31 +00:00 committed by GitHub
commit 021fb48dc1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php
View file

@ -89,8 +89,6 @@ class Update extends Base
throw new Exception(Exception::BUILD_NOT_READY); throw new Exception(Exception::BUILD_NOT_READY);
} }
$oldDeploymentInternalId = $function->getAttribute('deploymentInternalId', '');
$function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [ $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
'deploymentInternalId' => $deployment->getInternalId(), 'deploymentInternalId' => $deployment->getInternalId(),
'deploymentId' => $deployment->getId(), 'deploymentId' => $deployment->getId(),
@ -106,18 +104,13 @@ class Update extends Base
Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule)); Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
$queries = [ $queries = [
Query::equal('trigger', 'manual'), Query::equal('trigger', ['manual']),
Query::equal("type", ["deployment"]), Query::equal("type", ["deployment"]),
Query::equal("deploymentResourceType", ["function"]), Query::equal("deploymentResourceType", ["function"]),
Query::equal("deploymentResourceInternalId", [$function->getInternalId()]), Query::equal("deploymentResourceInternalId", [$function->getInternalId()]),
Query::equal("deploymentVcsProviderBranch", [""]),
]; ];
if (empty($oldDeploymentInternalId)) {
$queries[] = Query::equal("deploymentInternalId", [""]);
} else {
$queries[] = Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
}
$this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) { $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) {
$rule = $rule $rule = $rule
->setAttribute('deploymentId', $deployment->getId()) ->setAttribute('deploymentId', $deployment->getId())

18
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
View file

@ -1075,8 +1075,6 @@ class Builds extends Action
$resource->setAttribute('live', true); $resource->setAttribute('live', true);
switch ($resource->getCollection()) { switch ($resource->getCollection()) {
case 'functions': case 'functions':
$oldDeploymentInternalId = $resource->getAttribute('deploymentInternalId', '');
$resource->setAttribute('deploymentId', $deployment->getId()); $resource->setAttribute('deploymentId', $deployment->getId());
$resource->setAttribute('deploymentInternalId', $deployment->getInternalId()); $resource->setAttribute('deploymentInternalId', $deployment->getInternalId());
$resource->setAttribute('deploymentCreatedAt', $deployment->getCreatedAt()); $resource->setAttribute('deploymentCreatedAt', $deployment->getCreatedAt());
@ -1088,14 +1086,9 @@ class Builds extends Action
Query::equal("deploymentResourceInternalId", [$resource->getInternalId()]), Query::equal("deploymentResourceInternalId", [$resource->getInternalId()]),
Query::equal('deploymentResourceType', ['function']), Query::equal('deploymentResourceType', ['function']),
Query::equal('trigger', ['manual']), Query::equal('trigger', ['manual']),
Query::equal('deploymentVcsProviderBranch', ['']),
]; ];
if (empty($oldDeploymentInternalId)) {
$queries[] = Query::equal("deploymentInternalId", [""]);
} else {
$queries[] = Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
}
$rulesUpdated = false; $rulesUpdated = false;
$this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment, &$rulesUpdated) { $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment, &$rulesUpdated) {
$rulesUpdated = true; $rulesUpdated = true;
@ -1106,8 +1099,6 @@ class Builds extends Action
}); });
break; break;
case 'sites': case 'sites':
$oldDeploymentInternalId = $resource->getAttribute('deploymentInternalId', '');
$resource->setAttribute('deploymentId', $deployment->getId()); $resource->setAttribute('deploymentId', $deployment->getId());
$resource->setAttribute('deploymentInternalId', $deployment->getInternalId()); $resource->setAttribute('deploymentInternalId', $deployment->getInternalId());
$resource->setAttribute('deploymentScreenshotDark', $deployment->getAttribute('screenshotDark', '')); $resource->setAttribute('deploymentScreenshotDark', $deployment->getAttribute('screenshotDark', ''));
@ -1120,14 +1111,9 @@ class Builds extends Action
Query::equal("deploymentResourceInternalId", [$resource->getInternalId()]), Query::equal("deploymentResourceInternalId", [$resource->getInternalId()]),
Query::equal('deploymentResourceType', ['site']), Query::equal('deploymentResourceType', ['site']),
Query::equal('trigger', ['manual']), Query::equal('trigger', ['manual']),
Query::equal('deploymentVcsProviderBranch', ['']),
]; ];
if (empty($oldDeploymentInternalId)) {
$queries[] = Query::equal("deploymentInternalId", [""]);
} else {
$queries[] = Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
}
$this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) { $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) {
$rule = $rule $rule = $rule
->setAttribute('deploymentId', $deployment->getId()) ->setAttribute('deploymentId', $deployment->getId())

11
src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php
View file

@ -86,8 +86,6 @@ class Update extends Base
throw new Exception(Exception::BUILD_NOT_READY); throw new Exception(Exception::BUILD_NOT_READY);
} }
$oldDeploymentInternalId = $site->getAttribute('deploymentInternalId', '');
$site = $dbForProject->updateDocument('sites', $site->getId(), new Document(array_merge($site->getArrayCopy(), [ $site = $dbForProject->updateDocument('sites', $site->getId(), new Document(array_merge($site->getArrayCopy(), [
'deploymentInternalId' => $deployment->getInternalId(), 'deploymentInternalId' => $deployment->getInternalId(),
'deploymentId' => $deployment->getId(), 'deploymentId' => $deployment->getId(),
@ -97,18 +95,13 @@ class Update extends Base
]))); ])));
$queries = [ $queries = [
Query::equal('trigger', 'manual'), Query::equal('trigger', ['manual']),
Query::equal("type", ["deployment"]), Query::equal("type", ["deployment"]),
Query::equal("deploymentResourceType", ["site"]), Query::equal("deploymentResourceType", ["site"]),
Query::equal("deploymentResourceInternalId", [$site->getInternalId()]), Query::equal("deploymentResourceInternalId", [$site->getInternalId()]),
Query::equal("deploymentVcsProviderBranch", [""]),
]; ];
if (empty($oldDeploymentInternalId)) {
$queries[] = Query::equal("deploymentInternalId", [""]);
} else {
$queries[] = Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
}
$this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) { $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) {
$rule = $rule $rule = $rule
->setAttribute('deploymentId', $deployment->getId()) ->setAttribute('deploymentId', $deployment->getId())