chore(dao): Organize DAOs according to SIP-92 (#24331)

Co-authored-by: JUST.in DO IT <justin.park@airbnb.com>

superset/databases/ssh_tunnel/commands/create.py

@@ -21,13 +21,13 @@ from flask_appbuilder.models.sqla import Model
 from marshmallow import ValidationError
 
 from superset.commands.base import BaseCommand
-from superset.dao.exceptions import DAOCreateFailedError
+from superset.daos.database import SSHTunnelDAO
+from superset.daos.exceptions import DAOCreateFailedError
 from superset.databases.ssh_tunnel.commands.exceptions import (
     SSHTunnelCreateFailedError,
     SSHTunnelInvalidError,
     SSHTunnelRequiredFieldValidationError,
 )
-from superset.databases.ssh_tunnel.dao import SSHTunnelDAO
 from superset.extensions import db, event_logger
 
 logger = logging.getLogger(__name__)

superset/databases/ssh_tunnel/commands/delete.py

@@ -21,13 +21,13 @@ from flask_appbuilder.models.sqla import Model
 
 from superset import is_feature_enabled
 from superset.commands.base import BaseCommand
-from superset.dao.exceptions import DAODeleteFailedError
+from superset.daos.database import SSHTunnelDAO
+from superset.daos.exceptions import DAODeleteFailedError
 from superset.databases.ssh_tunnel.commands.exceptions import (
     SSHTunnelDeleteFailedError,
     SSHTunnelingNotEnabledError,
     SSHTunnelNotFoundError,
 )
-from superset.databases.ssh_tunnel.dao import SSHTunnelDAO
 from superset.databases.ssh_tunnel.models import SSHTunnel
 
 logger = logging.getLogger(__name__)

superset/databases/ssh_tunnel/commands/update.py

@@ -20,14 +20,14 @@ from typing import Any, Optional
 from flask_appbuilder.models.sqla import Model
 
 from superset.commands.base import BaseCommand
-from superset.dao.exceptions import DAOUpdateFailedError
+from superset.daos.database import SSHTunnelDAO
+from superset.daos.exceptions import DAOUpdateFailedError
 from superset.databases.ssh_tunnel.commands.exceptions import (
     SSHTunnelInvalidError,
     SSHTunnelNotFoundError,
     SSHTunnelRequiredFieldValidationError,
     SSHTunnelUpdateFailedError,
 )
-from superset.databases.ssh_tunnel.dao import SSHTunnelDAO
 from superset.databases.ssh_tunnel.models import SSHTunnel
 
 logger = logging.getLogger(__name__)

superset/databases/ssh_tunnel/dao.py

@@ -1,49 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-import logging
-from typing import Any
-
-from superset.dao.base import BaseDAO
-from superset.databases.ssh_tunnel.models import SSHTunnel
-from superset.utils.ssh_tunnel import unmask_password_info
-
-logger = logging.getLogger(__name__)
-
-
-class SSHTunnelDAO(BaseDAO):
-    model_cls = SSHTunnel
-
-    @classmethod
-    def update(
-        cls,
-        model: SSHTunnel,
-        properties: dict[str, Any],
-        commit: bool = True,
-    ) -> SSHTunnel:
-        """
-        Unmask ``password``, ``private_key`` and ``private_key_password`` before updating.
-
-        When a database is edited the user sees a masked version of
-        the aforementioned fields.
-
-        The masked values should be unmasked before the ssh tunnel is updated.
-        """
-        # ID cannot be updated so we remove it if present in the payload
-        properties.pop("id", None)
-        properties = unmask_password_info(properties, model)
-
-        return super().update(model, properties, commit)