Skip to content

Commit 8d39017

Browse files
committed
fix: Gate FfeFlags variant behind ffe feature, matching live-debugger pattern
1 parent 1ee47d0 commit 8d39017

1 file changed

Lines changed: 3 additions & 10 deletions

File tree

datadog-remote-config/src/parse.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ pub enum RemoteConfigData {
2121
TracerFlareTask(AgentTaskFile),
2222
#[cfg(feature = "ffe")]
2323
FfeFlags(UniversalFlagConfig),
24-
#[cfg(not(feature = "ffe"))]
25-
FfeFlags(Vec<u8>),
2624
Ignored(RemoteConfigProduct),
2725
}
2826

@@ -46,15 +44,9 @@ impl RemoteConfigData {
4644
let parsed = datadog_live_debugger::parse_json(&String::from_utf8_lossy(data))?;
4745
RemoteConfigData::LiveDebugger(parsed)
4846
}
47+
#[cfg(feature = "ffe")]
4948
RemoteConfigProduct::FfeFlags => {
50-
#[cfg(feature = "ffe")]
51-
{
52-
RemoteConfigData::FfeFlags(UniversalFlagConfig::from_json(data.to_vec())?)
53-
}
54-
#[cfg(not(feature = "ffe"))]
55-
{
56-
RemoteConfigData::FfeFlags(data.to_vec())
57-
}
49+
RemoteConfigData::FfeFlags(UniversalFlagConfig::from_json(data.to_vec())?)
5850
}
5951
_ => RemoteConfigData::Ignored(product),
6052
})
@@ -69,6 +61,7 @@ impl From<&RemoteConfigData> for RemoteConfigProduct {
6961
RemoteConfigData::LiveDebugger(_) => RemoteConfigProduct::LiveDebugger,
7062
RemoteConfigData::TracerFlareConfig(_) => RemoteConfigProduct::AgentConfig,
7163
RemoteConfigData::TracerFlareTask(_) => RemoteConfigProduct::AgentTask,
64+
#[cfg(feature = "ffe")]
7265
RemoteConfigData::FfeFlags(_) => RemoteConfigProduct::FfeFlags,
7366
RemoteConfigData::Ignored(product) => *product,
7467
}

0 commit comments

Comments
 (0)