Skip to content

fix: Honor noproxy and skip proxying if ddsite is in the noproxy list #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astuyve merged 3 commits into from
Jan 23, 2025
Merged

fix: Honor noproxy and skip proxying if ddsite is in the noproxy list #520

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f88a9f
fix: Honor noproxy and skip proxying if ddsite is in the noproxy list
astuyve Jan 22, 2025
f7e809c
feat: specs
astuyve Jan 22, 2025
a2f3bda
feat: Oneline check, add comment
astuyve Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion bottlecap/src/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use figment::{providers::Env, Figment};
use serde::{Deserialize, Deserializer};
use serde_json::Value;
use trace_propagation_style::{deserialize_trace_propagation_style, TracePropagationStyle};
use tracing::debug;

use crate::config::{
flush_strategy::FlushStrategy,
Expand Down Expand Up @@ -260,7 +261,12 @@ pub fn get_config(config_directory: &Path) -> Result<Config, ConfigError> {
if config.site.is_empty() {
config.site = "datadoghq.com".to_string();
}

if let Ok(no_proxy_string) = std::env::var("NO_PROXY") {
if no_proxy_string.contains(&config.site) {
debug!("NO_PROXY contains DD_SITE, disabling proxy");
config.https_proxy = None;
}
}
// Merge YAML nested fields
//
// Set logs_config_processing_rules if not defined in env
Expand Down Expand Up @@ -522,6 +528,33 @@ pub mod tests {
});
}

#[test]
fn test_proxy_config() {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_PROXY_HTTPS", "my-proxy:3128");
let config = get_config(Path::new("")).expect("should parse config");
assert_eq!(config.https_proxy, Some("my-proxy:3128".to_string()));
Ok(())
});
}

#[test]
fn test_noproxy_config() {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_SITE", "datadoghq.eu");
jail.set_env("DD_PROXY_HTTPS", "my-proxy:3128");
jail.set_env(
"NO_PROXY",
"127.0.0.1,localhost,172.16.0.0/12,us-east-1.amazonaws.com,datadoghq.eu",
);
let config = get_config(Path::new("")).expect("should parse noproxy");
assert_eq!(config.https_proxy, None);
Ok(())
});
}

#[test]
fn test_parse_flush_strategy_end() {
figment::Jail::expect_with(|jail| {
Expand Down
Loading