refactor: pass all properties to validate_parameters (#21487)

tests/unit_tests/databases/api_test.py

@@ -22,6 +22,7 @@ from typing import Any
 from uuid import UUID
 
 import pytest
+from pytest_mock import MockFixture
 from sqlalchemy.orm.session import Session
 
 
@@ -53,6 +54,7 @@ def test_post_with_uuid(
 
 
 def test_password_mask(
+    mocker: MockFixture,
     app: Any,
     session: Session,
     client: Any,
@@ -92,6 +94,10 @@ def test_password_mask(
     session.add(database)
     session.commit()
 
+    # mock the lookup so that we don't need to include the driver
+    mocker.patch("sqlalchemy.engine.URL.get_driver_name", return_value="gsheets")
+    mocker.patch("superset.utils.log.DBEventLogger.log")
+
     response = client.get("/api/v1/database/1")
     assert (
         response.json["result"]["parameters"]["service_account_info"]["private_key"]

tests/unit_tests/databases/schema_tests.py

@@ -134,7 +134,6 @@ def test_database_parameters_schema_mixin_invalid_engine(
     try:
         dummy_schema.load(payload)
     except ValidationError as err:
-        print(err.messages)
         assert err.messages == {
             "_schema": ['Engine "dummy_engine" is not a valid engine.']
         }

tests/unit_tests/db_engine_specs/test_gsheets.py

@@ -33,14 +33,16 @@ class ProgrammingError(Exception):
 def test_validate_parameters_simple() -> None:
     from superset.db_engine_specs.gsheets import (
         GSheetsEngineSpec,
-        GSheetsParametersType,
+        GSheetsPropertiesType,
     )
 
-    parameters: GSheetsParametersType = {
-        "service_account_info": "",
-        "catalog": {},
+    properties: GSheetsPropertiesType = {
+        "parameters": {
+            "service_account_info": "",
+            "catalog": {},
+        }
     }
-    errors = GSheetsEngineSpec.validate_parameters(parameters)
+    errors = GSheetsEngineSpec.validate_parameters(properties)
     assert errors == [
         SupersetError(
             message="Sheet name is required",
@@ -56,7 +58,7 @@ def test_validate_parameters_catalog(
 ) -> None:
     from superset.db_engine_specs.gsheets import (
         GSheetsEngineSpec,
-        GSheetsParametersType,
+        GSheetsPropertiesType,
     )
 
     g = mocker.patch("superset.db_engine_specs.gsheets.g")
@@ -71,15 +73,17 @@ def test_validate_parameters_catalog(
         ProgrammingError("Unsupported table: https://www.google.com/"),
     ]
 
-    parameters: GSheetsParametersType = {
-        "service_account_info": "",
-        "catalog": {
-            "private_sheet": "https://docs.google.com/spreadsheets/d/1/edit",
-            "public_sheet": "https://docs.google.com/spreadsheets/d/1/edit#gid=1",
-            "not_a_sheet": "https://www.google.com/",
-        },
+    properties: GSheetsPropertiesType = {
+        "parameters": {
+            "service_account_info": "",
+            "catalog": {
+                "private_sheet": "https://docs.google.com/spreadsheets/d/1/edit",
+                "public_sheet": "https://docs.google.com/spreadsheets/d/1/edit#gid=1",
+                "not_a_sheet": "https://www.google.com/",
+            },
+        }
     }
-    errors = GSheetsEngineSpec.validate_parameters(parameters)  # ignore: type
+    errors = GSheetsEngineSpec.validate_parameters(properties)  # ignore: type
 
     assert errors == [
         SupersetError(
@@ -146,7 +150,7 @@ def test_validate_parameters_catalog_and_credentials(
 ) -> None:
     from superset.db_engine_specs.gsheets import (
         GSheetsEngineSpec,
-        GSheetsParametersType,
+        GSheetsPropertiesType,
     )
 
     g = mocker.patch("superset.db_engine_specs.gsheets.g")
@@ -161,15 +165,17 @@ def test_validate_parameters_catalog_and_credentials(
         ProgrammingError("Unsupported table: https://www.google.com/"),
     ]
 
-    parameters: GSheetsParametersType = {
-        "service_account_info": "",
-        "catalog": {
-            "private_sheet": "https://docs.google.com/spreadsheets/d/1/edit",
-            "public_sheet": "https://docs.google.com/spreadsheets/d/1/edit#gid=1",
-            "not_a_sheet": "https://www.google.com/",
-        },
+    properties: GSheetsPropertiesType = {
+        "parameters": {
+            "service_account_info": "",
+            "catalog": {
+                "private_sheet": "https://docs.google.com/spreadsheets/d/1/edit",
+                "public_sheet": "https://docs.google.com/spreadsheets/d/1/edit#gid=1",
+                "not_a_sheet": "https://www.google.com/",
+            },
+        }
     }
-    errors = GSheetsEngineSpec.validate_parameters(parameters)  # ignore: type
+    errors = GSheetsEngineSpec.validate_parameters(properties)  # ignore: type
     assert errors == [
         SupersetError(
             message=(