From aa610c49f5a24e3e858515d9dfe0872d43251ee5 Mon Sep 17 00:00:00 2001
From: ItsMeShashank <shashank.attarde@juspay.in>
Date: Tue, 9 May 2023 12:03:07 +0530
Subject: [PATCH] fix(router): fix recursion bug in straight through algorithm
 (#1080)

---
 Cargo.lock                     | 10 +++++-----
 crates/api_models/src/admin.rs | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 46c98b30cc..82cc4015a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2950,7 +2950,7 @@ dependencies = [
 [[package]]
 name = "opentelemetry"
 version = "0.18.0"
-source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
 dependencies = [
  "opentelemetry_api",
  "opentelemetry_sdk",
@@ -2959,7 +2959,7 @@ dependencies = [
 [[package]]
 name = "opentelemetry-otlp"
 version = "0.11.0"
-source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
 dependencies = [
  "async-trait",
  "futures",
@@ -2976,7 +2976,7 @@ dependencies = [
 [[package]]
 name = "opentelemetry-proto"
 version = "0.1.0"
-source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
 dependencies = [
  "futures",
  "futures-util",
@@ -2988,7 +2988,7 @@ dependencies = [
 [[package]]
 name = "opentelemetry_api"
 version = "0.18.0"
-source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
 dependencies = [
  "fnv",
  "futures-channel",
@@ -3003,7 +3003,7 @@ dependencies = [
 [[package]]
 name = "opentelemetry_sdk"
 version = "0.18.0"
-source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
+source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658"
 dependencies = [
  "async-trait",
  "crossbeam-channel",
diff --git a/crates/api_models/src/admin.rs b/crates/api_models/src/admin.rs
index 8e1302f518..9bf375182d 100644
--- a/crates/api_models/src/admin.rs
+++ b/crates/api_models/src/admin.rs
@@ -275,25 +275,41 @@ pub enum StraightThroughAlgorithm {
     Single(api_enums::RoutableConnectors),
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(tag = "type", content = "data", rename_all = "snake_case")]
+pub enum StraightThroughAlgorithmInner {
+    Single(api_enums::RoutableConnectors),
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum StraightThroughAlgorithmSerde {
-    Direct(StraightThroughAlgorithm),
-    Nested { algorithm: StraightThroughAlgorithm },
+    Direct(StraightThroughAlgorithmInner),
+    Nested {
+        algorithm: StraightThroughAlgorithmInner,
+    },
 }
 
 impl From<StraightThroughAlgorithmSerde> for StraightThroughAlgorithm {
     fn from(value: StraightThroughAlgorithmSerde) -> Self {
-        match value {
+        let inner = match value {
             StraightThroughAlgorithmSerde::Direct(algorithm) => algorithm,
             StraightThroughAlgorithmSerde::Nested { algorithm } => algorithm,
+        };
+
+        match inner {
+            StraightThroughAlgorithmInner::Single(conn) => Self::Single(conn),
         }
     }
 }
 
 impl From<StraightThroughAlgorithm> for StraightThroughAlgorithmSerde {
     fn from(value: StraightThroughAlgorithm) -> Self {
-        Self::Nested { algorithm: value }
+        let inner = match value {
+            StraightThroughAlgorithm::Single(conn) => StraightThroughAlgorithmInner::Single(conn),
+        };
+
+        Self::Nested { algorithm: inner }
     }
 }