Skip to content

Fallback on gov regions #550

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
nhulston merged 7 commits into from
Feb 26, 2025
Merged

Fallback on gov regions #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a2784b9
fallback on gov regions
nhulston Feb 10, 2025
32439ec
fmt
nhulston Feb 10, 2025
ecda1ef
unit test
nhulston Feb 10, 2025
6e6b6c3
use config in region
nhulston Feb 10, 2025
bca3daa
pass region from main.rs aws_config
nhulston Feb 10, 2025
229a2a1
pass region as reference instead of cloning
nhulston Feb 11, 2025
e5d1554
simplify govcloud fallback
nhulston Feb 24, 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
2 changes: 1 addition & 1 deletion bottlecap/src/bin/bottlecap/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ fn load_configs() -> (AwsConfig, Arc<Config>) {
sandbox_init_time: Instant::now(),
};
let lambda_directory = env::var("LAMBDA_TASK_ROOT").unwrap_or_else(|_| "/var/task".to_string());
let config = match config::get_config(Path::new(&lambda_directory)) {
let config = match config::get_config(Path::new(&lambda_directory), &aws_config.region) {
Ok(config) => Arc::new(config),
Err(_e) => {
let err = Command::new("/opt/datadog-agent-go").exec();
Expand Down
85 changes: 56 additions & 29 deletions bottlecap/src/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ fn log_fallback_reason(reason: &str) {
println!("{{\"DD_EXTENSION_FALLBACK_REASON\":\"{reason}\"}}");
}

fn fallback(figment: &Figment, yaml_figment: &Figment) -> Result<(), ConfigError> {
fn fallback(figment: &Figment, yaml_figment: &Figment, region: &str) -> Result<(), ConfigError> {
let (config, yaml_config): (FallbackConfig, FallbackYamlConfig) =
match (figment.extract(), yaml_figment.extract()) {
(Ok(env_config), Ok(yaml_config)) => (env_config, yaml_config),
Expand Down Expand Up @@ -232,11 +232,17 @@ fn fallback(figment: &Figment, yaml_figment: &Figment) -> Result<(), ConfigError
return Err(ConfigError::UnsupportedField("intake_urls".to_string()));
}

// Govcloud Regions
if region.starts_with("us-gov-") {
log_fallback_reason("gov_region");
return Err(ConfigError::UnsupportedField("gov_region".to_string()));
}

Ok(())
}

#[allow(clippy::module_name_repetitions)]
pub fn get_config(config_directory: &Path) -> Result<Config, ConfigError> {
pub fn get_config(config_directory: &Path, region: &str) -> Result<Config, ConfigError> {
let path = config_directory.join("datadog.yaml");

// Get default config fields (and ENV specific ones)
Expand All @@ -249,7 +255,7 @@ pub fn get_config(config_directory: &Path) -> Result<Config, ConfigError> {
// Get YAML nested fields
let yaml_figment = Figment::from(Yaml::file(&path));

fallback(&figment, &yaml_figment)?;
fallback(&figment, &yaml_figment, region)?;

let (mut config, yaml_config): (Config, YamlConfig) =
match (figment.extract(), yaml_figment.extract()) {
Expand Down Expand Up @@ -354,19 +360,32 @@ pub mod tests {
use crate::config::flush_strategy::PeriodicStrategy;
use crate::config::processing_rule;

const MOCK_REGION: &str = "us-east-1";

#[test]
fn test_reject_on_opted_out() {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_EXTENSION_VERSION", "compatibility");
let config = get_config(Path::new("")).expect_err("should reject unknown fields");
let config =
get_config(Path::new(""), MOCK_REGION).expect_err("should reject unknown fields");
assert_eq!(
config,
ConfigError::UnsupportedField("extension_version".to_string())
);
Ok(())
});
}
#[test]
fn test_reject_on_gov_region() {
let mock_gov_region = "us-gov-east-1";
let config =
get_config(Path::new(""), mock_gov_region).expect_err("should reject unknown fields");
assert_eq!(
config,
ConfigError::UnsupportedField("gov_region".to_string())
);
}

#[test]
fn test_fallback_on_otel() {
Expand All @@ -377,7 +396,8 @@ pub mod tests {
"localhost:4138",
);

let config = get_config(Path::new("")).expect_err("should reject unknown fields");
let config =
get_config(Path::new(""), MOCK_REGION).expect_err("should reject unknown fields");
assert_eq!(config, ConfigError::UnsupportedField("otel".to_string()));
Ok(())
});
Expand All @@ -398,7 +418,8 @@ pub mod tests {
",
)?;

let config = get_config(Path::new("")).expect_err("should reject unknown fields");
let config =
get_config(Path::new(""), MOCK_REGION).expect_err("should reject unknown fields");
assert_eq!(config, ConfigError::UnsupportedField("otel".to_string()));
Ok(())
});
Expand All @@ -418,7 +439,8 @@ pub mod tests {
",
)?;

let config = get_config(Path::new("")).expect_err("should reject unknown fields");
let config =
get_config(Path::new(""), MOCK_REGION).expect_err("should reject unknown fields");
assert_eq!(config, ConfigError::UnsupportedField("otel".to_string()));
Ok(())
});
Expand All @@ -430,7 +452,8 @@ pub mod tests {
jail.clear_env();
jail.set_env("DD_APM_DD_URL", "some_url");

let config = get_config(Path::new("")).expect_err("should reject unknown fields");
let config =
get_config(Path::new(""), MOCK_REGION).expect_err("should reject unknown fields");
assert_eq!(
config,
ConfigError::UnsupportedField("intake_urls".to_string())
Expand All @@ -451,7 +474,8 @@ pub mod tests {
",
)?;

let config = get_config(Path::new("")).expect_err("should reject unknown fields");
let config =
get_config(Path::new(""), MOCK_REGION).expect_err("should reject unknown fields");
assert_eq!(
config,
ConfigError::UnsupportedField("intake_urls".to_string())
Expand All @@ -466,7 +490,8 @@ pub mod tests {
jail.clear_env();
jail.set_env("DD_SERVERLESS_APPSEC_ENABLED", "true");

let config = get_config(Path::new("")).expect_err("should reject unknown fields");
let config =
get_config(Path::new(""), MOCK_REGION).expect_err("should reject unknown fields");
assert_eq!(
config,
ConfigError::UnsupportedField("appsec_enabled".to_string())
Expand All @@ -486,7 +511,7 @@ pub mod tests {
",
)?;
jail.set_env("DD_SITE", "datad0g.com");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.site, "datad0g.com");
Ok(())
});
Expand All @@ -501,7 +526,7 @@ pub mod tests {
r"
",
)?;
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.site, "datadoghq.com");
Ok(())
});
Expand All @@ -512,7 +537,7 @@ pub mod tests {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_SITE", "datadoghq.eu");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.site, "datadoghq.eu");
Ok(())
});
Expand All @@ -523,7 +548,7 @@ pub mod tests {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_LOG_LEVEL", "TRACE");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.log_level, LogLevel::Trace);
Ok(())
});
Expand All @@ -533,7 +558,7 @@ pub mod tests {
fn test_parse_default() {
figment::Jail::expect_with(|jail| {
jail.clear_env();
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(
config,
Config {
Expand All @@ -554,7 +579,7 @@ pub mod tests {
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");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.https_proxy, Some("my-proxy:3128".to_string()));
Ok(())
});
Expand All @@ -570,7 +595,7 @@ pub mod tests {
"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");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse noproxy");
assert_eq!(config.https_proxy, None);
Ok(())
});
Expand All @@ -588,7 +613,8 @@ pub mod tests {
",
)?;

let config = get_config(Path::new("")).expect("should parse weird proxy config");
let config =
get_config(Path::new(""), MOCK_REGION).expect("should parse weird proxy config");
assert_eq!(config.https_proxy, Some("my-proxy:3128".to_string()));
Ok(())
});
Expand All @@ -608,7 +634,8 @@ pub mod tests {
",
)?;

let config = get_config(Path::new("")).expect("should parse weird proxy config");
let config =
get_config(Path::new(""), MOCK_REGION).expect("should parse weird proxy config");
assert_eq!(config.https_proxy, None);
// Assertion to ensure config.site runs before proxy
// because we chenck that noproxy contains the site
Expand All @@ -622,7 +649,7 @@ pub mod tests {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_SERVERLESS_FLUSH_STRATEGY", "end");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.serverless_flush_strategy, FlushStrategy::End);
Ok(())
});
Expand All @@ -633,7 +660,7 @@ pub mod tests {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_SERVERLESS_FLUSH_STRATEGY", "periodically,100000");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(
config.serverless_flush_strategy,
FlushStrategy::Periodically(PeriodicStrategy { interval: 100_000 })
Expand All @@ -647,7 +674,7 @@ pub mod tests {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_SERVERLESS_FLUSH_STRATEGY", "invalid_strategy");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.serverless_flush_strategy, FlushStrategy::Default);
Ok(())
});
Expand All @@ -661,7 +688,7 @@ pub mod tests {
"DD_SERVERLESS_FLUSH_STRATEGY",
"periodically,invalid_interval",
);
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.serverless_flush_strategy, FlushStrategy::Default);
Ok(())
});
Expand All @@ -672,7 +699,7 @@ pub mod tests {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_VERSION", "123");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(config.version.expect("failed to parse DD_VERSION"), "123");
Ok(())
});
Expand All @@ -697,7 +724,7 @@ pub mod tests {
pattern: exclude-me-yaml
",
)?;
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(
config.logs_config_processing_rules,
Some(vec![ProcessingRule {
Expand Down Expand Up @@ -726,7 +753,7 @@ pub mod tests {
pattern: exclude
",
)?;
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");
assert_eq!(
config.logs_config_processing_rules,
Some(vec![ProcessingRule {
Expand All @@ -749,7 +776,7 @@ pub mod tests {
"datadog,tracecontext,b3,b3multi",
);
jail.set_env("DD_EXTENSION_VERSION", "next");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");

let expected_styles = vec![
TracePropagationStyle::Datadog,
Expand All @@ -768,7 +795,7 @@ pub mod tests {
figment::Jail::expect_with(|jail| {
jail.clear_env();
jail.set_env("DD_TRACE_PROPAGATION_STYLE_EXTRACT", "datadog");
let config = get_config(Path::new("")).expect("should parse config");
let config = get_config(Path::new(""), MOCK_REGION).expect("should parse config");

assert_eq!(
config.trace_propagation_style,
Expand All @@ -793,7 +820,7 @@ pub mod tests {
"DD_APM_REPLACE_TAGS",
r#"[{"name":"resource.name","pattern":"(.*)/(foo[:%].+)","repl":"$1/{foo}"}]"#,
);
let config = get_config(Path::new(""));
let config = get_config(Path::new(""), MOCK_REGION);
assert!(config.is_ok());
Ok(())
});
Expand Down
Loading