From 366dccd187049cf539d708dfb5e4bb59f2d985ba Mon Sep 17 00:00:00 2001
From: "jingshun.tq" <35712518+Teingi@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:54:10 +0800
Subject: [PATCH 1/2] Rename Dockerfile to DockerFile

---
 build/{Dockerfile => DockerFile} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename build/{Dockerfile => DockerFile} (93%)

diff --git a/build/Dockerfile b/build/DockerFile
similarity index 93%
rename from build/Dockerfile
rename to build/DockerFile
index 60898428..4a0d7c9f 100644
--- a/build/Dockerfile
+++ b/build/DockerFile
@@ -8,4 +8,4 @@ RUN /opt/miniconda3/bin/conda init
 RUN /opt/miniconda3/bin/conda create --name obdiag python=3.8 -y
 RUN source /opt/miniconda3/bin/activate obdiag
 RUN /opt/miniconda3/envs/obdiag/bin/python3.8  -m pip install --upgrade pip setuptools wheel
-RUN yum install -y gcc gcc-c++ make
\ No newline at end of file
+RUN yum install -y gcc gcc-c++ make

From b34b350a09066c1f30237e2fe06ec147b790c279 Mon Sep 17 00:00:00 2001
From: Teingi <jingshun.tq@antgroup.com>
Date: Thu, 12 Dec 2024 20:44:45 +0800
Subject: [PATCH 2/2] remove the restriction that the sys tenant's password
 cannot be empty

---
 src/common/core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/core.py b/src/common/core.py
index 50ec82ad..805b6af9 100644
--- a/src/common/core.py
+++ b/src/common/core.py
@@ -168,8 +168,8 @@ def update_obcluster_nodes(self, config):
 
         ob_cluster = {"db_host": cluster_config.get("db_host"), "db_port": cluster_config.get("db_port"), "tenant_sys": {"user": cluster_config.get("tenant_sys", {}).get("user"), "password": cluster_config.get("tenant_sys", {}).get("password")}}
 
-        if not all(ob_cluster.values()) or not all(ob_cluster['tenant_sys'].values()):
-            raise ValueError("Missing required configuration values in ob_cluster or tenant_sys")
+        if not ob_cluster["db_host"] or not ob_cluster["db_port"] or not ob_cluster["tenant_sys"]["user"]:
+            raise ValueError("Missing required configuration values in ob_cluster or tenant_sys (excluding password)")
 
         if config_data.get('obcluster') and config_data.get('obcluster').get('servers') and config_data.get('obcluster').get('servers').get('nodes'):
             return