mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge branch 'main' into test/sites-start-command-not-exposed
This commit is contained in:
20 files changed
+294
-61
No files matched your search
@@ -839,6 +839,11 @@ return [
|
||||
'description' => 'Document with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
|
||||
'code' => 409,
|
||||
],
|
||||
Exception::DOCUMENT_UNIQUE_CONSTRAINT_VIOLATION => [
|
||||
'name' => Exception::DOCUMENT_UNIQUE_CONSTRAINT_VIOLATION,
|
||||
'description' => 'Document violates a unique attribute constraint. Try again with different value(s).',
|
||||
'code' => 409,
|
||||
],
|
||||
Exception::DOCUMENT_UPDATE_CONFLICT => [
|
||||
'name' => Exception::DOCUMENT_UPDATE_CONFLICT,
|
||||
'description' => 'Remote document is newer than local.',
|
||||
@@ -876,6 +881,11 @@ return [
|
||||
'description' => 'Row with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
|
||||
'code' => 409,
|
||||
],
|
||||
Exception::ROW_UNIQUE_CONSTRAINT_VIOLATION => [
|
||||
'name' => Exception::ROW_UNIQUE_CONSTRAINT_VIOLATION,
|
||||
'description' => 'Row violates a unique column constraint. Try again with different value(s).',
|
||||
'code' => 409,
|
||||
],
|
||||
Exception::ROW_UPDATE_CONFLICT => [
|
||||
'name' => Exception::ROW_UPDATE_CONFLICT,
|
||||
'description' => 'Remote row is newer than local.',
|
||||
|
||||
Generated
+12
-12
@@ -3638,16 +3638,16 @@
|
||||
},
|
||||
{
|
||||
"name": "utopia-php/database",
|
||||
"version": "7.1.4",
|
||||
"version": "7.2.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/utopia-php/database.git",
|
||||
"reference": "b2b136a3827ccee2ea4eb83626348db4992286e1"
|
||||
"reference": "38181c98e23b28c753f35cba6f03086a37033389"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/utopia-php/database/zipball/b2b136a3827ccee2ea4eb83626348db4992286e1",
|
||||
"reference": "b2b136a3827ccee2ea4eb83626348db4992286e1",
|
||||
"url": "https://api.github.com/repos/utopia-php/database/zipball/38181c98e23b28c753f35cba6f03086a37033389",
|
||||
"reference": "38181c98e23b28c753f35cba6f03086a37033389",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3692,9 +3692,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/utopia-php/database/issues",
|
||||
"source": "https://github.com/utopia-php/database/tree/7.1.4"
|
||||
"source": "https://github.com/utopia-php/database/tree/7.2.1"
|
||||
},
|
||||
"time": "2026-08-12T09:39:29+00:00"
|
||||
"time": "2026-08-13T02:26:08+00:00"
|
||||
},
|
||||
{
|
||||
"name": "utopia-php/detector",
|
||||
@@ -4416,16 +4416,16 @@
|
||||
},
|
||||
{
|
||||
"name": "utopia-php/mongo",
|
||||
"version": "1.5.2",
|
||||
"version": "1.5.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/utopia-php/mongo.git",
|
||||
"reference": "20f9a644a356599fdd6265ba48696fc42a1f1881"
|
||||
"reference": "be29ee2d84b9f7efdfc6fea5b4b2d4bf95ff5ec4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/utopia-php/mongo/zipball/20f9a644a356599fdd6265ba48696fc42a1f1881",
|
||||
"reference": "20f9a644a356599fdd6265ba48696fc42a1f1881",
|
||||
"url": "https://api.github.com/repos/utopia-php/mongo/zipball/be29ee2d84b9f7efdfc6fea5b4b2d4bf95ff5ec4",
|
||||
"reference": "be29ee2d84b9f7efdfc6fea5b4b2d4bf95ff5ec4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4471,9 +4471,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/utopia-php/mongo/issues",
|
||||
"source": "https://github.com/utopia-php/mongo/tree/1.5.2"
|
||||
"source": "https://github.com/utopia-php/mongo/tree/1.5.3"
|
||||
},
|
||||
"time": "2026-08-12T06:57:25+00:00"
|
||||
"time": "2026-08-13T01:55:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "utopia-php/platform",
|
||||
|
||||
@@ -232,6 +232,7 @@ class Exception extends \Exception
|
||||
public const string DOCUMENT_MISSING_DATA = 'document_missing_data';
|
||||
public const string DOCUMENT_MISSING_PAYLOAD = 'document_missing_payload';
|
||||
public const string DOCUMENT_ALREADY_EXISTS = 'document_already_exists';
|
||||
public const string DOCUMENT_UNIQUE_CONSTRAINT_VIOLATION = 'document_unique_constraint_violation';
|
||||
public const string DOCUMENT_UPDATE_CONFLICT = 'document_update_conflict';
|
||||
public const string DOCUMENT_DELETE_RESTRICTED = 'document_delete_restricted';
|
||||
|
||||
@@ -241,6 +242,7 @@ class Exception extends \Exception
|
||||
public const string ROW_MISSING_DATA = 'row_missing_data';
|
||||
public const string ROW_MISSING_PAYLOAD = 'row_missing_payload';
|
||||
public const string ROW_ALREADY_EXISTS = 'row_already_exists';
|
||||
public const string ROW_UNIQUE_CONSTRAINT_VIOLATION = 'row_unique_constraint_violation';
|
||||
public const string ROW_UPDATE_CONFLICT = 'row_update_conflict';
|
||||
public const string ROW_DELETE_RESTRICTED = 'row_delete_restricted';
|
||||
|
||||
|
||||
+10
@@ -164,6 +164,16 @@ abstract class Action extends DatabasesAction
|
||||
: Exception::ROW_ALREADY_EXISTS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the appropriate unique constraint exception.
|
||||
*/
|
||||
protected function getUniqueConstraintException(): string
|
||||
{
|
||||
return $this->isCollectionsAPI()
|
||||
? Exception::DOCUMENT_UNIQUE_CONSTRAINT_VIOLATION
|
||||
: Exception::ROW_UNIQUE_CONSTRAINT_VIOLATION;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the appropriate conflict exception.
|
||||
*/
|
||||
|
||||
+8
-4
@@ -20,6 +20,7 @@ use Utopia\Database\Exception\Conflict as ConflictException;
|
||||
use Utopia\Database\Exception\Duplicate as DuplicateException;
|
||||
use Utopia\Database\Exception\Relationship as RelationshipException;
|
||||
use Utopia\Database\Exception\Structure as StructureException;
|
||||
use Utopia\Database\Exception\Unique as UniqueException;
|
||||
use Utopia\Database\Helpers\ID;
|
||||
use Utopia\Database\Validator\UID;
|
||||
use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
|
||||
@@ -170,12 +171,13 @@ class Upsert extends Action
|
||||
}
|
||||
|
||||
$dbForDatabases = $getDatabasesDB($database);
|
||||
$collectionTableId = 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence();
|
||||
$upserted = [];
|
||||
|
||||
try {
|
||||
$modified = $dbForDatabases->withPreserveDates(function () use ($dbForDatabases, $database, $collection, $documents, $plan, &$upserted) {
|
||||
$modified = $dbForDatabases->withPreserveDates(function () use ($dbForDatabases, $collectionTableId, $documents, $plan, &$upserted) {
|
||||
return $dbForDatabases->upsertDocuments(
|
||||
'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(),
|
||||
$collectionTableId,
|
||||
$documents,
|
||||
onNext: function (Document $document) use ($plan, &$upserted) {
|
||||
if (\count($upserted) < ($plan['databasesBatchSize'] ?? APP_LIMIT_DATABASE_BATCH)) {
|
||||
@@ -186,8 +188,10 @@ class Upsert extends Action
|
||||
});
|
||||
} catch (ConflictException) {
|
||||
throw new Exception($this->getConflictException());
|
||||
} catch (DuplicateException) {
|
||||
throw new Exception($this->getDuplicateException(), params: ['multiple']);
|
||||
} catch (UniqueException $e) {
|
||||
throw new Exception($this->getUniqueConstraintException(), previous: $e);
|
||||
} catch (DuplicateException $e) {
|
||||
throw new Exception($this->getDuplicateException(), previous: $e, params: ['multiple']);
|
||||
} catch (RelationshipException $e) {
|
||||
throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
|
||||
} catch (StructureException $e) {
|
||||
|
||||
+8
-4
@@ -22,6 +22,7 @@ use Utopia\Database\Exception\Duplicate as DuplicateException;
|
||||
use Utopia\Database\Exception\NotFound as NotFoundException;
|
||||
use Utopia\Database\Exception\Relationship as RelationshipException;
|
||||
use Utopia\Database\Exception\Structure as StructureException;
|
||||
use Utopia\Database\Exception\Unique as UniqueException;
|
||||
use Utopia\Database\Helpers\ID;
|
||||
use Utopia\Database\Helpers\Permission;
|
||||
use Utopia\Database\Helpers\Role;
|
||||
@@ -463,12 +464,13 @@ class Create extends Action
|
||||
}
|
||||
|
||||
$dbForDatabases = $getDatabasesDB($database);
|
||||
$collectionTableId = 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence();
|
||||
try {
|
||||
$created = [];
|
||||
$dbForDatabases->withPreserveDates(
|
||||
function () use (&$created, $dbForDatabases, $database, $collection, $documents) {
|
||||
function () use (&$created, $dbForDatabases, $collectionTableId, $documents) {
|
||||
$dbForDatabases->createDocuments(
|
||||
'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(),
|
||||
$collectionTableId,
|
||||
$documents,
|
||||
onNext: function ($doc) use (&$created) {
|
||||
$created[] = $doc;
|
||||
@@ -476,8 +478,10 @@ class Create extends Action
|
||||
);
|
||||
}
|
||||
);
|
||||
} catch (DuplicateException) {
|
||||
throw new Exception($this->getDuplicateException(), params: [$documentId]);
|
||||
} catch (UniqueException $e) {
|
||||
throw new Exception($this->getUniqueConstraintException(), previous: $e);
|
||||
} catch (DuplicateException $e) {
|
||||
throw new Exception($this->getDuplicateException(), previous: $e, params: [$documentId]);
|
||||
} catch (NotFoundException) {
|
||||
throw new Exception($this->getParentNotFoundException(), params: [$collectionId]);
|
||||
} catch (RelationshipException $e) {
|
||||
|
||||
+6
-3
@@ -19,6 +19,7 @@ use Utopia\Database\Exception\Conflict as ConflictException;
|
||||
use Utopia\Database\Exception\Duplicate as DuplicateException;
|
||||
use Utopia\Database\Exception\Relationship as RelationshipException;
|
||||
use Utopia\Database\Exception\Structure as StructureException;
|
||||
use Utopia\Database\Exception\Unique as UniqueException;
|
||||
use Utopia\Database\Helpers\ID;
|
||||
use Utopia\Database\Helpers\Permission;
|
||||
use Utopia\Database\Helpers\Role;
|
||||
@@ -326,15 +327,17 @@ class Update extends Action
|
||||
$document = $dbForDatabases->withRequestTimestamp(
|
||||
$requestTimestamp,
|
||||
fn () => $dbForDatabases->withPreserveDates(fn () => $dbForDatabases->updateDocument(
|
||||
'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(),
|
||||
$collectionTableId,
|
||||
$document->getId(),
|
||||
$newDocument
|
||||
))
|
||||
);
|
||||
} catch (ConflictException) {
|
||||
throw new Exception($this->getConflictException());
|
||||
} catch (DuplicateException) {
|
||||
throw new Exception($this->getDuplicateException(), params: [$documentId]);
|
||||
} catch (UniqueException $e) {
|
||||
throw new Exception($this->getUniqueConstraintException(), previous: $e);
|
||||
} catch (DuplicateException $e) {
|
||||
throw new Exception($this->getDuplicateException(), previous: $e, params: [$documentId]);
|
||||
} catch (RelationshipException $e) {
|
||||
throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
|
||||
} catch (StructureException $e) {
|
||||
|
||||
+7
-4
@@ -20,6 +20,7 @@ use Utopia\Database\Exception\Conflict as ConflictException;
|
||||
use Utopia\Database\Exception\Duplicate as DuplicateException;
|
||||
use Utopia\Database\Exception\Relationship as RelationshipException;
|
||||
use Utopia\Database\Exception\Structure as StructureException;
|
||||
use Utopia\Database\Exception\Unique as UniqueException;
|
||||
use Utopia\Database\Helpers\ID;
|
||||
use Utopia\Database\Helpers\Permission;
|
||||
use Utopia\Database\Helpers\Role;
|
||||
@@ -329,9 +330,9 @@ class Upsert extends Action
|
||||
|
||||
$upserted = [];
|
||||
try {
|
||||
$dbForDatabases->withPreserveDates(function () use (&$upserted, $dbForDatabases, $database, $collection, $newDocument) {
|
||||
$dbForDatabases->withPreserveDates(function () use (&$upserted, $dbForDatabases, $collectionTableId, $newDocument) {
|
||||
return $dbForDatabases->upsertDocuments(
|
||||
'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(),
|
||||
$collectionTableId,
|
||||
[$newDocument],
|
||||
onNext: function (Document $document) use (&$upserted) {
|
||||
$upserted[] = $document;
|
||||
@@ -340,8 +341,10 @@ class Upsert extends Action
|
||||
});
|
||||
} catch (ConflictException) {
|
||||
throw new Exception($this->getConflictException());
|
||||
} catch (DuplicateException) {
|
||||
throw new Exception($this->getDuplicateException(), params: [$documentId]);
|
||||
} catch (UniqueException $e) {
|
||||
throw new Exception($this->getUniqueConstraintException(), previous: $e);
|
||||
} catch (DuplicateException $e) {
|
||||
throw new Exception($this->getDuplicateException(), previous: $e, params: [$documentId]);
|
||||
} catch (RelationshipException $e) {
|
||||
throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, $e->getMessage());
|
||||
} catch (StructureException $e) {
|
||||
|
||||
@@ -87,7 +87,12 @@ class Delete extends Action
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
|
||||
$resourceType = $deployment->getAttribute('resourceType');
|
||||
// Untyped deployments predate Sites and belong to Functions.
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $function->getId()
|
||||
|| ($resourceType !== 'functions' && !empty($resourceType))
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,12 @@ class Get extends Action
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
|
||||
$resourceType = $deployment->getAttribute('resourceType');
|
||||
// Untyped deployments predate Sites and belong to Functions.
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $function->getId()
|
||||
|| ($resourceType !== 'functions' && !empty($resourceType))
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -71,7 +71,12 @@ class Get extends Action
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
|
||||
$resourceType = $deployment->getAttribute('resourceType');
|
||||
// Untyped deployments predate Sites and belong to Functions.
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $function->getId()
|
||||
|| ($resourceType !== 'functions' && !empty($resourceType))
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -88,7 +88,12 @@ class Update extends Base
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $function->getId()) {
|
||||
$resourceType = $deployment->getAttribute('resourceType');
|
||||
// Untyped deployments predate Sites and belong to Functions.
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $function->getId()
|
||||
|| ($resourceType !== 'functions' && !empty($resourceType))
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -87,7 +87,10 @@ class Delete extends Action
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $site->getId()
|
||||
|| $deployment->getAttribute('resourceType') !== 'sites'
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -110,7 +110,10 @@ class Get extends Action
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $site->getId()
|
||||
|| $deployment->getAttribute('resourceType') !== 'sites'
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +67,10 @@ class Get extends Action
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $site->getId()
|
||||
|| $deployment->getAttribute('resourceType') !== 'sites'
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,10 @@ class Update extends Base
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
if ($deployment->getAttribute('resourceId') !== $site->getId()) {
|
||||
if (
|
||||
$deployment->getAttribute('resourceId') !== $site->getId()
|
||||
|| $deployment->getAttribute('resourceType') !== 'sites'
|
||||
) {
|
||||
throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
@@ -343,9 +343,12 @@ abstract class Scope extends TestCase
|
||||
}
|
||||
|
||||
$query = http_build_query($queryParams);
|
||||
$url = 'http://' . $hostname . ':5000/__find_request__?' . $query;
|
||||
|
||||
for ($attempt = 0; $attempt <= $maxAttempts; $attempt++) {
|
||||
$response = @file_get_contents($url);
|
||||
$requests = is_string($response) ? json_decode($response, true) : [];
|
||||
|
||||
for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
|
||||
$requests = json_decode(file_get_contents('http://' . $hostname . ':5000/__find_request__?' . $query), true);
|
||||
if (is_array($requests)) {
|
||||
for ($i = count($requests) - 1; $i >= 0; $i--) {
|
||||
$request = $this->decodeRequestData($requests[$i]);
|
||||
@@ -369,30 +372,8 @@ abstract class Scope extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
usleep($delayMs * 1000);
|
||||
}
|
||||
|
||||
$requests = json_decode(file_get_contents('http://' . $hostname . ':5000/__find_request__?' . $query), true);
|
||||
if (is_array($requests)) {
|
||||
for ($i = count($requests) - 1; $i >= 0; $i--) {
|
||||
$request = $this->decodeRequestData($requests[$i]);
|
||||
if ($probe !== null) {
|
||||
try {
|
||||
$probe($request);
|
||||
return $request;
|
||||
} catch (\Throwable $error) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if ($enforceProjectId) {
|
||||
$requestProjectId = $request['headers']['X-Appwrite-Webhook-Project-Id'] ?? '';
|
||||
if ($requestProjectId === $projectId) {
|
||||
return $request;
|
||||
}
|
||||
} else {
|
||||
return $request;
|
||||
}
|
||||
if ($attempt < $maxAttempts) {
|
||||
usleep($delayMs * 1000);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6262,6 +6262,8 @@ trait DatabasesBase
|
||||
]);
|
||||
|
||||
$this->assertEquals(409, $duplicate['headers']['status-code']);
|
||||
$this->assertEquals($this->getUniqueConstraintException(), $duplicate['body']['type']);
|
||||
$this->assertStringNotContainsString('requested ID', $duplicate['body']['message']);
|
||||
|
||||
// Test for exception when inserting new doc and then updating to conflict
|
||||
$document = $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $collectionId), array_merge([
|
||||
@@ -6298,6 +6300,16 @@ trait DatabasesBase
|
||||
]);
|
||||
|
||||
$this->assertEquals(409, $duplicate['headers']['status-code']);
|
||||
$this->assertEquals($this->getUniqueConstraintException(), $duplicate['body']['type']);
|
||||
$this->assertStringNotContainsString('requested ID', $duplicate['body']['message']);
|
||||
|
||||
}
|
||||
|
||||
private function getUniqueConstraintException(): string
|
||||
{
|
||||
return $this->getRecordResource() === 'rows'
|
||||
? Exception::ROW_UNIQUE_CONSTRAINT_VIOLATION
|
||||
: Exception::DOCUMENT_UNIQUE_CONSTRAINT_VIOLATION;
|
||||
}
|
||||
|
||||
public function testPersistentCreatedAt(): void
|
||||
|
||||
@@ -1391,6 +1391,92 @@ final class FunctionsCustomServerTest extends Scope
|
||||
$this->cleanupFunction($otherFunctionId);
|
||||
}
|
||||
|
||||
public function testDeploymentEndpointsRequireMatchingResourceType(): void
|
||||
{
|
||||
$sharedId = ID::unique();
|
||||
|
||||
$functionId = $this->setupFunction([
|
||||
'functionId' => $sharedId,
|
||||
'name' => 'Resource type function',
|
||||
'runtime' => 'node-22',
|
||||
'entrypoint' => 'index.js',
|
||||
'execute' => [Role::any()->toString()],
|
||||
]);
|
||||
|
||||
$site = $this->client->call(Client::METHOD_POST, '/sites', [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
], [
|
||||
'siteId' => $sharedId,
|
||||
'name' => 'Resource type site',
|
||||
'framework' => 'other',
|
||||
'buildRuntime' => 'node-22',
|
||||
'outputDirectory' => './',
|
||||
'providerBranch' => 'main',
|
||||
'providerRootDirectory' => './',
|
||||
'fallbackFile' => '',
|
||||
]);
|
||||
$this->assertEquals(201, $site['headers']['status-code']);
|
||||
|
||||
$deployment = $this->createDeployment($functionId, [
|
||||
'code' => $this->packageFunction('basic'),
|
||||
'activate' => 'false',
|
||||
'entrypoint' => 'index.js',
|
||||
]);
|
||||
$this->assertEquals(202, $deployment['headers']['status-code']);
|
||||
$deploymentId = $deployment['body']['$id'] ?? '';
|
||||
|
||||
$this->assertEventually(function () use ($functionId, $deploymentId) {
|
||||
$deployment = $this->getDeployment($functionId, $deploymentId);
|
||||
$this->assertEquals('ready', $deployment['body']['status']);
|
||||
}, 120000, 500);
|
||||
|
||||
/**
|
||||
* Test for FAILURE — a site that shares the function custom ID must not
|
||||
* read or mutate the function deployment (resourceType mismatch).
|
||||
*/
|
||||
$response = $this->client->call(Client::METHOD_GET, '/sites/' . $sharedId . '/deployments/' . $deploymentId, [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
]);
|
||||
$this->assertEquals(404, $response['headers']['status-code']);
|
||||
$this->assertEquals('deployment_not_found', $response['body']['type']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_PATCH, '/sites/' . $sharedId . '/deployment', [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
], [
|
||||
'deploymentId' => $deploymentId,
|
||||
]);
|
||||
$this->assertEquals(404, $response['headers']['status-code']);
|
||||
$this->assertEquals('deployment_not_found', $response['body']['type']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_DELETE, '/sites/' . $sharedId . '/deployments/' . $deploymentId, [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
]);
|
||||
$this->assertEquals(404, $response['headers']['status-code']);
|
||||
$this->assertEquals('deployment_not_found', $response['body']['type']);
|
||||
|
||||
/**
|
||||
* Test for SUCCESS — the owning function path still works.
|
||||
*/
|
||||
$response = $this->getDeployment($functionId, $deploymentId);
|
||||
$this->assertEquals(200, $response['headers']['status-code']);
|
||||
$this->assertEquals($deploymentId, $response['body']['$id']);
|
||||
|
||||
$this->client->call(Client::METHOD_DELETE, '/sites/' . $sharedId, [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
]);
|
||||
$this->cleanupFunction($functionId);
|
||||
}
|
||||
|
||||
public function testCreateDuplicateDeploymentRequiresOwnership(): void
|
||||
{
|
||||
$data = $this->setupTestDeployment();
|
||||
|
||||
@@ -1619,6 +1619,92 @@ final class SitesCustomServerTest extends Scope
|
||||
$this->cleanupSite($siteId);
|
||||
}
|
||||
|
||||
public function testDeploymentEndpointsRequireMatchingResourceType(): void
|
||||
{
|
||||
$sharedId = ID::unique();
|
||||
|
||||
$siteId = $this->setupSite([
|
||||
'buildRuntime' => 'node-22',
|
||||
'fallbackFile' => '',
|
||||
'framework' => 'other',
|
||||
'name' => 'Resource type site',
|
||||
'outputDirectory' => './',
|
||||
'providerBranch' => 'main',
|
||||
'providerRootDirectory' => './',
|
||||
'siteId' => $sharedId,
|
||||
]);
|
||||
|
||||
$function = $this->client->call(Client::METHOD_POST, '/functions', [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
], [
|
||||
'functionId' => $sharedId,
|
||||
'name' => 'Resource type function',
|
||||
'runtime' => 'node-22',
|
||||
'entrypoint' => 'index.js',
|
||||
'execute' => ['any'],
|
||||
]);
|
||||
$this->assertEquals(201, $function['headers']['status-code']);
|
||||
|
||||
$deployment = $this->createDeployment($siteId, [
|
||||
'code' => $this->packageSite('static-single-file'),
|
||||
'activate' => 'false',
|
||||
]);
|
||||
$this->assertEquals(202, $deployment['headers']['status-code']);
|
||||
$deploymentId = $deployment['body']['$id'] ?? '';
|
||||
|
||||
$this->assertEventually(function () use ($siteId, $deploymentId) {
|
||||
$deployment = $this->getDeployment($siteId, $deploymentId);
|
||||
$this->assertEquals('ready', $deployment['body']['status']);
|
||||
}, 120000, 500);
|
||||
|
||||
/**
|
||||
* Test for FAILURE — a function that shares the site custom ID must not
|
||||
* read or mutate the site deployment (resourceType mismatch).
|
||||
*/
|
||||
$response = $this->client->call(Client::METHOD_GET, '/functions/' . $sharedId . '/deployments/' . $deploymentId, [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
]);
|
||||
$this->assertEquals(404, $response['headers']['status-code']);
|
||||
$this->assertEquals('deployment_not_found', $response['body']['type']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_PATCH, '/functions/' . $sharedId . '/deployment', [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
], [
|
||||
'deploymentId' => $deploymentId,
|
||||
]);
|
||||
$this->assertEquals(404, $response['headers']['status-code']);
|
||||
$this->assertEquals('deployment_not_found', $response['body']['type']);
|
||||
|
||||
$response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $sharedId . '/deployments/' . $deploymentId, [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
]);
|
||||
$this->assertEquals(404, $response['headers']['status-code']);
|
||||
$this->assertEquals('deployment_not_found', $response['body']['type']);
|
||||
|
||||
/**
|
||||
* Test for SUCCESS — the owning site path still works.
|
||||
*/
|
||||
$response = $this->getDeployment($siteId, $deploymentId);
|
||||
$this->assertEquals(200, $response['headers']['status-code']);
|
||||
$this->assertEquals($deploymentId, $response['body']['$id']);
|
||||
|
||||
$this->client->call(Client::METHOD_DELETE, '/functions/' . $sharedId, [
|
||||
'content-type' => 'application/json',
|
||||
'x-appwrite-project' => $this->getProject()['$id'],
|
||||
'x-appwrite-key' => $this->getProject()['apiKey'],
|
||||
]);
|
||||
$this->cleanupDeployment($siteId, $deploymentId);
|
||||
$this->cleanupSite($siteId);
|
||||
}
|
||||
|
||||
public function testCreateDuplicateDeploymentRequiresOwnership(): void
|
||||
{
|
||||
$siteId = $this->setupSite([
|
||||
|
||||
Reference in new issue
Block a user