thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 11:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport #66523 to 24.6: Add additional log masking in CI

Browse Source
This commit is contained in:
robot-clickhouse 2024-07-15 16:08:30 +00:00
parent c4a8a058a9
commit 8f2aea832f
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/ci/functional_test_check.py
View File

@ -24,6 +24,18 @@ from tee_popen import TeePopen
NO_CHANGES_MSG = "Nothing to run" NO_CHANGES_MSG = "Nothing to run"
class SensitiveFormatter(logging.Formatter):
@staticmethod
def _filter(s):
return re.sub(
r"(.*)(AZURE_CONNECTION_STRING.*\')(.*)", r"\1AZURE_CONNECTION_STRING\3", s
)
def format(self, record):
original = logging.Formatter.format(self, record)
return self._filter(original)
def get_additional_envs( def get_additional_envs(
check_name: str, run_by_hash_num: int, run_by_hash_total: int check_name: str, run_by_hash_num: int, run_by_hash_total: int
) -> List[str]: ) -> List[str]:
@ -206,6 +218,9 @@ def parse_args():
def main(): def main():
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
for handler in logging.root.handlers:
# pylint: disable=protected-access
handler.setFormatter(SensitiveFormatter(handler.formatter._fmt)) # type: ignore
stopwatch = Stopwatch() stopwatch = Stopwatch()

16
tests/ci/stress_check.py
View File

@ -3,6 +3,7 @@
import csv import csv
import logging import logging
import os import os
import re
import subprocess import subprocess
import sys import sys
from pathlib import Path from pathlib import Path
@ -19,6 +20,18 @@ from stopwatch import Stopwatch
from tee_popen import TeePopen from tee_popen import TeePopen
class SensitiveFormatter(logging.Formatter):
@staticmethod
def _filter(s):
return re.sub(
r"(.*)(AZURE_CONNECTION_STRING.*\')(.*)", r"\1AZURE_CONNECTION_STRING\3", s
)
def format(self, record):
original = logging.Formatter.format(self, record)
return self._filter(original)
def get_additional_envs(check_name: str) -> List[str]: def get_additional_envs(check_name: str) -> List[str]:
result = [] result = []
azure_connection_string = get_parameter_from_ssm("azure_connection_string") azure_connection_string = get_parameter_from_ssm("azure_connection_string")
@ -114,6 +127,9 @@ def process_results(
def run_stress_test(docker_image_name: str) -> None: def run_stress_test(docker_image_name: str) -> None:
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
for handler in logging.root.handlers:
# pylint: disable=protected-access
handler.setFormatter(SensitiveFormatter(handler.formatter._fmt)) # type: ignore
stopwatch = Stopwatch() stopwatch = Stopwatch()
temp_path = Path(TEMP_PATH) temp_path = Path(TEMP_PATH)