diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index 8932225b5c..0324218497 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -435,13 +435,12 @@ App::post('/v1/functions/:functionId/tags') ->label('sdk.response.model', Response::MODEL_TAG) ->param('functionId', '', new UID(), 'Function unique ID.') ->param('command', '', new Text('1028'), 'Code execution command.') - ->param('code', [], new File(), 'Gzip file containing your code.', false) - // ->param('code', '', new Text(128), 'Code package. Use the '.APP_NAME.' code packager to create a deployable package file.') + ->param('file', null, new File(), 'Gzip file with your code package.', false) ->inject('request') ->inject('response') ->inject('projectDB') ->inject('usage') - ->action(function ($functionId, $command, $code, $request, $response, $projectDB, $usage) { + ->action(function ($functionId, $command, $file, $request, $response, $projectDB, $usage) { /** @var Utopia\Swoole\Request $request */ /** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Database\Database $projectDB */ @@ -453,7 +452,7 @@ App::post('/v1/functions/:functionId/tags') throw new Exception('Function not found', 404); } - $file = $request->getFiles('code'); + $file = $request->getFiles('file'); $device = Storage::getDevice('functions'); $fileExt = new FileExt([FileExt::TYPE_GZIP]); $fileSize = new FileSize(App::getEnv('_APP_STORAGE_LIMIT', 0)); diff --git a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php index 25d3a8237c..04d7a626f6 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php @@ -76,7 +76,7 @@ class FunctionsCustomClientTest extends Scope 'x-appwrite-key' => $this->getProject()['apiKey'], ], [ 'command' => 'php function.php', - 'code' => new CURLFile(realpath(__DIR__ . '/../../../resources/functions/php.tar.gz'), 'application/x-gzip', 'php-fx.tar.gz'), + 'file' => new CURLFile(realpath(__DIR__ . '/../../../resources/functions/php.tar.gz'), 'application/x-gzip', 'php-fx.tar.gz'), ]); $tagId = $tag['body']['$id'] ?? ''; diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 5b15b61ceb..ee3c79642f 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -184,7 +184,7 @@ class FunctionsCustomServerTest extends Scope 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ 'command' => 'php function.php', - 'code' => new CURLFile(realpath(__DIR__ . '/../../../resources/functions/php.tar.gz'), 'application/x-gzip', 'php-fx.tar.gz'), + 'file' => new CURLFile(realpath(__DIR__ . '/../../../resources/functions/php.tar.gz'), 'application/x-gzip', 'php-fx.tar.gz'), ]); $tagId = $tag['body']['$id'] ?? ''; @@ -467,7 +467,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'PHP', 'version' => '7.4', 'name' => 'php-7.4', - 'code' => $functions.'/php.tar.gz', + 'file' => $functions.'/php.tar.gz', 'command' => 'php index.php', 'timeout' => 15, ], @@ -475,7 +475,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'PHP', 'version' => '8.0', 'name' => 'php-8.0', - 'code' => $functions.'/php.tar.gz', + 'file' => $functions.'/php.tar.gz', 'command' => 'php index.php', 'timeout' => 15, ], @@ -483,7 +483,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Python', 'version' => '3.8', 'name' => 'python-3.8', - 'code' => $functions.'/python.tar.gz', + 'file' => $functions.'/python.tar.gz', 'command' => 'python main.py', 'timeout' => 15, ], @@ -491,7 +491,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Node.js', 'version' => '14.5', 'name' => 'node-14.5', - 'code' => $functions.'/node.tar.gz', + 'file' => $functions.'/node.tar.gz', 'command' => 'node index.js', 'timeout' => 15, ], @@ -499,7 +499,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Node.js', 'version' => '15.5', 'name' => 'node-15.5', - 'code' => $functions.'/node.tar.gz', + 'file' => $functions.'/node.tar.gz', 'command' => 'node index.js', 'timeout' => 15, ], @@ -507,7 +507,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Ruby', 'version' => '2.7', 'name' => 'ruby-2.7', - 'code' => $functions.'/ruby.tar.gz', + 'file' => $functions.'/ruby.tar.gz', 'command' => 'ruby app.rb', 'timeout' => 15, ], @@ -515,7 +515,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Ruby', 'version' => '3.0', 'name' => 'ruby-3.0', - 'code' => $functions.'/ruby.tar.gz', + 'file' => $functions.'/ruby.tar.gz', 'command' => 'ruby app.rb', 'timeout' => 15, ], @@ -523,7 +523,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Deno', 'version' => '1.5', 'name' => 'deno-1.5', - 'code' => $functions.'/deno.tar.gz', + 'file' => $functions.'/deno.tar.gz', 'command' => 'deno run --allow-env index.ts', 'timeout' => 15, ], @@ -531,7 +531,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Deno', 'version' => '1.6', 'name' => 'deno-1.6', - 'code' => $functions.'/deno.tar.gz', + 'file' => $functions.'/deno.tar.gz', 'command' => 'deno run --allow-env index.ts', 'timeout' => 15, ], @@ -539,7 +539,7 @@ class FunctionsCustomServerTest extends Scope 'language' => 'Dart', 'version' => '2.10', 'name' => 'dart-2.10', - 'code' => $functions.'/dart.tar.gz', + 'file' => $functions.'/dart.tar.gz', 'command' => 'dart main.dart', 'timeout' => 15, ], @@ -547,7 +547,7 @@ class FunctionsCustomServerTest extends Scope 'language' => '.NET', 'version' => '3.1', 'name' => 'dotnet-3.1', - 'code' => $functions.'/dotnet-3.1.tar.gz', + 'file' => $functions.'/dotnet-3.1.tar.gz', 'command' => 'dotnet dotnet.dll', 'timeout' => 15, ], @@ -555,7 +555,7 @@ class FunctionsCustomServerTest extends Scope 'language' => '.NET', 'version' => '5.0', 'name' => 'dotnet-5.0', - 'code' => $functions.'/dotnet-5.0.tar.gz', + 'file' => $functions.'/dotnet-5.0.tar.gz', 'command' => 'dotnet dotnet.dll', 'timeout' => 15, ], @@ -618,7 +618,7 @@ class FunctionsCustomServerTest extends Scope 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ 'command' => $command, - 'code' => new CURLFile($code, 'application/x-gzip', basename($code)), + 'file' => new CURLFile($code, 'application/x-gzip', basename($code)), ]); $tagId = $tag['body']['$id'] ?? ''; @@ -716,7 +716,7 @@ class FunctionsCustomServerTest extends Scope 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ 'command' => $command, - 'code' => new CURLFile($code, 'application/x-gzip', basename($code)), + 'file' => new CURLFile($code, 'application/x-gzip', basename($code)), ]); $tagId = $tag['body']['$id'] ?? '';