diff --git a/src/spaceone/file_manager/interface/rest/file.py b/src/spaceone/file_manager/interface/rest/file.py index e754a6e..b050e8c 100644 --- a/src/spaceone/file_manager/interface/rest/file.py +++ b/src/spaceone/file_manager/interface/rest/file.py @@ -168,6 +168,7 @@ async def upload_file(self, metadata, params, file) : file_conn_mgr = FileConnectorManager() await run_in_threadpool(file_conn_mgr.upload_file, resource_group, file_id, await file.read()) except Exception as e: + _LOGGER.error(f'[upload_file] Error: {e}') file_svc.delete({"file_id":file_id}) raise ERROR_FILE_UPLOAD_FAILED(name=file_info["name"]) @@ -188,6 +189,7 @@ async def download_file(self, metadata, params) -> StreamingResponse: raise ERROR_FILE_DOWNLOAD_FAILED(name=file_info["name"]) except Exception as e: + _LOGGER.error(f'[download_file] Error: {e}') raise ERROR_FILE_DOWNLOAD_FAILED(name=file_info["name"]) diff --git a/src/spaceone/file_manager/service/file_service.py b/src/spaceone/file_manager/service/file_service.py index 22ab635..5ab15d9 100644 --- a/src/spaceone/file_manager/service/file_service.py +++ b/src/spaceone/file_manager/service/file_service.py @@ -176,6 +176,7 @@ def delete(self, params: FileDeleteRequest) -> None: "WORKSPACE_MEMBER", ], ) + @convert_model def get(self, params: FileGetRequest) -> Union[FileResponse, dict]: """Get file @@ -194,31 +195,6 @@ def get(self, params: FileGetRequest) -> Union[FileResponse, dict]: FileResponse: """ - role_type = self.transaction.get_meta("authorization.role_type") - - if role_type == "SYSTEM_ADMIN": - resource_group = "SYSTEM" - elif role_type == "DOMAIN_ADMIN": - resource_group = "DOMAIN" - elif role_type == "WORKSPACE_OWNER" or role_type == "WORKSPACE_MEMBER": - resource_group = "WORKSPACE" - else: - raise ERROR_PERMISSION_DENIED() - - if resource_group == "SYSTEM": - params.domain_id = "*" - params.workspace_id = "*" - elif resource_group == "DOMAIN": - params.workspace_id = "*" - elif resource_group == "WORKSPACE" : - self.identity_mgr.check_workspace(params.workspace_id, params.domain_id) - params.project_id = "*" - elif resource_group == "PROJECT": - if not params.project_id: - params.project_id = "*" - else : - self.identity_mgr.get_project(params.project_id, params.domain_id) - file_vo = self.file_mgr.get_file( params.file_id, params.domain_id,