xenoslib 0.1.29.22__tar.gz → 0.1.29.24__tar.gz

{xenoslib-0.1.29.22/xenoslib.egg-info → xenoslib-0.1.29.24}/PKG-INFO

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

{xenoslib-0.1.29.22 → xenoslib-0.1.29.24}/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.22"
+__version__ = "0.1.29.24"

{xenoslib-0.1.29.22 → xenoslib-0.1.29.24}/xenoslib/extend.py

@@ -253,7 +253,9 @@ class ConfigLoader(SingletonWithArgs):
                 raise KeyError("Missing required Vault configuration in config.yml")
 
             self.vault_client = hvac.Client(url=vault_url, namespace=vault_space, timeout=45)
-            self.vault_client.auth.approle.login(role_id=vault_role_id, secret_id=self.vault_secret_id)
+            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)}")
@@ -323,6 +325,11 @@ class ConfigLoader(SingletonWithArgs):
         try:
             vault_path = self._raw_config[section]["vault_path"]
             vault_key = self._raw_config[section][f"{key_name}@vault"]
+            vault_namepsace = self._raw_config[section].get("vault_namespace")
+            if vault_namepsace:
+                self.vault_client.adapter.namespace = vault_namepsace
+            else:
+                self.vault_client.adapter.namespace = self._raw_config["vault"]["space"]
             data = self.vault_client.secrets.kv.read_secret_version(
                 path=vault_path, mount_point="kv", raise_on_deleted_version=True
             )
@@ -355,6 +362,13 @@ class SectionProxy:
         """Dictionary-style access to configuration values."""
         return self._loader.get(self._section, key)
 
+    def get(self, key, default=None):
+        """Dictionary-style access to configuration values."""
+        try:
+            return self._loader.get(self._section, key)
+        except KeyError:
+            return default
+
     def __getattr__(self, key):
         """Attribute-style access to configuration values."""
         try:
@@ -373,5 +387,8 @@ 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=os.getenv("VAULT_CF_LANDSCAPES_SECRET_ID"))
-    print("With Vault:", config_with_vault.get("cis", "cis_client_id"))
+    config_with_vault = ConfigLoader("config.yml", vault_secret_id=os.getenv("VAULT_SECRET_ID"))
+
+    print("With Vault:", config_with_vault.test.test)
+    print("With Vault:", config_with_vault["cis"]["cis_client_id"])
+    print("Try val not exists: ", config_with_vault.test.get("not_exists"))

{xenoslib-0.1.29.22 → xenoslib-0.1.29.24/xenoslib.egg-info}/PKG-INFO

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