From c085e460be019a8c5db4f9e3c99f63495dd2b851 Mon Sep 17 00:00:00 2001
From: Sanchith Hegde <22217505+SanchithHegde@users.noreply.github.com>
Date: Fri, 10 Mar 2023 14:40:22 +0530
Subject: [PATCH] refactor(client): remove dependence on `ROUTER_HTTP_PROXY`
 and `ROUTER_HTTPS_PROXY` env vars (#730)

---
 crates/router/src/services/api/client.rs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/crates/router/src/services/api/client.rs b/crates/router/src/services/api/client.rs
index 368f7cf4d6..ae4a17bd3c 100644
--- a/crates/router/src/services/api/client.rs
+++ b/crates/router/src/services/api/client.rs
@@ -8,9 +8,6 @@ use crate::{
     core::errors::{self, CustomResult},
 };
 
-const HTTP_PROXY: &str = "ROUTER_HTTP_PROXY";
-const HTTPS_PROXY: &str = "ROUTER_HTTPS_PROXY";
-
 static PLAIN_CLIENT: OnceCell<reqwest::Client> = OnceCell::new();
 static HTTPS_PROXY_CLIENT: OnceCell<reqwest::Client> = OnceCell::new();
 static HTTP_PROXY_CLIENT: OnceCell<reqwest::Client> = OnceCell::new();
@@ -22,15 +19,9 @@ enum ProxyType {
 
 impl ProxyType {
     fn get_proxy_url(&self, proxy: &Proxy) -> Option<String> {
-        use std::env::var;
-
         match self {
-            Self::Http => var(HTTP_PROXY)
-                .or_else(|_| proxy.http_url.clone().ok_or(()))
-                .ok(),
-            Self::Https => var(HTTPS_PROXY)
-                .or_else(|_| proxy.https_url.clone().ok_or(()))
-                .ok(),
+            Self::Http => proxy.http_url.clone(),
+            Self::Https => proxy.https_url.clone(),
         }
     }
 }