From 37b3beff5393bb386ea8c5f9ff9349f08804389e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:20:33 -0400 Subject: [PATCH] accept `datadog_wrapper` --- bottlecap/src/config/mod.rs | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/bottlecap/src/config/mod.rs b/bottlecap/src/config/mod.rs index a9571b774..72619c7a6 100644 --- a/bottlecap/src/config/mod.rs +++ b/bottlecap/src/config/mod.rs @@ -123,13 +123,6 @@ fn failsover(figment: &Figment) -> Result<(), ConfigError> { )); } - let datadog_wrapper_set = - std::env::var("AWS_LAMBDA_EXEC_WRAPPER").unwrap_or_default() == "/opt/datadog_wrapper"; - if datadog_wrapper_set { - log_failover_reason("datadog_wrapper"); - return Err(ConfigError::UnsupportedField("datadog_wrapper".to_string())); - } - if failover_config.serverless_appsec_enabled || failover_config.appsec_enabled { log_failover_reason("appsec_enabled"); return Err(ConfigError::UnsupportedField("appsec_enabled".to_string())); @@ -216,22 +209,6 @@ pub mod tests { }); } - #[test] - fn test_reject_datadog_wrapper() { - figment::Jail::expect_with(|jail| { - jail.clear_env(); - jail.set_env("DD_EXTENSION_VERSION", "next"); - jail.set_env("AWS_LAMBDA_EXEC_WRAPPER", "/opt/datadog_wrapper"); - - let config = get_config(Path::new("")).expect_err("should reject unknown fields"); - assert_eq!( - config, - ConfigError::UnsupportedField("datadog_wrapper".to_string()) - ); - Ok(()) - }); - } - #[test] fn test_allowed_but_disabled() { figment::Jail::expect_with(|jail| {