sprintfix: 变量规范 & 修复节点管理重装操作不显示密码的问题

TencentBlueKing · Sep 5, 2023 · 3f51587 · 3f51587
1 parent bcb8650
commit 3f51587
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/config/default.py b/config/default.py
@@ -807,7 +807,7 @@ def check_engine_admin_permission(request, *args, **kwargs):
 }
 
 # 加密
-if env.BKPAAS_CRYPTO_TYPE == "SHANGMI":
+if env.BKPAAS_BK_CRYPTO_TYPE == "SHANGMI":
     BKCRYPTO_ASYMMETRIC_CIPHER_TYPE = bkcrypto_constants.AsymmetricCipherType.SM2.value
     BKCRYPTO.update(
         {

diff --git a/env.py b/env.py
@@ -111,4 +111,4 @@
 
 
 # 获取加密类型
-BKPAAS_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"
+BKPAAS_BK_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -283,8 +283,8 @@
         if (node_type === "PROXY") {
             self.columns.push(...proxy_columns);
         }
-        // 安装 / 卸载需要认证信息
-        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+        // 安装 / 重装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL" || op_type === "REINSTALL") {
             self.columns.push(...auth_columns);
         }
         // 非卸载场景需要配置信息

diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js
@@ -281,8 +281,8 @@
         if (node_type === "PROXY") {
             self.columns.push(...proxy_columns);
         }
-        // 安装 / 卸载需要认证信息
-        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+        // 安装 / 重装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL" || op_type === "REINSTALL") {
             self.columns.push(...auth_columns);
         }
         // 非卸载场景需要配置信息
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,4 +111,4 @@


		# 获取加密类型
		BKPAAS_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"
		BKPAAS_BK_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"