Merge pull request #21 from Infisical/daniel/fixes

(Fix): Python process hanging & schema issue, .NET attach to process env

Author: DanielHougaard

.gitignore

@@ -172,6 +172,8 @@ InfisicalClient.egg-info
 
 __pycache__
 crates/infisical-py/infisical_client/schemas.py
+crates/infisical-py/infisical_client/infisical_py.*.so
+crates/infisical-py/infisical_client/infisical_py.*.dll
 
 
 infisical_py.so

.vscode/settings.json

@@ -22,6 +22,8 @@
         "napi",
         "openapi",
         "openapitools",
+        "pyclass",
+        "pymethods",
         "quicktype",
         "reqwest",
         "rngs"

crates/infisical-py/Cargo.toml

@@ -10,8 +10,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.20.0", features = ["extension-module"] }
-pyo3-log = "0.9.0"
 infisical-json = { path = "../infisical-json" }
+env_logger = "0.10.1"
+log = "0.4.20"
 
 [build-dependencies]
 pyo3-build-config = { version = "0.20.0" }

crates/infisical-py/infisical_client/infisical_client.py

@@ -8,25 +8,25 @@
 from .schemas import CreateSecretOptions, ResponseForCreateSecretResponse
 
 from .schemas import EncryptSymmetricOptions, EncryptSymmetricResponse, ResponseForEncryptSymmetricResponse
-from .schemas import DecryptSymmetricOptions, DecryptSymmetricResponse, ResponseForDecryptSymmetricResponse
+from .schemas import DecryptSymmetricOptions, ResponseForDecryptSymmetricResponse
 
 from .schemas import ArbitraryOptions, ResponseForCreateSymmetricKeyResponse
 
 from .infisical_py import InfisicalClient as RustInfisicalClient
 import os
 
 class InfisicalClient:
-    def __init__(self, settings: ClientSettings = None):
+    def __init__(self, settings: ClientSettings = None, debug: bool = False):
 
         if settings is None:
-            self.inner = RustInfisicalClient(None)
+            self.inner = RustInfisicalClient(settings, debug)
         else:
 
             settings.user_agent = "infisical-python-sdk"
 
             settings_json = json.dumps(settings.to_dict())
 
-            self.inner = RustInfisicalClient(settings_json)
+            self.inner = RustInfisicalClient(settings_json, debug)
 
     def _run_command(self, command: Command) -> Any:
         response_json = self.inner.run_command(json.dumps(command.to_dict()))

crates/infisical-py/infisical_client/infisical_py.cpython-312-darwin.so

@@ -1,3 +1,4 @@
+extern crate log;
 use infisical_json::client::Client as JsonClient;
 use pyo3::prelude::*;
 
@@ -7,8 +8,14 @@ pub struct InfisicalClient(JsonClient);
 #[pymethods]
 impl InfisicalClient {
     #[new]
-    pub fn new(settings_string: Option<String>) -> Self {
-        pyo3_log::init();
+    pub fn new(settings_string: Option<String>, debug: Option<bool>) -> Self {
+        if debug.unwrap_or(false) == true {
+            // This will only fail if another logger was already initialized, so we can ignore the result
+            let _ = env_logger::Builder::from_default_env()
+                .filter_level(log::LevelFilter::Debug)
+                .try_init();
+        }
+
         Self(JsonClient::new(settings_string))
     }
 

crates/infisical-py/src/client.rs

@@ -20,7 +20,8 @@ pub struct Client {
 
 impl Client {
     pub fn new(settings_input: Option<ClientSettings>) -> Self {
-        let settings = settings_input.expect("Settings not found or were set improperly.");
+        // We should allow the user to not provide settings, so they can still use encryption methods that don't require authentication.
+        let settings = settings_input.unwrap_or(ClientSettings::default());
 
         let c = Self {
             auth: ClientAuth {

crates/infisical/src/client/client.rs

@@ -42,6 +42,15 @@ public SecretElement[] ListSecrets(ListSecretsOptions options)
 
         if (result is { Success: true })
         {
+
+            if (options.AttachToProcessEnv == true)
+            {
+                foreach (var secret in result.Data.Secrets)
+                {
+                    Environment.SetEnvironmentVariable(secret.SecretKey, secret.SecretValue);
+                }
+            }
+
             return result.Data.Secrets;
         }