From 4d16072972bbda1ee6d520607133e1c04820bb2f Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Sat, 19 Feb 2022 15:08:55 +0400 Subject: [PATCH] feat: updated test functions and bumped appwrite runtimes version --- app/executor.php | 2 -- composer.json | 2 +- tests/resources/functions/php-fn.tar.gz | Bin 388 -> 390 bytes tests/resources/functions/php-fn/index.php | 24 ++++++++++----------- tests/resources/functions/php.tar.gz | Bin 420 -> 423 bytes tests/resources/functions/php/index.php | 16 +++++++------- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/app/executor.php b/app/executor.php index 873d50e7b6..9e3a117848 100644 --- a/app/executor.php +++ b/app/executor.php @@ -415,8 +415,6 @@ App::post('/v1/execution') $ch = \curl_init(); $body = \json_encode([ - 'path' => '/usr/code', - 'file' => $entrypoint, 'env' => $vars, 'payload' => $data, 'timeout' => $timeout ?? (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900) diff --git a/composer.json b/composer.json index 55834b825b..0839feee08 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "ext-zlib": "*", "ext-sockets": "*", "appwrite/php-clamav": "1.1.*", - "appwrite/php-runtimes": "dev-refactor", + "appwrite/runtimes": "0.7.0", "utopia-php/framework": "0.19.*", "utopia-php/logger": "0.1.*", "utopia-php/abuse": "0.7.*", diff --git a/tests/resources/functions/php-fn.tar.gz b/tests/resources/functions/php-fn.tar.gz index c7467b95b51f7ec4e038635953d1cf9eb8613ff2..fddecf1f8ac299875890264e8c7ae3b6607630a8 100644 GIT binary patch literal 390 zcmV;10eSu(iwFSg%MfA!1MQSeZ-PJ&hB@;q_Rs`PtS-3V!PbW8)?g|UL``Fiu@<8q z7R!fe)AYZ06|pw4D|;YKQ{KzK=ACDT8K7JdG8crfrmA2cwKzfr#ql5@BLyNEsWr6< zpj?HhCIB`2)&wC6!kJH7nJ@iS5WcNvbMNV#kJ=Us2Iue`$M{E7uB^zj`&!;CH<{I- z^Ux6basP^}XkYu6Wx9W)X^H?~W*wdApYQ+Xj&5EQeK(AJ0u~XOhbxbO!jc1EeExwEoimfh>% kro++XNyY&^Db~f0y7=3FwOqM!<;rzQpTX`nrT`8A0R4%-G5`Po literal 388 zcmV-~0ek)*iwFSCI1pk01MQSuYr-%ThI`##k&A&2{D^JZUbs1mW>T58#Hb7rajv3X zw5}gxW9+{#S}P7*76)aF^}RXi;mwoNb3!UrDRV&x4NU{Ps3#FBD2aQ48d4yFDpG42 zfHf7Wx&*ZBOOvEHjAj8VWxfnnVf4D5&HaZ{K4x1iIGp`|9O55QrMmJS-IvN{xykGd z)(;(_FXykY>|y?jVX*ll-B2U|Gpp!G|9t*eH*E5<9Jo;&cwiBG^JwLJpm-6uPq7TP>5wQl)}ike$GhxS1=Ddx#G-h5JFuJ7>e*APRRGrwkmAY>*LxnH z_DxDWkZpFc7;5L_!&=z6>)m&;O~sH$emjson([ - 'APPWRITE_FUNCTION_ID' => $request->env['APPWRITE_FUNCTION_ID'], - 'APPWRITE_FUNCTION_NAME' => $request->env['APPWRITE_FUNCTION_NAME'], - 'APPWRITE_FUNCTION_DEPLOYMENT' => $request->env['APPWRITE_FUNCTION_DEPLOYMENT'], - 'APPWRITE_FUNCTION_TRIGGER' => $request->env['APPWRITE_FUNCTION_TRIGGER'], - 'APPWRITE_FUNCTION_RUNTIME_NAME' => $request->env['APPWRITE_FUNCTION_RUNTIME_NAME'], - 'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request->env['APPWRITE_FUNCTION_RUNTIME_VERSION'], - 'APPWRITE_FUNCTION_EVENT' => $request->env['APPWRITE_FUNCTION_EVENT'], - 'APPWRITE_FUNCTION_EVENT_DATA' => $request->env['APPWRITE_FUNCTION_EVENT_DATA'], - 'APPWRITE_FUNCTION_DATA' => $request->env['APPWRITE_FUNCTION_DATA'], - 'APPWRITE_FUNCTION_USER_ID' => $request->env['APPWRITE_FUNCTION_USER_ID'], - 'APPWRITE_FUNCTION_JWT' => $request->env['APPWRITE_FUNCTION_JWT'], - 'APPWRITE_FUNCTION_PROJECT_ID' => $request->env['APPWRITE_FUNCTION_PROJECT_ID'], + 'APPWRITE_FUNCTION_ID' => $request['env']['APPWRITE_FUNCTION_ID'], + 'APPWRITE_FUNCTION_NAME' => $request['env']['APPWRITE_FUNCTION_NAME'], + 'APPWRITE_FUNCTION_DEPLOYMENT' => $request['env']['APPWRITE_FUNCTION_DEPLOYMENT'], + 'APPWRITE_FUNCTION_TRIGGER' => $request['env']['APPWRITE_FUNCTION_TRIGGER'], + 'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['env']['APPWRITE_FUNCTION_RUNTIME_NAME'], + 'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['env']['APPWRITE_FUNCTION_RUNTIME_VERSION'], + 'APPWRITE_FUNCTION_EVENT' => $request['env']['APPWRITE_FUNCTION_EVENT'], + 'APPWRITE_FUNCTION_EVENT_DATA' => $request['env']['APPWRITE_FUNCTION_EVENT_DATA'], + 'APPWRITE_FUNCTION_DATA' => $request['env']['APPWRITE_FUNCTION_DATA'], + 'APPWRITE_FUNCTION_USER_ID' => $request['env']['APPWRITE_FUNCTION_USER_ID'], + 'APPWRITE_FUNCTION_JWT' => $request['env']['APPWRITE_FUNCTION_JWT'], + 'APPWRITE_FUNCTION_PROJECT_ID' => $request['env']['APPWRITE_FUNCTION_PROJECT_ID'], ]); }; diff --git a/tests/resources/functions/php.tar.gz b/tests/resources/functions/php.tar.gz index 412915e7a405ea0c930884e4ee526b1a8a0faa00..4feb138f427631f373f56ec2e80a15314c933d98 100644 GIT binary patch literal 423 zcmV;Y0a*SYiwFSD%MfA!1MQUEYQjJeg>#*!7^GkYHHqCssI5iJDuJ3vTrEXJY_g(4 z6Pq7tDSew>^)-C4uEtmkHpB}lrJkEfvS+@T?66xDxT8xH#j-5JIx0~VODKvPfrLsT zl8{`M6cD8g5h)zV$8U|}LO&RJtQBkGP5t0yHnQA@eLiLzj}thX|JcSqqM|T$Z2DZB zPv%Ff!S+Kz=*Rg>vhp>5MOn=sDP_cgc(jgo^v~yib;Bml^BxUC&w+91Si#hF;QY*^ zPa*Y#Jg_H!?m9lr!7C3;8}Igep*r(j=e)mOTq#>?x9?1i;9;Yy*NJB6Lru-XbroW2 zKTDlOcF^DN9ORQwdaZ@i!q(nooQm7G#(fLxBrS9&BNXcF|p3s~ajF65NRz%q%~a?->vT zAcksOf=LS_+lJ7YTCPnYU{xS+p|LqQex2PX?qi2~3+fTJxVl)^_(871zg76(KJO=; Rbka$&J^^|7@{a%v006z*$_xMi literal 420 zcmV;V0bBkbiwFQVIS^t11MQUEYQiuS$Gz@T9Auz^A5l|m1E>=-M|GfVD*%XC-<-UZ;=c@OV%^@U@Z>EU*Aqg12Yeb8h|^j2SKQdw1WSxUie9rn~* zotdlQao;E#22vUw5)HL=hQlP%y;mPQM4{1;0e?7{YI3_xv}n}5IUK3=6)Jbg85{6p zMKt(;XgxkYkH23Oo`MV_Z?kWWfYYT0ZJfdM{XuYFk(;VSbV_=Damn@9`ZEcI0#H>_ zuR&wE@pKBFX-ups1DEFj*MipWpg2u_e^}2wX0Mn{`Q+vz-Qq`?n($E*e*1jKiWMu? ODSZRZ9pD!L3;+Niiq75u diff --git a/tests/resources/functions/php/index.php b/tests/resources/functions/php/index.php index f70ef96748..dd111af766 100644 --- a/tests/resources/functions/php/index.php +++ b/tests/resources/functions/php/index.php @@ -2,14 +2,14 @@ return function ($request, $response) { return $response->json([ - 'APPWRITE_FUNCTION_ID' => $request->env['APPWRITE_FUNCTION_ID'], - 'APPWRITE_FUNCTION_NAME' => $request->env['APPWRITE_FUNCTION_NAME'], - 'APPWRITE_FUNCTION_DEPLOYMENT' => $request->env['APPWRITE_FUNCTION_DEPLOYMENT'], - 'APPWRITE_FUNCTION_TRIGGER' => $request->env['APPWRITE_FUNCTION_TRIGGER'], - 'APPWRITE_FUNCTION_RUNTIME_NAME' => $request->env['APPWRITE_FUNCTION_RUNTIME_NAME'], - 'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request->env['APPWRITE_FUNCTION_RUNTIME_VERSION'], - 'APPWRITE_FUNCTION_EVENT' => $request->env['APPWRITE_FUNCTION_EVENT'], - 'APPWRITE_FUNCTION_EVENT_DATA' => $request->env['APPWRITE_FUNCTION_EVENT_DATA'], + 'APPWRITE_FUNCTION_ID' => $request['env']['APPWRITE_FUNCTION_ID'], + 'APPWRITE_FUNCTION_NAME' => $request['env']['APPWRITE_FUNCTION_NAME'], + 'APPWRITE_FUNCTION_DEPLOYMENT' => $request['env']['APPWRITE_FUNCTION_DEPLOYMENT'], + 'APPWRITE_FUNCTION_TRIGGER' => $request['env']['APPWRITE_FUNCTION_TRIGGER'], + 'APPWRITE_FUNCTION_RUNTIME_NAME' => $request['env']['APPWRITE_FUNCTION_RUNTIME_NAME'], + 'APPWRITE_FUNCTION_RUNTIME_VERSION' => $request['env']['APPWRITE_FUNCTION_RUNTIME_VERSION'], + 'APPWRITE_FUNCTION_EVENT' => $request['env']['APPWRITE_FUNCTION_EVENT'], + 'APPWRITE_FUNCTION_EVENT_DATA' => $request['env']['APPWRITE_FUNCTION_EVENT_DATA'], 'UNICODE_TEST' => "êä" // TODO: Re-add unicode test to FunctionsCustomServerTest.php ]); };