Merge pull request #9430 from appwrite/updates-projects-regions

Remove default region
2026-05-23 17:08:45 +00:00 · 2025-03-19 22:36:30 +05:30 · 2025-03-19 22:36:30 +05:30 · 2505e25da8
commit 2505e25da8
parent 7d86ce76d8 88d6150db2
8 changed files with 29 additions and 91 deletions
--- a/app/config/regions.php
+++ b/app/config/regions.php
@ -3,72 +3,8 @@
 return [
    'default' => [
        '$id' => 'default',
-        'name' => 'Frankfurt',
+        'name' => 'default',
        'disabled' => false,
-        'flag' => 'de',
-        'default' => true,
-    ],
-    'fra' => [
-        '$id' => 'fra',
-        'name' => 'Frankfurt',
-        'disabled' => false,
-        'flag' => 'de',
-        'default' => true,
-    ],
-    'nyc' => [
-        '$id' => 'nyc',
-        'name' => 'New York',
-        'disabled' => true,
-        'flag' => 'us',
-        'default' => true,
-    ],
-    'sfo' => [
-        '$id' => 'sfo',
-        'name' => 'San Francisco',
-        'disabled' => true,
-        'flag' => 'us',
-        'default' => true,
-    ],
-    'blr' => [
-        '$id' => 'blr',
-        'name' => 'Bengaluru',
-        'disabled' => true,
-        'flag' => 'in',
-        'default' => true,
-    ],
-    'lon' => [
-        '$id' => 'lon',
-        'name' => 'London',
-        'disabled' => true,
-        'flag' => 'gb',
-        'default' => true,
-    ],
-    'ams' => [
-        '$id' => 'ams',
-        'name' => 'Amsterdam',
-        'disabled' => true,
-        'flag' => 'nl',
-        'default' => true,
-    ],
-    'sgp' => [
-        '$id' => 'sgp',
-        'name' => 'Singapore',
-        'disabled' => true,
-        'flag' => 'sg',
-        'default' => true,
-    ],
-    'tor' => [
-        '$id' => 'tor',
-        'name' => 'Toronto',
-        'disabled' => true,
-        'flag' => 'ca',
-        'default' => true,
-    ],
-    'syd' => [
-        '$id' => 'syd',
-        'name' => 'Sydney',
-        'disabled' => true,
-        'flag' => 'au',
        'default' => true,
    ],
 ];
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@ -295,7 +295,7 @@ App::post('/v1/functions')

        $schedule = Authorization::skip(
            fn () => $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'), // Todo replace with projects region
+                'region' => $project->getAttribute('region'),
                'resourceType' => 'function',
                'resourceId' => $function->getId(),
                'resourceInternalId' => $function->getInternalId(),
@ -2079,7 +2079,7 @@ App::post('/v1/functions/:functionId/executions')
                ];

                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                    'resourceType' => ScheduleExecutions::getSupportedResource(),
                    'resourceId' => $execution->getId(),
                    'resourceInternalId' => $execution->getInternalId(),
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@ -2936,7 +2936,7 @@ App::post('/v1/messaging/messages/email')
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
                    'resourceInternalId' => $message->getInternalId(),
@ -3058,7 +3058,7 @@ App::post('/v1/messaging/messages/sms')
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
                    'resourceInternalId' => $message->getInternalId(),
@ -3275,7 +3275,7 @@ App::post('/v1/messaging/messages/push')
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
                    'resourceInternalId' => $message->getInternalId(),
@ -3661,7 +3661,7 @@ App::patch('/v1/messaging/messages/email/:messageId')

        if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
            $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'),
+                'region' => $project->getAttribute('region'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
                'resourceInternalId' => $message->getInternalId(),
@ -3862,7 +3862,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')

        if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
            $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'),
+                'region' => $project->getAttribute('region'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
                'resourceInternalId' => $message->getInternalId(),
@ -4035,7 +4035,7 @@ App::patch('/v1/messaging/messages/push/:messageId')

        if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
            $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'),
+                'region' => $project->getAttribute('region'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
                'resourceInternalId' => $message->getInternalId(),
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@ -164,7 +164,6 @@ $image = $this->getParam('image', '');
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
      - _APP_ASSISTANT_OPENAI_API_KEY
-
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -756,7 +756,7 @@ services:
      - _APP_LOGGING_CONFIG
      - _APP_DATABASE_SHARED_TABLES
      - _APP_STATS_RESOURCES_INTERVAL
-  
+
  appwrite-worker-stats-resources:
    entrypoint: worker-stats-resources
    <<: *x-logging
@ -787,7 +787,7 @@ services:
      - _APP_LOGGING_CONFIG
      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_DATABASE_SHARED_TABLES
-  
+
  appwrite-worker-stats-usage:
    entrypoint: worker-stats-usage
    <<: *x-logging
@ -850,7 +850,7 @@ services:
      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_DATABASE_SHARED_TABLES
      - _APP_STATS_USAGE_DUAL_WRITING_DBS
-  
+
  appwrite-task-scheduler-functions:
    entrypoint: schedule-functions
    <<: *x-logging
--- a/tests/e2e/Scopes/ProjectCustom.php
+++ b/tests/e2e/Scopes/ProjectCustom.php
@ -4,6 +4,7 @@ namespace Tests\E2E\Scopes;

 use Tests\E2E\Client;
 use Utopia\Database\Helpers\ID;
+use Utopia\System\System;

 trait ProjectCustom
 {
@ -42,7 +43,7 @@ trait ProjectCustom
            'x-appwrite-project' => 'console',
        ], [
            'projectId' => ID::unique(),
-            'region' => 'default',
+            'region' => System::getEnv('_APP_REGION', 'default'),
            'name' => 'Demo Project',
            'teamId' => $team['body']['$id'],
            'description' => 'Demo Project Description',
--- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
@ -8,6 +8,7 @@ use Tests\E2E\Scopes\Scope;
 use Tests\E2E\Scopes\SideClient;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Role;
+use Utopia\System\System;

 class FunctionsCustomClientTest extends Scope
 {
@ -111,7 +112,7 @@ class FunctionsCustomClientTest extends Scope
        $this->assertEquals('PHP', $output['APPWRITE_FUNCTION_RUNTIME_NAME']);
        $this->assertEquals('8.0', $output['APPWRITE_FUNCTION_RUNTIME_VERSION']);
        $this->assertEquals(APP_VERSION_STABLE, $output['APPWRITE_VERSION']);
-        $this->assertEquals('default', $output['APPWRITE_REGION']);
+        $this->assertEquals(System::getEnv('_APP_REGION', 'default'), $output['APPWRITE_REGION']);
        $this->assertEquals('', $output['APPWRITE_FUNCTION_EVENT']);
        $this->assertEquals('foobar', $output['APPWRITE_FUNCTION_DATA']);
        $this->assertEquals($this->getUser()['$id'], $output['APPWRITE_FUNCTION_USER_ID']);
@ -221,7 +222,7 @@ class FunctionsCustomClientTest extends Scope
        $this->assertEquals('PHP', $output['APPWRITE_FUNCTION_RUNTIME_NAME']);
        $this->assertEquals('8.0', $output['APPWRITE_FUNCTION_RUNTIME_VERSION']);
        $this->assertEquals(APP_VERSION_STABLE, $output['APPWRITE_VERSION']);
-        $this->assertEquals('default', $output['APPWRITE_REGION']);
+        $this->assertEquals(System::getEnv('_APP_REGION', 'default'), $output['APPWRITE_REGION']);
        $this->assertEquals('', $output['APPWRITE_FUNCTION_EVENT']);
        $this->assertEquals('foobar', $output['APPWRITE_FUNCTION_DATA']);
        $this->assertEquals($this->getUser()['$id'], $output['APPWRITE_FUNCTION_USER_ID']);
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@ -14,6 +14,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
+use Utopia\System\System;

 class ProjectsConsoleClientTest extends Scope
 {
@ -49,7 +50,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Project Test',
            'teamId' => $team['body']['$id'],
-            'region' => 'default',
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(201, $response['headers']['status-code']);
@ -89,7 +90,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => '',
            'teamId' => $team['body']['$id'],
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(400, $response['headers']['status-code']);
@ -100,7 +101,7 @@ class ProjectsConsoleClientTest extends Scope
        ], $this->getHeaders()), [
            'projectId' => ID::unique(),
            'name' => 'Project Test',
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(401, $response['headers']['status-code']);
@ -129,7 +130,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => $projectId,
            'name' => 'Project Duplicate',
            'teamId' => $teamId,
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(409, $response['headers']['status-code']);
@ -178,7 +179,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Team 1 Project',
            'teamId' => $team1,
-            'region' => 'default',
+            'region' => System::getEnv('_APP_REGION', 'default'),
        ]);

        $this->assertEquals(201, $response['headers']['status-code']);
@ -277,7 +278,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Project Test 2',
            'teamId' => $team['body']['$id'],
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(201, $response['headers']['status-code']);
@ -2042,7 +2043,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Project Test',
            'teamId' => $team['body']['$id'],
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(201, $project['headers']['status-code']);
@ -2135,7 +2136,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Project Test',
            'teamId' => $team['body']['$id'],
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(201, $project['headers']['status-code']);
@ -3749,7 +3750,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Amazing Project',
            'teamId' => $teamId,
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $this->assertEquals(201, $project['headers']['status-code']);
@ -3820,7 +3821,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Amazing Project 1',
            'teamId' => $teamId,
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $project2 = $this->client->call(Client::METHOD_POST, '/projects', array_merge([
@ -3830,7 +3831,7 @@ class ProjectsConsoleClientTest extends Scope
            'projectId' => ID::unique(),
            'name' => 'Amazing Project 2',
            'teamId' => $teamId,
-            'region' => 'default'
+            'region' => System::getEnv('_APP_REGION', 'default')
        ]);

        $project1Id = $project1['body']['$id'];