From b7ea38874b62b03a59f757ac4d5f0df3c26ec1b7 Mon Sep 17 00:00:00 2001
From: "Zheng, Qi" <huaiqing.zq@antgroup.com>
Date: Mon, 4 Sep 2023 17:32:34 +0800
Subject: [PATCH] [init-aecs] Support PCCS URL overwritten by env
 UA_ENV_PCCS_URL

---
 tools/init_aecs/src/main.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/init_aecs/src/main.rs b/tools/init_aecs/src/main.rs
index 5815d0a1..14b7e4b5 100644
--- a/tools/init_aecs/src/main.rs
+++ b/tools/init_aecs/src/main.rs
@@ -178,7 +178,11 @@ fn main() -> Result<(), Box<dyn Error>> {
     let server_addr =
         CString::new(env::var("OCCLUM_INIT_RA_KMS_SERVER").unwrap_or(init_ra_conf.kms_server))
             .unwrap();
-    env::set_var("UA_ENV_PCCS_URL", init_ra_conf.ua_env_pccs_url.clone());
+
+    // Set UA_ENV_PCCS_URL env if not set before
+    if env::var("UA_ENV_PCCS_URL").is_err() {
+        env::set_var("UA_ENV_PCCS_URL", init_ra_conf.ua_env_pccs_url.clone());
+    }
 
     // Get the key of FS image if needed
     let key = match &image_config.image_type[..] {