chore(command): Organize Commands according to SIP-92 (#25850)

2026-04-25 02:55:07 +00:00 · 2023-11-22 11:55:54 -08:00
parent 984c278c4c
commit 07bcfa9b5f
265 changed files with 786 additions and 808 deletions
--- a/tests/integration_tests/databases/api_tests.py
+++ b/tests/integration_tests/databases/api_tests.py
@@ -288,9 +288,9 @@ class TestDatabaseApi(SupersetTestCase):
        db.session.commit()

    @mock.patch(
-        "superset.databases.commands.test_connection.TestConnectionDatabaseCommand.run",
+        "superset.commands.database.test_connection.TestConnectionDatabaseCommand.run",
    )
-    @mock.patch("superset.databases.commands.create.is_feature_enabled")
+    @mock.patch("superset.commands.database.create.is_feature_enabled")
    @mock.patch(
        "superset.models.core.Database.get_all_schema_names",
    )
@@ -336,10 +336,10 @@ class TestDatabaseApi(SupersetTestCase):
        db.session.commit()

    @mock.patch(
-        "superset.databases.commands.test_connection.TestConnectionDatabaseCommand.run",
+        "superset.commands.database.test_connection.TestConnectionDatabaseCommand.run",
    )
-    @mock.patch("superset.databases.commands.create.is_feature_enabled")
-    @mock.patch("superset.databases.commands.update.is_feature_enabled")
+    @mock.patch("superset.commands.database.create.is_feature_enabled")
+    @mock.patch("superset.commands.database.update.is_feature_enabled")
    @mock.patch(
        "superset.models.core.Database.get_all_schema_names",
    )
@@ -397,10 +397,10 @@ class TestDatabaseApi(SupersetTestCase):
        db.session.commit()

    @mock.patch(
-        "superset.databases.commands.test_connection.TestConnectionDatabaseCommand.run",
+        "superset.commands.database.test_connection.TestConnectionDatabaseCommand.run",
    )
-    @mock.patch("superset.databases.commands.create.is_feature_enabled")
-    @mock.patch("superset.databases.commands.update.is_feature_enabled")
+    @mock.patch("superset.commands.database.create.is_feature_enabled")
+    @mock.patch("superset.commands.database.update.is_feature_enabled")
    @mock.patch(
        "superset.models.core.Database.get_all_schema_names",
    )
@@ -477,12 +477,12 @@ class TestDatabaseApi(SupersetTestCase):
        db.session.commit()

    @mock.patch(
-        "superset.databases.commands.test_connection.TestConnectionDatabaseCommand.run",
+        "superset.commands.database.test_connection.TestConnectionDatabaseCommand.run",
    )
    @mock.patch(
        "superset.models.core.Database.get_all_schema_names",
    )
-    @mock.patch("superset.databases.commands.create.is_feature_enabled")
+    @mock.patch("superset.commands.database.create.is_feature_enabled")
    def test_cascade_delete_ssh_tunnel(
        self,
        mock_test_connection_database_command_run,
@@ -531,9 +531,9 @@ class TestDatabaseApi(SupersetTestCase):
        assert model_ssh_tunnel is None

    @mock.patch(
-        "superset.databases.commands.test_connection.TestConnectionDatabaseCommand.run",
+        "superset.commands.database.test_connection.TestConnectionDatabaseCommand.run",
    )
-    @mock.patch("superset.databases.commands.create.is_feature_enabled")
+    @mock.patch("superset.commands.database.create.is_feature_enabled")
    @mock.patch(
        "superset.models.core.Database.get_all_schema_names",
    )
@@ -582,9 +582,9 @@ class TestDatabaseApi(SupersetTestCase):
        assert model is None

    @mock.patch(
-        "superset.databases.commands.test_connection.TestConnectionDatabaseCommand.run",
+        "superset.commands.database.test_connection.TestConnectionDatabaseCommand.run",
    )
-    @mock.patch("superset.databases.commands.create.is_feature_enabled")
+    @mock.patch("superset.commands.database.create.is_feature_enabled")
    @mock.patch(
        "superset.models.core.Database.get_all_schema_names",
    )
@@ -637,7 +637,7 @@ class TestDatabaseApi(SupersetTestCase):
        db.session.commit()

    @mock.patch(
-        "superset.databases.commands.test_connection.TestConnectionDatabaseCommand.run",
+        "superset.commands.database.test_connection.TestConnectionDatabaseCommand.run",
    )
    @mock.patch(
        "superset.models.core.Database.get_all_schema_names",
@@ -2005,10 +2005,10 @@ class TestDatabaseApi(SupersetTestCase):
        app.config["PREVENT_UNSAFE_DB_CONNECTIONS"] = False

    @mock.patch(
-        "superset.databases.commands.test_connection.DatabaseDAO.build_db_for_connection_test",
+        "superset.commands.database.test_connection.DatabaseDAO.build_db_for_connection_test",
    )
    @mock.patch(
-        "superset.databases.commands.test_connection.event_logger",
+        "superset.commands.database.test_connection.event_logger",
    )
    def test_test_connection_failed_invalid_hostname(
        self, mock_event_logger, mock_build_db
@@ -3748,7 +3748,7 @@ class TestDatabaseApi(SupersetTestCase):
            },
        )

-    @patch("superset.databases.commands.validate_sql.get_validator_by_name")
+    @patch("superset.commands.database.validate_sql.get_validator_by_name")
    @patch.dict(
        "superset.config.SQL_VALIDATORS_BY_ENGINE",
        PRESTO_SQL_VALIDATORS_BY_ENGINE,
--- a/tests/integration_tests/databases/commands_tests.py
+++ b/tests/integration_tests/databases/commands_tests.py
@@ -23,11 +23,8 @@ from func_timeout import FunctionTimedOut
 from sqlalchemy.exc import DBAPIError

 from superset import db, event_logger, security_manager
-from superset.commands.exceptions import CommandInvalidError
-from superset.commands.importers.exceptions import IncorrectVersionError
-from superset.connectors.sqla.models import SqlaTable
-from superset.databases.commands.create import CreateDatabaseCommand
-from superset.databases.commands.exceptions import (
+from superset.commands.database.create import CreateDatabaseCommand
+from superset.commands.database.exceptions import (
    DatabaseInvalidError,
    DatabaseNotFoundError,
    DatabaseSecurityUnsafeError,
@@ -35,11 +32,14 @@ from superset.databases.commands.exceptions import (
    DatabaseTestConnectionDriverError,
    DatabaseTestConnectionUnexpectedError,
 )
-from superset.databases.commands.export import ExportDatabasesCommand
-from superset.databases.commands.importers.v1 import ImportDatabasesCommand
-from superset.databases.commands.tables import TablesDatabaseCommand
-from superset.databases.commands.test_connection import TestConnectionDatabaseCommand
-from superset.databases.commands.validate import ValidateDatabaseParametersCommand
+from superset.commands.database.export import ExportDatabasesCommand
+from superset.commands.database.importers.v1 import ImportDatabasesCommand
+from superset.commands.database.tables import TablesDatabaseCommand
+from superset.commands.database.test_connection import TestConnectionDatabaseCommand
+from superset.commands.database.validate import ValidateDatabaseParametersCommand
+from superset.commands.exceptions import CommandInvalidError
+from superset.commands.importers.exceptions import IncorrectVersionError
+from superset.connectors.sqla.models import SqlaTable
 from superset.databases.schemas import DatabaseTestConnectionSchema
 from superset.databases.ssh_tunnel.models import SSHTunnel
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
@@ -75,7 +75,7 @@ from tests.integration_tests.fixtures.importexport import (


 class TestCreateDatabaseCommand(SupersetTestCase):
-    @patch("superset.databases.commands.test_connection.event_logger.log_with_context")
+    @patch("superset.commands.database.test_connection.event_logger.log_with_context")
    @patch("superset.utils.core.g")
    def test_create_duplicate_error(self, mock_g, mock_logger):
        example_db = get_example_database()
@@ -94,7 +94,7 @@ class TestCreateDatabaseCommand(SupersetTestCase):
            "DatabaseRequiredFieldValidationError"
        )

-    @patch("superset.databases.commands.test_connection.event_logger.log_with_context")
+    @patch("superset.commands.database.test_connection.event_logger.log_with_context")
    @patch("superset.utils.core.g")
    def test_multiple_error_logging(self, mock_g, mock_logger):
        mock_g.user = security_manager.find_user("admin")
@@ -834,7 +834,7 @@ class TestImportDatabasesCommand(SupersetTestCase):
            }
        }

-    @patch("superset.databases.commands.importers.v1.import_dataset")
+    @patch("superset.commands.database.importers.v1.import_dataset")
    def test_import_v1_rollback(self, mock_import_dataset):
        """Test than on an exception everything is rolled back"""
        num_databases = db.session.query(Database).count()
@@ -860,7 +860,7 @@ class TestImportDatabasesCommand(SupersetTestCase):

 class TestTestConnectionDatabaseCommand(SupersetTestCase):
    @patch("superset.daos.database.Database._get_sqla_engine")
-    @patch("superset.databases.commands.test_connection.event_logger.log_with_context")
+    @patch("superset.commands.database.test_connection.event_logger.log_with_context")
    @patch("superset.utils.core.g")
    def test_connection_db_exception(
        self, mock_g, mock_event_logger, mock_get_sqla_engine
@@ -881,7 +881,7 @@ class TestTestConnectionDatabaseCommand(SupersetTestCase):
        mock_event_logger.assert_called()

    @patch("superset.daos.database.Database._get_sqla_engine")
-    @patch("superset.databases.commands.test_connection.event_logger.log_with_context")
+    @patch("superset.commands.database.test_connection.event_logger.log_with_context")
    @patch("superset.utils.core.g")
    def test_connection_do_ping_exception(
        self, mock_g, mock_event_logger, mock_get_sqla_engine
@@ -903,8 +903,8 @@ class TestTestConnectionDatabaseCommand(SupersetTestCase):
            == SupersetErrorType.GENERIC_DB_ENGINE_ERROR
        )

-    @patch("superset.databases.commands.test_connection.func_timeout")
-    @patch("superset.databases.commands.test_connection.event_logger.log_with_context")
+    @patch("superset.commands.database.test_connection.func_timeout")
+    @patch("superset.commands.database.test_connection.event_logger.log_with_context")
    @patch("superset.utils.core.g")
    def test_connection_do_ping_timeout(
        self, mock_g, mock_event_logger, mock_func_timeout
@@ -926,7 +926,7 @@ class TestTestConnectionDatabaseCommand(SupersetTestCase):
        )

    @patch("superset.daos.database.Database._get_sqla_engine")
-    @patch("superset.databases.commands.test_connection.event_logger.log_with_context")
+    @patch("superset.commands.database.test_connection.event_logger.log_with_context")
    @patch("superset.utils.core.g")
    def test_connection_superset_security_connection(
        self, mock_g, mock_event_logger, mock_get_sqla_engine
@@ -949,7 +949,7 @@ class TestTestConnectionDatabaseCommand(SupersetTestCase):
        mock_event_logger.assert_called()

    @patch("superset.daos.database.Database._get_sqla_engine")
-    @patch("superset.databases.commands.test_connection.event_logger.log_with_context")
+    @patch("superset.commands.database.test_connection.event_logger.log_with_context")
    @patch("superset.utils.core.g")
    def test_connection_db_api_exc(
        self, mock_g, mock_event_logger, mock_get_sqla_engine
@@ -975,7 +975,7 @@ class TestTestConnectionDatabaseCommand(SupersetTestCase):

@patch("superset.db_engine_specs.base.is_hostname_valid")
@patch("superset.db_engine_specs.base.is_port_open")
-@patch("superset.databases.commands.validate.DatabaseDAO")
+@patch("superset.commands.database.validate.DatabaseDAO")
 def test_validate(DatabaseDAO, is_port_open, is_hostname_valid, app_context):
    """
    Test parameter validation.
--- a/tests/integration_tests/databases/ssh_tunnel/commands/commands_tests.py
+++ b/tests/integration_tests/databases/ssh_tunnel/commands/commands_tests.py
@@ -20,13 +20,13 @@ from unittest.mock import patch
 import pytest

 from superset import security_manager
-from superset.databases.ssh_tunnel.commands.create import CreateSSHTunnelCommand
-from superset.databases.ssh_tunnel.commands.delete import DeleteSSHTunnelCommand
-from superset.databases.ssh_tunnel.commands.exceptions import (
+from superset.commands.database.ssh_tunnel.create import CreateSSHTunnelCommand
+from superset.commands.database.ssh_tunnel.delete import DeleteSSHTunnelCommand
+from superset.commands.database.ssh_tunnel.exceptions import (
    SSHTunnelInvalidError,
    SSHTunnelNotFoundError,
 )
-from superset.databases.ssh_tunnel.commands.update import UpdateSSHTunnelCommand
+from superset.commands.database.ssh_tunnel.update import UpdateSSHTunnelCommand
 from tests.integration_tests.base_tests import SupersetTestCase


@@ -67,7 +67,7 @@ class TestUpdateSSHTunnelCommand(SupersetTestCase):

 class TestDeleteSSHTunnelCommand(SupersetTestCase):
    @mock.patch("superset.utils.core.g")
-    @mock.patch("superset.databases.ssh_tunnel.commands.delete.is_feature_enabled")
+    @mock.patch("superset.commands.database.ssh_tunnel.delete.is_feature_enabled")
    def test_delete_ssh_tunnel_not_found(self, mock_g, mock_delete_is_feature_enabled):
        mock_g.user = security_manager.find_user("admin")
        mock_delete_is_feature_enabled.return_value = True