From e80ca05a2e62df977ad88a5b3a3c6dca59a61f2f Mon Sep 17 00:00:00 2001
From: weisd <im@weisd.in>
Date: Tue, 10 Dec 2024 20:47:48 +0800
Subject: [PATCH] fix init_global_action_cred

---
 rustfs/src/main.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/rustfs/src/main.rs b/rustfs/src/main.rs
index 35c0dfc53..fe7f2eb62 100644
--- a/rustfs/src/main.rs
+++ b/rustfs/src/main.rs
@@ -89,7 +89,18 @@ async fn run(opt: config::Opt) -> Result<()> {
 
     debug!("server_address {}", &server_address);
 
-    iam::init_global_action_cred(None, None).unwrap();
+    //设置AK和SK
+    //其中部份内容从config配置文件中读取
+    let mut access_key = String::from_str(config::DEFAULT_ACCESS_KEY).unwrap();
+    let mut secret_key = String::from_str(config::DEFAULT_SECRET_KEY).unwrap();
+
+    // Enable authentication
+    if let (Some(ak), Some(sk)) = (opt.access_key, opt.secret_key) {
+        access_key = ak;
+        secret_key = sk;
+    }
+
+    iam::init_global_action_cred(Some(access_key.clone()), Some(secret_key.clone())).unwrap();
     set_global_rustfs_port(server_port);
 
     //监听地址,端口从参数中获取
@@ -124,16 +135,7 @@ async fn run(opt: config::Opt) -> Result<()> {
         let store = storage::ecfs::FS::new();
         // let mut b = S3ServiceBuilder::new(storage::ecfs::FS::new(server_address.clone(), endpoint_pools).await?);
         let mut b = S3ServiceBuilder::new(store.clone());
-        //设置AK和SK
-        //其中部份内容从config配置文件中读取
-        let mut access_key = String::from_str(config::DEFAULT_ACCESS_KEY).unwrap();
-        let mut secret_key = String::from_str(config::DEFAULT_SECRET_KEY).unwrap();
 
-        // Enable authentication
-        if let (Some(ak), Some(sk)) = (opt.access_key, opt.secret_key) {
-            access_key = ak;
-            secret_key = sk;
-        }
         //显示info信息
         info!("authentication is enabled {}, {}", &access_key, &secret_key);
         b.set_auth(IAMAuth::new(access_key, secret_key));