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]>
113 lines
3.4 KiB
Python
113 lines
3.4 KiB
Python
import os
|
|
import sys
|
|
|
|
import grpc
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
script_dir = os.path.dirname(os.path.realpath(__file__))
|
|
pb2_dir = os.path.join(script_dir, "pb2")
|
|
if pb2_dir not in sys.path:
|
|
sys.path.append(pb2_dir)
|
|
import clickhouse_grpc_pb2 # Execute pb2/generate.py to generate these modules.
|
|
import clickhouse_grpc_pb2_grpc
|
|
|
|
# The test cluster is configured with certificate for that host name, see 'server-ext.cnf'.
|
|
# The client have to verify server certificate against that name. Client uses SNI
|
|
SSL_HOST = "integration-tests.clickhouse.com"
|
|
GRPC_PORT = 9100
|
|
DEFAULT_ENCODING = "utf-8"
|
|
|
|
|
|
# Utilities
|
|
|
|
config_dir = os.path.join(script_dir, "./configs")
|
|
cluster = ClickHouseCluster(__file__)
|
|
node = cluster.add_instance(
|
|
"node",
|
|
main_configs=[
|
|
"configs/grpc_config.xml",
|
|
"configs/server-key.pem",
|
|
"configs/server-cert.pem",
|
|
"configs/ca-cert.pem",
|
|
],
|
|
# Bug in TSAN reproduces in this test https://github.com/grpc/grpc/issues/29550#issuecomment-1188085387
|
|
env_variables={
|
|
"TSAN_OPTIONS": "report_atomic_races=0 " + os.getenv("TSAN_OPTIONS", default="")
|
|
},
|
|
)
|
|
|
|
|
|
def get_grpc_url(instance=node):
|
|
return f"{instance.ip_address}:{GRPC_PORT}"
|
|
|
|
|
|
def create_secure_channel():
|
|
ca_cert = open(os.path.join(config_dir, "ca-cert.pem"), "rb").read()
|
|
client_key = open(os.path.join(config_dir, "client-key.pem"), "rb").read()
|
|
client_cert = open(os.path.join(config_dir, "client-cert.pem"), "rb").read()
|
|
credentials = grpc.ssl_channel_credentials(ca_cert, client_key, client_cert)
|
|
channel = grpc.secure_channel(
|
|
get_grpc_url(),
|
|
credentials,
|
|
options=(("grpc.ssl_target_name_override", SSL_HOST),),
|
|
)
|
|
grpc.channel_ready_future(channel).result(timeout=10)
|
|
return channel
|
|
|
|
|
|
def create_insecure_channel():
|
|
channel = grpc.insecure_channel(get_grpc_url())
|
|
grpc.channel_ready_future(channel).result(timeout=2)
|
|
return channel
|
|
|
|
|
|
def create_secure_channel_with_wrong_client_certificate():
|
|
ca_cert = open(os.path.join(config_dir, "ca-cert.pem"), "rb").read()
|
|
client_key = open(os.path.join(config_dir, "wrong-client-key.pem"), "rb").read()
|
|
client_cert = open(os.path.join(config_dir, "wrong-client-cert.pem"), "rb").read()
|
|
credentials = grpc.ssl_channel_credentials(ca_cert, client_key, client_cert)
|
|
channel = grpc.secure_channel(get_grpc_url(), credentials)
|
|
grpc.channel_ready_future(channel).result(timeout=2)
|
|
return channel
|
|
|
|
|
|
def query(query_text, channel):
|
|
query_info = clickhouse_grpc_pb2.QueryInfo(query=query_text)
|
|
stub = clickhouse_grpc_pb2_grpc.ClickHouseStub(channel)
|
|
result = stub.ExecuteQuery(query_info)
|
|
if result and result.HasField("exception"):
|
|
raise Exception(result.exception.display_text)
|
|
return result.output.decode(DEFAULT_ENCODING)
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def start_cluster():
|
|
cluster.start()
|
|
try:
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
# Actual tests
|
|
|
|
|
|
def test_secure_channel():
|
|
with create_secure_channel() as channel:
|
|
assert query("SELECT 'ok'", channel) == "ok\n"
|
|
|
|
|
|
def test_insecure_channel():
|
|
with pytest.raises(grpc.FutureTimeoutError):
|
|
with create_insecure_channel() as channel:
|
|
query("SELECT 'ok'", channel)
|
|
|
|
|
|
def test_wrong_client_certificate():
|
|
with pytest.raises(grpc.FutureTimeoutError):
|
|
with create_insecure_channel() as channel:
|
|
query("SELECT 'ok'", channel)
|