--- ../../tests/ci/env_helper.py 2023-06-07 01:57:42.148514 +0000 +++ ../../tests/ci/env_helper.py 2023-06-07 02:01:08.871149 +0000 @@ -12,11 +12,11 @@ CACHES_PATH = os.getenv("CACHES_PATH", TEMP_PATH) CLOUDFLARE_TOKEN = os.getenv("CLOUDFLARE_TOKEN") GITHUB_EVENT_PATH = os.getenv("GITHUB_EVENT_PATH", "") GITHUB_JOB = os.getenv("GITHUB_JOB", "local") -DOCKER_REPO = os.getenv("DOCKER_REPO","docker.io") +DOCKER_REPO = os.getenv("DOCKER_REPO", "docker.io") DOCKER_USER = os.getenv("DOCKER_USER", "robotclickhouse") GITHUB_REPOSITORY = os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse") GITHUB_RUN_ID = os.getenv("GITHUB_RUN_ID", "0") GITHUB_SERVER_URL = os.getenv("GITHUB_SERVER_URL", "https://github.com") GITHUB_WORKSPACE = os.getenv("GITHUB_WORKSPACE", git_root) @@ -26,11 +26,11 @@ REPO_COPY = os.getenv("REPO_COPY", git_root) RUNNER_TEMP = os.getenv("RUNNER_TEMP", p.abspath(p.join(module_dir, "./tmp"))) S3_REGION = os.getenv("S3_REGION", "us-east-1") S3_BUILDS_BUCKET = os.getenv("S3_BUILDS_BUCKET", "clickhouse-builds") S3_TEST_REPORTS_BUCKET = os.getenv("S3_TEST_REPORTS_BUCKET", "clickhouse-test-reports") -S3_ENDPOINT = os.getenv("S3_ENDPOINT","https://s3.amazonaws.com") +S3_ENDPOINT = os.getenv("S3_ENDPOINT", "https://s3.amazonaws.com") VAULT_PATH = os.getenv("VAULT_PATH") VAULT_TOKEN = os.getenv("VAULT_TOKEN") VAULT_URL = os.getenv("VAULT_URL") VAULT_MOUNT_POINT = os.getenv("VAULT_MOUNT_POINT", "secret") S3_URL = os.getenv("S3_URL", "https://s3.amazonaws.com") would reformat ../../tests/ci/env_helper.py --- ../../tests/ci/get_robot_token.py 2023-06-07 01:57:42.148514 +0000 +++ ../../tests/ci/get_robot_token.py 2023-06-07 02:01:08.969888 +0000 @@ -8,26 +8,31 @@ from github import Github from github.AuthenticatedUser import AuthenticatedUser from env_helper import VAULT_URL, VAULT_TOKEN, VAULT_PATH, VAULT_MOUNT_POINT + @dataclass class Token: user: AuthenticatedUser value: str rest: int def get_parameter_from_ssm(name, decrypt=True, client=None): if VAULT_URL: if not client: - client = hvac.Client(url=VAULT_URL,token=VAULT_TOKEN) - parameter = client.secrets.kv.v2.read_secret_version(mount_point=VAULT_MOUNT_POINT,path=VAULT_PATH)["data"]["data"][name] + client = hvac.Client(url=VAULT_URL, token=VAULT_TOKEN) + parameter = client.secrets.kv.v2.read_secret_version( + mount_point=VAULT_MOUNT_POINT, path=VAULT_PATH + )["data"]["data"][name] else: if not client: client = boto3.client("ssm", region_name="us-east-1") - parameter = client.get_parameter(Name=name, WithDecryption=decrypt)["Parameter"]["Value"] + parameter = client.get_parameter(Name=name, WithDecryption=decrypt)[ + "Parameter" + ]["Value"] return parameter ROBOT_TOKEN = None # type: Optional[Token] @@ -39,20 +44,30 @@ client = None values = [] if VAULT_URL: - client = hvac.Client(url=VAULT_URL,token=VAULT_TOKEN) - parameters = client.secrets.kv.v2.read_secret_version(mount_point=VAULT_MOUNT_POINT,path=VAULT_PATH)["data"]["data"] - parameters = {key: value for key, value in parameters.items() if key.startswith(token_prefix_env_name)} + client = hvac.Client(url=VAULT_URL, token=VAULT_TOKEN) + parameters = client.secrets.kv.v2.read_secret_version( + mount_point=VAULT_MOUNT_POINT, path=VAULT_PATH + )["data"]["data"] + parameters = { + key: value + for key, value in parameters.items() + if key.startswith(token_prefix_env_name) + } assert parameters values = list(parameters.values()) else: client = boto3.client("ssm", region_name="us-east-1") parameters = client.describe_parameters( ParameterFilters=[ - {"Key": "Name", "Option": "BeginsWith", "Values": [token_prefix_env_name]} + { + "Key": "Name", + "Option": "BeginsWith", + "Values": [token_prefix_env_name], + } ] )["Parameters"] assert parameters for token_name in [p["Name"] for p in parameters]: value = get_parameter_from_ssm(token_name, True, client) would reformat ../../tests/ci/get_robot_token.py --- ../../tests/ci/docker_images_check.py 2023-06-07 01:57:42.148514 +0000 +++ ../../tests/ci/docker_images_check.py 2023-06-07 02:01:09.136067 +0000 @@ -13,11 +13,17 @@ from github import Github from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse from commit_status_helper import format_description, get_commit, post_commit_status -from env_helper import GITHUB_WORKSPACE, RUNNER_TEMP, GITHUB_RUN_URL, DOCKER_USER, DOCKER_REPO +from env_helper import ( + GITHUB_WORKSPACE, + RUNNER_TEMP, + GITHUB_RUN_URL, + DOCKER_USER, + DOCKER_REPO, +) from get_robot_token import get_best_robot_token, get_parameter_from_ssm from pr_info import PRInfo from report import TestResults, TestResult from s3_helper import S3Helper from stopwatch import Stopwatch would reformat ../../tests/ci/docker_images_check.py Oh no! 💥 💔 💥 3 files would be reformatted, 1068 files would be left unchanged.