Add global env var test

app/controllers/api/functions.php

@@ -927,10 +927,9 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
     ->param('deploymentId', '', new UID(), 'Deployment ID.')
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('project')
     ->inject('events')
     ->inject('dbForConsole')
-    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Document $project, Event $events, Database $dbForConsole) {
+    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Event $events, Database $dbForConsole) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
         $deployment = $dbForProject->getDocument('deployments', $deploymentId);
@@ -990,9 +989,8 @@ App::delete('/v1/functions/:functionId')
     ->inject('dbForProject')
     ->inject('deletes')
     ->inject('events')
-    ->inject('project')
     ->inject('dbForConsole')
-    ->action(function (string $functionId, Response $response, Database $dbForProject, Delete $deletes, Event $events, Document $project, Database $dbForConsole) {
+    ->action(function (string $functionId, Response $response, Database $dbForProject, Delete $deletes, Event $events, Database $dbForConsole) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
 
@@ -1434,11 +1432,9 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
     ->inject('request')
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('dbForConsole')
     ->inject('project')
-    ->inject('gitHub')
     ->inject('events')
-    ->action(function (string $functionId, string $deploymentId, string $buildId, Request $request, Response $response, Database $dbForProject, Database $dbForConsole, Document $project, GitHub $github, Event $events) use ($redeployVcs) {
+    ->action(function (string $functionId, string $deploymentId, string $buildId, Request $request, Response $response, Database $dbForProject, Document $project, Event $events) use ($redeployVcs) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
 
@@ -1901,11 +1897,10 @@ App::post('/v1/functions/:functionId/variables')
     ->param('functionId', '', new UID(), 'Function unique ID.', false)
     ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
     ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
-    ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('dbForConsole')
-    ->action(function (string $functionId, string $key, string $value, Document $project, Response $response, Database $dbForProject, Database $dbForConsole) {
+    ->action(function (string $functionId, string $key, string $value, Response $response, Database $dbForProject, Database $dbForConsole) {
         $function = $dbForProject->getDocument('functions', $functionId);
 
         if ($function->isEmpty()) {
@@ -1934,7 +1929,6 @@ App::post('/v1/functions/:functionId/variables')
         } catch (DuplicateException $th) {
             throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
         }
-        $dbForConsole->deleteCachedDocument('projects', $project->getId());
 
         $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
 
@@ -2036,11 +2030,10 @@ App::put('/v1/functions/:functionId/variables/:variableId')
     ->param('variableId', '', new UID(), 'Variable unique ID.', false)
     ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
     ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
-    ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('dbForConsole')
-    ->action(function (string $functionId, string $variableId, string $key, ?string $value, Document $project, Response $response, Database $dbForProject, Database $dbForConsole) {
+    ->action(function (string $functionId, string $variableId, string $key, ?string $value, Response $response, Database $dbForProject, Database $dbForConsole) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
 
@@ -2067,7 +2060,6 @@ App::put('/v1/functions/:functionId/variables/:variableId')
         } catch (DuplicateException $th) {
             throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
         }
-        $dbForConsole->deleteCachedDocument('projects', $project->getId());
 
         $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
 
@@ -2098,11 +2090,10 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('functionId', '', new UID(), 'Function unique ID.', false)
     ->param('variableId', '', new UID(), 'Variable unique ID.', false)
-    ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('dbForConsole')
-    ->action(function (string $functionId, string $variableId, Document $project, Response $response, Database $dbForProject, Database $dbForConsole) {
+    ->action(function (string $functionId, string $variableId, Response $response, Database $dbForProject, Database $dbForConsole) {
         $function = $dbForProject->getDocument('functions', $functionId);
 
         if ($function->isEmpty()) {

app/controllers/api/project.php

@@ -161,7 +161,6 @@ App::post('/v1/project/variables')
         } catch (DuplicateException $th) {
             throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
         }
-        $dbForConsole->deleteCachedDocument('projects', $project->getId());
 
         $functions = $dbForProject->find('functions', [
             Query::limit(APP_LIMIT_SUBQUERY)
@@ -169,10 +168,9 @@ App::post('/v1/project/variables')
 
         foreach ($functions as $function) {
             $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+            $dbForProject->deleteCachedDocument('functions', $function->getId());
         }
 
-        $dbForProject->deleteCachedDocument('projects', $project->getId());
-
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($variable, Response::MODEL_VARIABLE);
@@ -261,7 +259,6 @@ App::put('/v1/project/variables/:variableId')
         } catch (DuplicateException $th) {
             throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
         }
-        $dbForConsole->deleteCachedDocument('projects', $project->getId());
 
         $functions = $dbForProject->find('functions', [
             Query::limit(APP_LIMIT_SUBQUERY)
@@ -269,10 +266,9 @@ App::put('/v1/project/variables/:variableId')
 
         foreach ($functions as $function) {
             $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+            $dbForProject->deleteCachedDocument('functions', $function->getId());
         }
 
-        $dbForProject->deleteCachedDocument('projects', $project->getId());
-
         $response->dynamic($variable, Response::MODEL_VARIABLE);
     });
 
@@ -296,16 +292,16 @@ App::delete('/v1/project/variables/:variableId')
             throw new Exception(Exception::VARIABLE_NOT_FOUND);
         }
 
+        $dbForProject->deleteDocument('variables', $variable->getId());
+
         $functions = $dbForProject->find('functions', [
             Query::limit(APP_LIMIT_SUBQUERY)
         ]);
 
         foreach ($functions as $function) {
             $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+            $dbForProject->deleteCachedDocument('functions', $function->getId());
         }
 
-        $dbForProject->deleteDocument('variables', $variable->getId());
-        $dbForProject->deleteCachedDocument('projects', $project->getId());
-
         $response->noContent();
     });

tests/e2e/Services/Functions/FunctionsCustomServerTest.php

@@ -343,6 +343,24 @@ class FunctionsCustomServerTest extends Scope
         $this->assertEquals('0 0 1 1 *', $response1['body']['schedule']);
         $this->assertEquals(15, $response1['body']['timeout']);
 
+        /**
+         * Create global variable to test in execution later
+         */
+        $headers = [
+            'content-type' => 'application/json',
+            'origin' => 'http://localhost',
+            'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-mode' => 'admin',
+        ];
+
+         $variable = $this->client->call(Client::METHOD_POST, '/project/variables', $headers, [
+            'key' => 'GLOBAL_VARIABLE',
+            'value' => 'Global Variable Value',
+         ]);
+
+        $this->assertEquals(201, $variable['headers']['status-code']);
+
         /**
          * Test for FAILURE
          */
@@ -640,6 +658,7 @@ class FunctionsCustomServerTest extends Scope
         $this->assertStringContainsString('http', $execution['body']['responseBody']);
         $this->assertStringContainsString('PHP', $execution['body']['responseBody']);
         $this->assertStringContainsString('8.0', $execution['body']['responseBody']);
+        $this->assertStringContainsString('Global Variable Value', $execution['body']['responseBody']);
         // $this->assertStringContainsString('êä', $execution['body']['responseBody']); // tests unknown utf-8 chars
         $this->assertEquals('', $execution['body']['errors']);
         $this->assertEquals('', $execution['body']['logs']);

tests/resources/functions/php/index.php

@@ -8,6 +8,7 @@ return function ($context) {
         'APPWRITE_FUNCTION_TRIGGER' => $context->req->headers['x-appwrite-trigger'] ?? '',
         'APPWRITE_FUNCTION_RUNTIME_NAME' => \getenv('APPWRITE_FUNCTION_RUNTIME_NAME') ?: '',
         'APPWRITE_FUNCTION_RUNTIME_VERSION' => \getenv('APPWRITE_FUNCTION_RUNTIME_VERSION') ?: '',
-        'UNICODE_TEST' => "êä"
+        'UNICODE_TEST' => "êä",
+        'GLOBAL_VARIABLE' => \getenv('GLOBAL_VARIABLE') ?: ''
     ]);
 };