This is an automated email from the ASF dual-hosted git repository. diegopucci pushed a commit to branch diego/ch78628/fix-delete-ssh-endpoint in repository https://gitbox.apache.org/repos/asf/superset.git
commit 9c5de2b555e612ef73fff69d7ff032594f1e83c6 Author: geido <[email protected]> AuthorDate: Thu Feb 15 19:45:11 2024 +0200 Fix DELETE ssh_tunnel --- superset/databases/api.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/superset/databases/api.py b/superset/databases/api.py index 62fb729437..f251b45880 100644 --- a/superset/databases/api.py +++ b/superset/databases/api.py @@ -1483,11 +1483,17 @@ class DatabaseRestApi(BaseSupersetModelRestApi): 500: $ref: '#/components/responses/500' """ - try: - DeleteSSHTunnelCommand(pk).run() - return self.response(200, message="OK") - except SSHTunnelNotFoundError: + + database = DatabaseDAO.find_by_id(pk) + if not database: return self.response_404() + try: + existing_ssh_tunnel_model = database.ssh_tunnels + if existing_ssh_tunnel_model: + DeleteSSHTunnelCommand(existing_ssh_tunnel_model.id).run() + return self.response(200, message="OK") + else: + return self.response_404() except SSHTunnelDeleteFailedError as ex: logger.error( "Error deleting SSH Tunnel %s: %s",
