CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-27 02:31:04 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #857 from appwrite/feat-new-param-name

Browse source 
Feat new param name for cloud functions code packages.
This commit is contained in:
Eldad A. Fux 2021-01-29 18:16:38 +02:00 committed by GitHub
parent 2ed11835a5 07beab14f8
commit 9aad7d1efa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/api/functions.php
View file

@ -429,19 +429,19 @@ App::post('/v1/functions/:functionId/tags')
->label('sdk.namespace', 'functions')
->label('sdk.method', 'createTag')
->label('sdk.description', '/docs/references/functions/create-tag.md')
->label('sdk.packaging', true)
->label('sdk.request.type', 'multipart/form-data')
->label('sdk.response.code', Response::STATUS_CODE_CREATED)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->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 +453,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));

1
src/Appwrite/Specification/Format/OpenAPI3.php
View file

@ -118,6 +118,7 @@ class OpenAPI3 extends Format
'rate-key' => $route->getLabel('abuse-key', 'url:{url},ip:{ip}'),
'scope' => $route->getLabel('scope', ''),
'platforms' => $route->getLabel('sdk.platform', []),
'packaging' => $route->getLabel('sdk.packaging', false),
],
];

1
src/Appwrite/Specification/Format/Swagger2.php
View file

@ -116,6 +116,7 @@ class Swagger2 extends Format
'rate-key' => $route->getLabel('abuse-key', 'url:{url},ip:{ip}'),
'scope' => $route->getLabel('scope', ''),
'platforms' => $route->getLabel('sdk.platform', []),
'packaging' => $route->getLabel('sdk.packaging', false),
],
];

2
tests/e2e/Services/Functions/FunctionsCustomClientTest.php
View file

@ -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'] ?? '';

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

@ -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,
],
@ -586,7 +586,7 @@ class FunctionsCustomServerTest extends Scope
$language = $env['language'] ?? '';
$version = $env['version'] ?? '';
$name = $env['name'] ?? '';
$code = $env['code'] ?? '';
$code = $env['file'] ?? '';
$command = $env['command'] ?? '';
$timeout = $env['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'] ?? '';