From 79fce642765ff0515eb727e6913d13ef68619dd6 Mon Sep 17 00:00:00 2001 From: bensonhome <410554565@qq.com> Date: Mon, 29 Jul 2024 11:20:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:client-=E6=89=93=E5=8D=B0=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/node/localtask/codecounttask.py | 4 ++-- client/node/localtask/localrunner.py | 1 + client/node/localtask/requestmodify.py | 12 +++++++----- client/node/localtask/runlocaltask.py | 8 ++++---- client/node/servertask/looprunner.py | 5 +++-- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/client/node/localtask/codecounttask.py b/client/node/localtask/codecounttask.py index c5b58efc8..537de9e2e 100644 --- a/client/node/localtask/codecounttask.py +++ b/client/node/localtask/codecounttask.py @@ -20,7 +20,7 @@ class CodeCountTask(object): @staticmethod def run_count_line_task(request_list, task_name_id_maps, job_id, scm_auth_info, token, server_url, source_dir, - scm_info, origin_os_env): + scm_info, origin_os_env, create_from): """ 统计代码行 :param request_list: @@ -38,7 +38,7 @@ def run_count_line_task(request_list, task_name_id_maps, job_id, scm_auth_info, RequestModify.modify_local_task_request(request, task_name_id_maps, job_id, scm_auth_info.ssh_file, token, server_url, source_dir, scm_info, - scm_auth_info) + scm_auth_info, create_from) # 执行单个任务扫描 logger.info("启动 linecount 工具统计代码行...") task = SingleTaskRuner(request, env=origin_os_env).run() diff --git a/client/node/localtask/localrunner.py b/client/node/localtask/localrunner.py index 43123406a..5783e19c3 100644 --- a/client/node/localtask/localrunner.py +++ b/client/node/localtask/localrunner.py @@ -344,6 +344,7 @@ def _get_proj_config(self, repo_id, proj_id, org_sid, team_name): def run(self): """执行本地项目扫描 """ + LogPrinter.info(f"start from {self._create_from}.") self._job_start_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time())) try: diff --git a/client/node/localtask/requestmodify.py b/client/node/localtask/requestmodify.py index 2e93a0cc5..10758ffd9 100644 --- a/client/node/localtask/requestmodify.py +++ b/client/node/localtask/requestmodify.py @@ -43,7 +43,7 @@ def add_params(task_request, job_context, scm_info, pre_cmd, build_cmd, project_ task_params['ignore_merged_issue'] = True @staticmethod - def modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info): + def modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from): """ 向task_request中添加参数 :param task_request: dict, 任务参数 @@ -51,6 +51,8 @@ def modify_task_request(task_request, token, server_url, source_dir, scm_info, s """ # 添加task_scene信息,标记任务运行场景 task_request['task_params']['task_scene'] = TaskScene.LOCAL + # 添加create_from参数 + task_request['task_params']['created_from'] = create_from # 将token, server_url放到task_params中,供task进度上报和代码行上报使用 task_request['task_params']['token'] = Crypto(settings.PASSWORD_KEY).encrypt(token) task_request['task_params']['server_url'] = server_url @@ -70,13 +72,13 @@ def modify_task_request(task_request, token, server_url, source_dir, scm_info, s @staticmethod def modify_local_task_request(task_request, task_name_id_maps, job_id, ssh_file, token, server_url, - source_dir, scm_info, scm_auth_info): + source_dir, scm_info, scm_auth_info, create_from): """ 本地任务,向task_request中添加参数 :param task_request: :return: """ - RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info) + RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from) # 添加 task_dir 信息 task_name = task_request["task_name"] task_id = task_name_id_maps.get(task_name) @@ -90,13 +92,13 @@ def modify_local_task_request(task_request, task_name_id_maps, job_id, ssh_file, task_request['task_params']['ssh_file'] = ssh_file @staticmethod - def modify_pri_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info): + def modify_pri_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from): """ 私有任务,向task_request中添加参数 :param task_request: :return: """ - RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info) + RequestModify.modify_task_request(task_request, token, server_url, source_dir, scm_info, scm_auth_info, create_from) # 在request中添加 task_dir 信息 task_id = task_request["id"] diff --git a/client/node/localtask/runlocaltask.py b/client/node/localtask/runlocaltask.py index 42f721687..075911494 100644 --- a/client/node/localtask/runlocaltask.py +++ b/client/node/localtask/runlocaltask.py @@ -79,7 +79,7 @@ def scan_project(self, execute_request_list, proj_conf): RequestModify.modify_local_task_request(task_request, self._task_name_id_maps, self._job_id, self._scm_auth_info.ssh_file, self._token, self._server_url, self._source_dir, self._scm_info, - self._scm_auth_info) + self._scm_auth_info, self._create_from) codecount_handler = LocalCountLine(task_request) codecount_handler.start_thread() else: @@ -88,14 +88,14 @@ def scan_project(self, execute_request_list, proj_conf): self._scm_auth_info, self._token, self._server_url, self._source_dir, self._scm_info, - self._origin_os_env) + self._origin_os_env, self._create_from) for task_request in execute_request_list: # 完善task request字段 RequestModify.modify_local_task_request(task_request, self._task_name_id_maps, self._job_id, self._scm_auth_info.ssh_file, self._token, self._server_url, self._source_dir, self._scm_info, - self._scm_auth_info) + self._scm_auth_info, self._create_from) # 通过环境变量获取并发执行开关 concurrent_task_env = os.getenv("TCA_CONCURRENT_SCAN") @@ -189,7 +189,7 @@ def _wait_and_run_private_procs(self, project_id, job_id): task_list = rt_data["tasks"] for task_request in task_list: RequestModify.modify_pri_task_request(task_request, self._token, self._server_url, self._source_dir, - self._scm_info, self._scm_auth_info) + self._scm_info, self._scm_auth_info, self._create_from) # 执行单个任务分析 task = SingleTaskRuner(task_request, env=self._origin_os_env).run() self._local_task_dirs.append(task_request["task_dir"]) diff --git a/client/node/servertask/looprunner.py b/client/node/servertask/looprunner.py index 8e16762be..89392f177 100644 --- a/client/node/servertask/looprunner.py +++ b/client/node/servertask/looprunner.py @@ -42,9 +42,10 @@ def __init__(self, args): self._token = args.token self._tag = args.tag self._org_sid = args.org_sid - self._create_from = args.create_from + self._create_from = args.create_from if args.create_from else "codedog_client" self._server_url = LocalConfig.get_server_url() - # 打印连接的sever地址 + # 打印启动渠道和连接的sever地址 + LogPrinter.info(f"start from {self._create_from}.") LogPrinter.info("using server: %s" % self._server_url) # 初始化与codedog服务器通信的api server实例 self._server = RetryDogServer(self._server_url, self._token).get_api_server() From eb83f4dc3e1938f2a0bfa5aae9032805f78ddb13 Mon Sep 17 00:00:00 2001 From: bensonhome <410554565@qq.com> Date: Mon, 29 Jul 2024 15:42:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=E6=9B=B4=E6=96=B0tca=5Flib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/base/install_bin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/base/install_bin.sh b/scripts/base/install_bin.sh index d835890c0..112c0efdd 100755 --- a/scripts/base/install_bin.sh +++ b/scripts/base/install_bin.sh @@ -8,8 +8,8 @@ source $TCA_SCRIPT_ROOT/utils.sh # 代码库根目录 TCA_ROOT=$( cd "$(dirname $TCA_SCRIPT_ROOT)"; pwd ) -LIB_GITHUB_URL=${LIB_GITHUB_URL:-"https://github.com/TCATools/tca_lib/releases/download/v20240716.3/tca_lib-v1.5.zip"} -LIB_GONGFENG_URL=${LIB_GONGFENG_URL:-"https://git.code.tencent.com/TCA/tca-tools/tca_lib.git#v20240716.3"} +LIB_GITHUB_URL=${LIB_GITHUB_URL:-"https://github.com/TCATools/tca_lib/releases/download/v20240729.1/tca_lib-v1.6.zip"} +LIB_GONGFENG_URL=${LIB_GONGFENG_URL:-"https://git.code.tencent.com/TCA/tca-tools/tca_lib.git#v20240729.1"} LIB_DIR_NAME="tca_lib"