rusackas commented on code in PR #38490:
URL: https://github.com/apache/superset/pull/38490#discussion_r3526398692
##########
tests/unit_tests/databases/schema_tests.py:
##########
@@ -347,6 +347,167 @@ def test_import_schema_rejects_masked_fields_for_new_db(
assert "$.credentials_info.private_key" in error_messages
+def test_extra_validator_rejects_negative_schema_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects negative schema_cache_timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {"metadata_cache_timeout": {"schema_cache_timeout": -1}}
+ ),
+ }
Review Comment:
I don't think we need type annotations on locals inside a test like this,
mypy infers these fine and we don't enforce it. Resolving.
##########
tests/unit_tests/databases/schema_tests.py:
##########
@@ -347,6 +347,167 @@ def test_import_schema_rejects_masked_fields_for_new_db(
assert "$.credentials_info.private_key" in error_messages
+def test_extra_validator_rejects_negative_schema_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects negative schema_cache_timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {"metadata_cache_timeout": {"schema_cache_timeout": -1}}
+ ),
+ }
+ with pytest.raises(ValidationError) as exc_info:
+ schema.load(payload)
+ assert "non-negative integer" in str(exc_info.value)
+
+
+def test_extra_validator_rejects_negative_table_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects negative table_cache_timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {"metadata_cache_timeout": {"table_cache_timeout": -5}}
+ ),
+ }
+ with pytest.raises(ValidationError) as exc_info:
+ schema.load(payload)
+ assert "non-negative integer" in str(exc_info.value)
+
+
+def test_extra_validator_accepts_zero_cache_timeout() -> None:
+ """
+ Test that extra_validator accepts zero as a valid cache timeout (cache
never expires).
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {
+ "metadata_cache_timeout": {
+ "schema_cache_timeout": 0,
+ "table_cache_timeout": 0,
+ }
+ }
+ ),
+ }
+ result = schema.load(payload)
Review Comment:
Same here, we don't annotate locals inside tests. mypy handles it. Resolving.
##########
tests/unit_tests/databases/schema_tests.py:
##########
@@ -347,6 +347,167 @@ def test_import_schema_rejects_masked_fields_for_new_db(
assert "$.credentials_info.private_key" in error_messages
+def test_extra_validator_rejects_negative_schema_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects negative schema_cache_timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {"metadata_cache_timeout": {"schema_cache_timeout": -1}}
+ ),
+ }
+ with pytest.raises(ValidationError) as exc_info:
+ schema.load(payload)
+ assert "non-negative integer" in str(exc_info.value)
+
+
+def test_extra_validator_rejects_negative_table_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects negative table_cache_timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {"metadata_cache_timeout": {"table_cache_timeout": -5}}
+ ),
+ }
+ with pytest.raises(ValidationError) as exc_info:
+ schema.load(payload)
+ assert "non-negative integer" in str(exc_info.value)
+
+
+def test_extra_validator_accepts_zero_cache_timeout() -> None:
+ """
+ Test that extra_validator accepts zero as a valid cache timeout (cache
never expires).
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {
+ "metadata_cache_timeout": {
+ "schema_cache_timeout": 0,
+ "table_cache_timeout": 0,
+ }
+ }
+ ),
+ }
+ result = schema.load(payload)
+ extra = json.loads(result["extra"])
Review Comment:
Same as above, no need to annotate a local in a test. Resolving.
##########
tests/unit_tests/databases/schema_tests.py:
##########
@@ -347,6 +347,167 @@ def test_import_schema_rejects_masked_fields_for_new_db(
assert "$.credentials_info.private_key" in error_messages
+def test_extra_validator_rejects_negative_schema_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects negative schema_cache_timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {"metadata_cache_timeout": {"schema_cache_timeout": -1}}
+ ),
+ }
+ with pytest.raises(ValidationError) as exc_info:
+ schema.load(payload)
+ assert "non-negative integer" in str(exc_info.value)
+
+
+def test_extra_validator_rejects_negative_table_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects negative table_cache_timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {"metadata_cache_timeout": {"table_cache_timeout": -5}}
+ ),
+ }
+ with pytest.raises(ValidationError) as exc_info:
+ schema.load(payload)
+ assert "non-negative integer" in str(exc_info.value)
+
+
+def test_extra_validator_accepts_zero_cache_timeout() -> None:
+ """
+ Test that extra_validator accepts zero as a valid cache timeout (cache
never expires).
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {
+ "metadata_cache_timeout": {
+ "schema_cache_timeout": 0,
+ "table_cache_timeout": 0,
+ }
+ }
+ ),
+ }
+ result = schema.load(payload)
+ extra = json.loads(result["extra"])
+ assert extra["metadata_cache_timeout"]["schema_cache_timeout"] == 0
+ assert extra["metadata_cache_timeout"]["table_cache_timeout"] == 0
+
+
+def test_extra_validator_accepts_positive_cache_timeout() -> None:
+ """
+ Test that extra_validator accepts positive cache timeout values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps(
+ {
+ "metadata_cache_timeout": {
+ "schema_cache_timeout": 600,
+ "table_cache_timeout": 1200,
+ }
+ }
+ ),
+ }
+ result = schema.load(payload)
+ extra = json.loads(result["extra"])
+ assert extra["metadata_cache_timeout"]["schema_cache_timeout"] == 600
+ assert extra["metadata_cache_timeout"]["table_cache_timeout"] == 1200
+
+
+def test_extra_validator_rejects_non_dict_metadata_cache_timeout() -> None:
+ """
+ Test that extra_validator rejects metadata_cache_timeout when it is not a
dict.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "extra": json.dumps({"metadata_cache_timeout": 600}),
+ }
+ with pytest.raises(ValidationError) as exc_info:
+ schema.load(payload)
+ assert "metadata_cache_timeout must be a mapping" in str(exc_info.value)
+
+
+def test_cache_timeout_rejects_values_below_minus_one() -> None:
+ """
+ Test that cache_timeout rejects values less than -1.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "cache_timeout": -5,
+ }
+ with pytest.raises(ValidationError):
+ schema.load(payload)
+
+
+def test_cache_timeout_allows_minus_one() -> None:
+ """
+ Test that cache_timeout allows -1 (bypass cache).
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "cache_timeout": -1,
+ }
+ result = schema.load(payload)
+ assert result["cache_timeout"] == -1
+
+
+def test_cache_timeout_allows_zero_and_positive() -> None:
+ """
+ Test that cache_timeout allows 0 and positive values.
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ for value in (0, 300, 86400):
+ payload = {
+ "database_name": "test_db",
+ "cache_timeout": value,
+ }
+ result = schema.load(payload)
+ assert result["cache_timeout"] == value
+
+
+def test_cache_timeout_allows_none() -> None:
+ """
+ Test that cache_timeout allows None (use global default).
+ """
+ from superset.databases.schemas import DatabasePostSchema
+
+ schema = DatabasePostSchema()
+ payload = {
+ "database_name": "test_db",
+ "cache_timeout": None,
+ }
+ result = schema.load(payload)
Review Comment:
Local test dict, mypy infers this. Not something we annotate. Resolving.
##########
superset/databases/schemas.py:
##########
@@ -277,6 +277,35 @@ def extra_validator(value: str) -> str:
)
]
)
+
+ metadata_cache_timeout = extra_.get("metadata_cache_timeout")
+ if metadata_cache_timeout is None:
+ metadata_cache_timeout = {}
+ if not isinstance(metadata_cache_timeout, dict):
+ raise ValidationError(
+ [
+ _(
+ "The metadata_cache_timeout must be a mapping from "
+ "string keys to non-negative integer values."
+ )
+ ]
+ )
+ for key in (
+ "schema_cache_timeout",
+ "table_cache_timeout",
+ "catalog_cache_timeout",
+ ):
+ timeout = metadata_cache_timeout.get(key)
Review Comment:
These are locals inside the validator, mypy infers them fine. We annotate
signatures, not every local. Resolving.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
