From e7a6f3a1c8e52b0dd7032a4613f11ce267259e15 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram@metalbear.co>
Date: Thu, 22 Feb 2024 11:34:59 +0200
Subject: [PATCH] use_proxy configuration now applies to more commands (#2256)

* use_proxy configuration now applies to mirrord operator status, and mirrord ls

* add missing file
---
 changelog.d/+use-proxy-applies-to-more.changed.md | 1 +
 mirrord/cli/src/execution.rs                      | 8 ++------
 mirrord/cli/src/main.rs                           | 6 ++++++
 mirrord/cli/src/operator.rs                       | 4 ++++
 mirrord/cli/src/util.rs                           | 9 +++++++++
 5 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/+use-proxy-applies-to-more.changed.md
 create mode 100644 mirrord/cli/src/util.rs

diff --git a/changelog.d/+use-proxy-applies-to-more.changed.md b/changelog.d/+use-proxy-applies-to-more.changed.md
new file mode 100644
index 00000000000..d9894845807
--- /dev/null
+++ b/changelog.d/+use-proxy-applies-to-more.changed.md
@@ -0,0 +1 @@
+use_proxy configuration now applies to mirrord operator status, and mirrord ls
\ No newline at end of file
diff --git a/mirrord/cli/src/execution.rs b/mirrord/cli/src/execution.rs
index 3dfcc14b7c8..30ee06b6771 100644
--- a/mirrord/cli/src/execution.rs
+++ b/mirrord/cli/src/execution.rs
@@ -24,6 +24,7 @@ use crate::{
     connection::{create_and_connect, AgentConnection, AGENT_CONNECT_INFO_ENV_KEY},
     error::CliError,
     extract::extract_library,
+    util::remove_proxy_env,
     Result,
 };
 
@@ -134,12 +135,7 @@ impl MirrordExecution {
         let lib_path = extract_library(None, progress, true)?;
 
         if !config.use_proxy {
-            for (key, _val) in std::env::vars() {
-                let lower_key = key.to_lowercase();
-                if lower_key == "http_proxy" || lower_key == "https_proxy" {
-                    std::env::remove_var(key)
-                }
-            }
+            remove_proxy_env();
         }
 
         let (connect_info, mut connection) = create_and_connect(config, progress, analytics)
diff --git a/mirrord/cli/src/main.rs b/mirrord/cli/src/main.rs
index 28bfb7421f8..998c419f4a0 100644
--- a/mirrord/cli/src/main.rs
+++ b/mirrord/cli/src/main.rs
@@ -47,11 +47,14 @@ mod extract;
 mod internal_proxy;
 mod operator;
 mod teams;
+mod util;
 mod verify_config;
 
 pub(crate) use error::{CliError, Result};
 use verify_config::verify_config;
 
+use crate::util::remove_proxy_env;
+
 async fn exec_process<P>(
     config: LayerConfig,
     args: &ExecArgs,
@@ -339,6 +342,9 @@ async fn print_pod_targets(args: &ListTargetArgs) -> Result<()> {
     {
         let mut cfg_context = ConfigContext::default();
         let layer_config = LayerFileConfig::from_path(config)?.generate_config(&mut cfg_context)?;
+        if !layer_config.use_proxy {
+            remove_proxy_env();
+        }
         (
             layer_config.accept_invalid_certificates,
             layer_config.kubeconfig,
diff --git a/mirrord/cli/src/operator.rs b/mirrord/cli/src/operator.rs
index 56db91b9aff..b453a628d80 100644
--- a/mirrord/cli/src/operator.rs
+++ b/mirrord/cli/src/operator.rs
@@ -20,6 +20,7 @@ use tracing::warn;
 use crate::{
     config::{OperatorArgs, OperatorCommand},
     error::CliError,
+    util::remove_proxy_env,
     Result,
 };
 
@@ -111,6 +112,9 @@ async fn get_status_api(config: Option<String>) -> Result<Api<MirrordOperatorCrd
     let kube_api = if let Some(config_path) = config {
         let mut cfg_context = ConfigContext::default();
         let config = LayerFileConfig::from_path(config_path)?.generate_config(&mut cfg_context)?;
+        if !config.use_proxy {
+            remove_proxy_env();
+        }
         create_kube_api(
             config.accept_invalid_certificates,
             config.kubeconfig,
diff --git a/mirrord/cli/src/util.rs b/mirrord/cli/src/util.rs
new file mode 100644
index 00000000000..d82e7d21fad
--- /dev/null
+++ b/mirrord/cli/src/util.rs
@@ -0,0 +1,9 @@
+/// Removes `HTTP_PROXY` and `https_proxy` from the environment
+pub(crate) fn remove_proxy_env() {
+    for (key, _val) in std::env::vars() {
+        let lower_key = key.to_lowercase();
+        if lower_key == "http_proxy" || lower_key == "https_proxy" {
+            std::env::remove_var(key)
+        }
+    }
+}