xenoslib 0.1.29.19__tar.gz → 0.1.29.21__tar.gz

{xenoslib-0.1.29.19/xenoslib.egg-info → xenoslib-0.1.29.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xenoslib
-Version: 0.1.29.19
+Version: 0.1.29.21
 Summary: Xenos' common lib
 Home-page: https://github.com/XenosLu/xenoslib.git
 Author: Xenocider

{xenoslib-0.1.29.19 → xenoslib-0.1.29.21}/xenoslib/about.py

@@ -4,4 +4,4 @@ __url__ = "https://github.com/XenosLu/xenoslib.git"
 __author__ = "Xenocider"
 __author_email__ = "xenos.lu@gmail.com"
 __license__ = "MIT License"
-__version__ = "0.1.29.19"
+__version__ = "0.1.29.21"

{xenoslib-0.1.29.19 → xenoslib-0.1.29.21}/xenoslib/extend.py

@@ -221,10 +221,11 @@ class ConfigLoader(SingletonWithArgs):
         with open(config_file_path, "r") as f:
             self._raw_config = yaml.safe_load(f) or {}
 
-        if not self.vault_client and vault_secret_id is not None:
-            self._init_vault_client(vault_secret_id)
+        if vault_secret_id is not None:
+            self.vault_secret_id = vault_secret_id
+            self._check_and_renew_vault_client()
 
-    def _init_vault_client(self, vault_secret_id):
+    def _init_vault_client(self):
         """Initialize and authenticate the Vault client (imports hvac on demand).
 
         Args:
@@ -251,12 +252,19 @@ class ConfigLoader(SingletonWithArgs):
             if not all([vault_url, vault_space, vault_role_id]):
                 raise KeyError("Missing required Vault configuration in config.yml")
 
-            self.vault_client = hvac.Client(url=vault_url, namespace=vault_space)
-            self.vault_client.auth.approle.login(role_id=vault_role_id, secret_id=vault_secret_id)
+            self.vault_client = hvac.Client(url=vault_url, namespace=vault_space, timeout=45)
+            help(hvac.Client)
+            self.vault_client.auth.approle.login(role_id=vault_role_id, secret_id=self.vault_secret_id)
         except Exception as e:
             self.vault_client = None
             raise Exception(f"Failed to initialize Vault client: {str(e)}")
 
+    def _check_and_renew_vault_client(self):
+        # 检查当前Token的状态，包括过期时间和可续租性
+        if not self.vault_client or not self.vault_client.is_authenticated():
+            # 如果当前Token无效，则重新认证
+            self._init_vault_client()
+
     def get(self, section, key_name, use_cache=True):
         """Retrieve a configuration value.
 
@@ -366,5 +374,5 @@ if __name__ == "__main__":
 
     # This will only work if you provide a valid Vault secret ID
     # and hvac package is installed
-    config_with_vault = ConfigLoader("config.yml", vault_secret_id="your-secret-id")
+    config_with_vault = ConfigLoader("config.yml", vault_secret_id=os.getenv("VAULT_CF_LANDSCAPES_SECRET_ID"))
     print("With Vault:", config_with_vault.get("cis", "cis_client_id"))

{xenoslib-0.1.29.19 → xenoslib-0.1.29.21/xenoslib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xenoslib
-Version: 0.1.29.19
+Version: 0.1.29.21
 Summary: Xenos' common lib
 Home-page: https://github.com/XenosLu/xenoslib.git
 Author: Xenocider