minor: review fix

TencentBlueKing · Aug 10, 2023 · edbe108 · edbe108
1 parent 101c849
commit edbe108
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/base.py b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
@@ -141,9 +141,8 @@ def get_host_id_list(self, ip_str, executor, bk_cloud_id, bk_biz_id):
         # 如果开启了ipv6的逻辑，则执行
         if settings.ENABLE_IPV6:
             ipv6_list, ipv4_list, *_ = extract_ip_from_ip_str(ip_str)
-            ip_list = ipv4_list + ipv6_list
-            bk_host_id_dict_ipv6 = get_host_id_by_inner_ipv6(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
-            bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
+            bk_host_id_dict_ipv6 = get_host_id_by_inner_ipv6(executor, self.logger, bk_cloud_id, bk_biz_id, ipv6_list)
+            bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ipv4_list)
             return list(set(bk_host_id_dict_ipv6.values()) | set(bk_host_id_dict.values()))
 
         ip_list = get_ip_by_regex(ip_str)

diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
@@ -123,7 +123,7 @@ def execute(self, data, parent_data):
                     try:
                         auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
                     except Exception:
-                        # password is not encrypted
+                        self.logger.info("try to decrypt password error, use plaintext.")
                         pass
 
                     # auth_key加密