Skip to content

Functions Console Logs Capture #3656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Aug 16, 2022
Merged

Functions Console Logs Capture #3656

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
391d112
update container to accept new response format
lohanidamodar Aug 10, 2022
5424b85
update execution response model
lohanidamodar Aug 10, 2022
c7d6d38
update UI to include logs
lohanidamodar Aug 10, 2022
6fc98eb
default network name
lohanidamodar Aug 10, 2022
9002bbe
update response format
lohanidamodar Aug 10, 2022
e3cca44
formatting
lohanidamodar Aug 10, 2022
13f915c
UI update
lohanidamodar Aug 11, 2022
f872132
fix network name
lohanidamodar Aug 11, 2022
734454e
hiding stdout and stderr on client execution response
lohanidamodar Aug 14, 2022
3ce8565
hide execution stdout and stderr on client side response
lohanidamodar Aug 14, 2022
d9745b3
fix execution list UI
lohanidamodar Aug 14, 2022
89b2234
update stdout and stderr description
lohanidamodar Aug 14, 2022
078b1ec
updating to use if condition
lohanidamodar Aug 16, 2022
e59f00f
update runtime package
lohanidamodar Aug 16, 2022
94d9bb8
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fe…
lohanidamodar Aug 16, 2022
4fb743e
fix lint errors
lohanidamodar Aug 16, 2022
7d9f973
Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2
Meldiron Aug 16, 2022
4e7c976
Fix node runtime test
Meldiron Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updating to use if condition
  • Loading branch information
@lohanidamodar
lohanidamodar committed Aug 16, 2022
commit 078b1ec3778f25ec055bab48a978de3f38f36975
14 changes: 9 additions & 5 deletions app/controllers/api/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,8 +969,10 @@
$roles = Authorization::getRoles();
$isPrivilegedUser = Auth::isPrivilegedUser($roles);
$isAppUser = Auth::isAppUser($roles);
$execution->setAttribute('stdout', ($isPrivilegedUser || $isAppUser) ? $executionResponse['stdout'] : '');
$execution->setAttribute('stderr', ($isPrivilegedUser || $isAppUser) ? $executionResponse['stderr'] : '');
if(!$isPrivilegedUser && !$isAppUser) {
$execution->setAttribute('stdout', '');
$execution->setAttribute('stderr', '');
}

$response
->setStatusCode(Response::STATUS_CODE_CREATED)
Expand Down Expand Up @@ -1026,7 +1028,7 @@
$roles = Authorization::getRoles();
$isPrivilegedUser = Auth::isPrivilegedUser($roles);
$isAppUser = Auth::isAppUser($roles);
if ($isPrivilegedUser || $isAppUser) {
if (!$isPrivilegedUser && !$isAppUser) {
$results = array_map(function ($execution) {
$execution->setAttribute('stdout', '');
$execution->setAttribute('stderr', '');
Expand Down Expand Up @@ -1076,8 +1078,10 @@
$roles = Authorization::getRoles();
$isPrivilegedUser = Auth::isPrivilegedUser($roles);
$isAppUser = Auth::isAppUser($roles);
$execution->setAttribute('stdout', ($isPrivilegedUser || $isAppUser) ? $execution->getAttribute('stdout') : '');
$execution->setAttribute('stderr', ($isPrivilegedUser || $isAppUser) ? $execution->getAttribute('stderr') : '');
if(!$isPrivilegedUser && !$isAppUser) {
$execution->setAttribute('stdout', '');
$execution->setAttribute('stderr', '');
}

$response->dynamic($execution, Response::MODEL_EXECUTION);
});
Expand Down