From 4b31411a5f9a3cb0200bce1c85af67e4d6a23dcb Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 6 Sep 2023 23:04:44 +0000 Subject: [PATCH 1/4] fix: remove public scope from app role --- app/config/roles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/roles.php b/app/config/roles.php index 444b478d2a..04ee7bb29f 100644 --- a/app/config/roles.php +++ b/app/config/roles.php @@ -95,6 +95,6 @@ return [ ], Auth::USER_ROLE_APPS => [ 'label' => 'Applications', - 'scopes' => ['public', 'health.read', 'graphql'], + 'scopes' => ['health.read', 'graphql'], ], ]; From 329889e3172a6a843cf95cd00739934e360a2c19 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 6 Sep 2023 23:15:15 +0000 Subject: [PATCH 2/4] chore: add runtime versions variable --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 326bd62e00..d9ea0f5ddf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -714,6 +714,7 @@ services: - OPR_EXECUTOR_ENV=$_APP_ENV - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET + - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v3 - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG - OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE From 438e7b66d14ac8b02c89e54b536a99600788183c Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 6 Sep 2023 23:32:42 +0000 Subject: [PATCH 3/4] chore: only fetch required runtimes --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 6ef35b57c1..189095e9e5 100644 --- a/.env +++ b/.env @@ -71,7 +71,7 @@ _APP_FUNCTIONS_MAINTENANCE_INTERVAL=600 _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes _APP_EXECUTOR_SECRET=your-secret-key _APP_EXECUTOR_HOST=http://proxy/v1 -_APP_FUNCTIONS_RUNTIMES= +_APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1 _APP_MAINTENANCE_INTERVAL=86400 _APP_MAINTENANCE_RETENTION_CACHE=2592000 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600 From b9675f736bd3a25db9560e008ae7585666eb0db2 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Wed, 6 Sep 2023 23:32:49 -0400 Subject: [PATCH 4/4] Update src/Appwrite/Migration/Version/V19.php Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com> --- src/Appwrite/Migration/Version/V19.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Migration/Version/V19.php b/src/Appwrite/Migration/Version/V19.php index 0df5b8a4d3..b9ccf3c302 100644 --- a/src/Appwrite/Migration/Version/V19.php +++ b/src/Appwrite/Migration/Version/V19.php @@ -707,7 +707,7 @@ class V19 extends Migration $commands = $this->getFunctionCommands($document); $document->setAttribute('commands', $document->getAttribute('commands', $commands)); - if ($document->getAttribute('schedule') && !$document->getAttribute('scheduleId', null)) { + if (empty($document->getAttribute('scheduleId', null))) { $schedule = $this->consoleDB->createDocument('schedules', new Document([ 'region' => App::getEnv('_APP_REGION', 'default'), // Todo replace with projects region 'resourceType' => 'function',