Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 08:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch '1.7.x' into update-tokens

Browse source
This commit is contained in:
Darshan 2025-05-13 21:21:22 +05:30 committed by GitHub
commit 28f404147b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php
View file

@ -104,7 +104,6 @@ class Create extends Action
'totalSize' => $deployment->getAttribute('sourceSize', 0),
'entrypoint' => $function->getAttribute('entrypoint'),
'buildCommands' => $function->getAttribute('commands', ''),
'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
'buildStartedAt' => null,
'buildEndedAt' => null,
'buildDuration' => null,

1
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php
View file

@ -147,7 +147,6 @@ class Create extends Base
'entrypoint' => $function->getAttribute('entrypoint', ''),
'buildCommands' => $function->getAttribute('commands', ''),
'type' => 'manual',
'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint', '')]),
'activate' => $activate,
]));

2
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
View file

@ -120,7 +120,6 @@ class Create extends Action
'buildOutput' => $site->getAttribute('outputDirectory', ''),
'adapter' => $site->getAttribute('adapter', ''),
'fallbackFile' => $site->getAttribute('fallbackFile', ''),
'search' => implode(' ', [$deploymentId]),
'screenshotLight' => '',
'screenshotDark' => '',
'buildStartedAt' => null,
@ -162,7 +161,6 @@ class Create extends Action
'deploymentResourceInternalId' => $site->getInternalId(),
'status' => 'verified',
'certificateId' => '',
'search' => implode(' ', [$ruleId, $domain]),
'owner' => 'Appwrite',
'region' => $project->getAttribute('region')
]))

2
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
View file

@ -160,7 +160,6 @@ class Create extends Base
'adapter' => $site->getAttribute('adapter', ''),
'fallbackFile' => $site->getAttribute('fallbackFile', ''),
'type' => 'manual',
'search' => implode(' ', [$deploymentId]),
'activate' => $activate,
]));
@ -192,7 +191,6 @@ class Create extends Base
'deploymentResourceInternalId' => $site->getInternalId(),
'status' => 'verified',
'certificateId' => '',
'search' => implode(' ', [$ruleId, $domain]),
'owner' => 'Appwrite',
'region' => $project->getAttribute('region')
]))

13
tests/e2e/Services/Functions/FunctionsCustomServerTest.php
View file

@ -396,7 +396,7 @@ class FunctionsCustomServerTest extends Scope
$deployment = $this->createTemplateDeployment(
$functionId,
[
'functionId' => ID::unique(),
'resourceId' => ID::unique(),
'activate' => true,
'repository' => $starterTemplate['body']['providerRepositoryId'],
'owner' => $starterTemplate['body']['providerOwner'],
@ -728,18 +728,13 @@ class FunctionsCustomServerTest extends Scope
],
]);
$this->assertEquals($deployments['headers']['status-code'], 200);
$this->assertEquals(200, $deployments['headers']['status-code']);
$this->assertCount(2, $deployments['body']['deployments']);
$deployments = $this->listDeployments($functionId, [
'search' => 'php-8.0'
]);
$deployments = $this->listDeployments($functionId);
$this->assertEquals($deployments['headers']['status-code'], 200);
$this->assertEquals(3, $deployments['body']['total']);
$this->assertIsArray($deployments['body']['deployments']);
$this->assertCount(3, $deployments['body']['deployments']);
$this->assertEquals($deployments['body']['deployments'][0]['$id'], $data['deploymentId']);
$this->assertEquals(200, $deployments['headers']['status-code']);
$deployments = $this->listDeployments(
$functionId,

9
tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
View file

@ -4454,13 +4454,12 @@ class ProjectsConsoleClientTest extends Scope
$response = $this->client->call(Client::METHOD_GET, '/projects/' . $projectId . '/dev-keys', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'search' => 'Dev'
]);
], $this->getHeaders()));
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals(1, $response['body']['total']);
$this->assertEquals('Dev Key Test', $response['body']['devKeys'][0]['name']);
$this->assertEquals(2, $response['body']['total']);
$this->assertEquals('Key Test', $response['body']['devKeys'][0]['name']);
$this->assertEquals('Dev Key Test', $response['body']['devKeys'][1]['name']);
/** List dev keys with querying `expire` */
$response = $this->client->call(Client::METHOD_GET, '/projects/' . $projectId . '/dev-keys', array_merge([

4
tests/e2e/Services/Sites/SitesCustomServerTest.php
View file

@ -638,9 +638,7 @@ class SitesCustomServerTest extends Scope
'siteId' => ID::unique()
]);
$sites = $this->listSites([
'search' => $siteId,
]);
$sites = $this->listSites();
$this->assertEquals($sites['headers']['status-code'], 200);
$this->assertCount(1, $sites['body']['sites']);