Fix/template cache bug (#27)

* Fix templated route caching for passthrough api * Remove caching for passthrough api
picahq · May 17, 2024 · 765a272 · 765a272
1 parent 9e4aefe
commit 765a272
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 31 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "integrationos-domain"
 description = "Shared library for IntegrationOS"
 license = "GPL-3.0"
-version = "4.1.5"
+version = "4.1.6"
 edition = "2021"
 repository = "https://github.com/integration-os/integrationos-domain"
 

diff --git a/src/service/client/unified_destination_client.rs b/src/service/client/unified_destination_client.rs
@@ -1084,39 +1084,34 @@ impl UnifiedDestination {
                 })?
         };
 
-        let config_fut = self
-            .connection_model_definitions_destination_cache
-            .try_get_with_by_ref(destination, async {
-                match self.get_connection_model_definition(destination).await {
+        let config = match self.get_connection_model_definition(destination).await {
+            Ok(Some(c)) => Ok(Arc::new(c)),
+            Ok(None) => Err(InternalError::key_not_found(
+                "ConnectionModelDefinition",
+                None,
+            )),
+            Err(e) => Err(InternalError::connection_error(e.message().as_ref(), None)),
+        }?;
+
+        let secret = self
+            .secrets_cache
+            .try_get_with_by_ref(&connection, async {
+                let secret_request = GetSecretRequest {
+                    buildable_id: connection.ownership.id.to_string(),
+                    id: connection.secrets_service_id.clone(),
+                };
+                match self
+                    .secrets_client
+                    .decrypt(&secret_request)
+                    .map(|v| Some(v).transpose())
+                    .await
+                {
                     Ok(Some(c)) => Ok(Arc::new(c)),
-                    Ok(None) => Err(InternalError::key_not_found(
-                        "ConnectionModelDefinition",
-                        None,
-                    )),
+                    Ok(None) => Err(InternalError::key_not_found("Secrets", None)),
                     Err(e) => Err(InternalError::connection_error(e.message().as_ref(), None)),
                 }
-            });
-
-        let secret_fut = self.secrets_cache.try_get_with_by_ref(&connection, async {
-            let secret_request = GetSecretRequest {
-                buildable_id: connection.ownership.id.to_string(),
-                id: connection.secrets_service_id.clone(),
-            };
-            match self
-                .secrets_client
-                .decrypt(&secret_request)
-                .map(|v| Some(v).transpose())
-                .await
-            {
-                Ok(Some(c)) => Ok(Arc::new(c)),
-                Ok(None) => Err(InternalError::key_not_found("Secrets", None)),
-                Err(e) => Err(InternalError::connection_error(e.message().as_ref(), None)),
-            }
-        });
-
-        let join_result = join!(config_fut, secret_fut);
-        let config = join_result.0?;
-        let secret = join_result.1?;
+            })
+            .await?;
 
         // Template the route for passthrough actions
         let templated_config = match &destination.action {