mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Alexey MilovidovandClaude Opus 4.8
295ced78d1
Follow-up to #105171, which added `ruff` with a deliberately narrow, bug-class-only rule set and left the unused-name and star-import rules off pending a dedicated cleanup pass. This enables that second batch in `pyproject.toml` and fixes every violation across the tree (the bulk in integration tests): - `F401` unused-import and `F841` unused-variable: removed, preserving any side-effecting right-hand side (e.g. `result = node.query(...)` becomes `node.query(...)`). Two `try: import ...` feature probes are kept with `# noqa: F401`. - `F541` f-string-missing-placeholders: dropped the redundant `f` prefix. - `F403`/`F405` star imports: every `from module import *` is expanded into explicit imports of the names actually used, taken from each name's real origin, so stdlib/third-party names import from their real source rather than through a test "convenience bundle". The now-empty `tests/integration/helpers/kafka/common_direct.py` bundle is removed and its three remaining consumers import `_VarintBytes`/`KafkaAdminClient` directly. Eliminating the star imports surfaced a real bug the wildcard had masked from `F821`: `generate_presets.py` in `test_prometheus_protocols` called an undefined `execute_instant_query_with_http_api`; fixed to the existing `execute_query_via_http_api`. No `black`/`isort` reformatting was applied (neither is enforced in the style check), so the diff is limited to the lint fixes themselves. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
60 lines
1.8 KiB
Python
60 lines
1.8 KiB
Python
import os
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.test_tools import assert_logs_contain_with_retry
|
|
|
|
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
|
|
cluster = ClickHouseCluster(__file__)
|
|
node = cluster.add_instance("node", user_configs=["configs/empty_settings.xml"])
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def reset_to_normal_settings_after_test():
|
|
try:
|
|
node.copy_file_to_container(
|
|
os.path.join(SCRIPT_DIR, "configs/empty_settings.xml"),
|
|
"/etc/clickhouse-server/config.d/z.xml",
|
|
)
|
|
node.query("SYSTEM RELOAD CONFIG")
|
|
yield
|
|
finally:
|
|
pass
|
|
|
|
|
|
# @pytest.mark.parametrize("reload_strategy", ["force", "timeout"])
|
|
def test_reload_query_masking_rules():
|
|
# At first, empty configuration is fed to ClickHouse. The query
|
|
# "SELECT 'TOPSECRET.TOPSECRET'" will not be redacted, and the new masking
|
|
# event will not be registered
|
|
node.query("SELECT 'TOPSECRET.TOPSECRET'")
|
|
assert_logs_contain_with_retry(node, "SELECT 'TOPSECRET.TOPSECRET'")
|
|
assert not node.contains_in_log(r"SELECT '\[hidden\]'")
|
|
node.rotate_logs()
|
|
|
|
node.copy_file_to_container(
|
|
os.path.join(SCRIPT_DIR, "configs/changed_settings.xml"),
|
|
"/etc/clickhouse-server/config.d/z.xml",
|
|
)
|
|
|
|
node.query("SYSTEM RELOAD CONFIG")
|
|
|
|
# Now the same query will be redacted in the logs and the counter of events
|
|
# will be incremented
|
|
node.query("SELECT 'TOPSECRET.TOPSECRET'")
|
|
|
|
assert_logs_contain_with_retry(node, r"SELECT '\[hidden\]'")
|
|
assert not node.contains_in_log("SELECT 'TOPSECRET.TOPSECRET'")
|
|
|
|
node.rotate_logs()
|