build: remove conditional compilation flags

Author: DavSanchez

test/e2e-runner/src/common.rs

@@ -1,17 +1,11 @@
 use std::path::PathBuf;
 
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 pub mod config;
-#[cfg(target_os = "windows")]
 pub mod exec;
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 pub mod file;
 pub mod fleet_control_api;
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 pub mod logs;
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 pub mod nrql;
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 pub mod on_drop;
 pub mod test;
 
@@ -103,18 +97,15 @@ pub struct FleetControlApiArgs {
 }
 
 /// Data to set up installation
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 pub struct RecipeData {
     pub args: InstallationArgs,
     pub fleet_id: String,
     pub fleet_enabled: bool,
     pub recipe_list: String,
     pub proxy_url: String,
-    #[cfg(target_os = "linux")]
     pub monitoring_source: String,
 }
 
-#[cfg(any(target_os = "linux", target_os = "windows"))]
 impl Default for RecipeData {
     fn default() -> Self {
         Self {
@@ -123,7 +114,6 @@ impl Default for RecipeData {
             proxy_url: Default::default(),
             fleet_enabled: false,
             recipe_list: "agent-control".to_string(),
-            #[cfg(target_os = "linux")]
             monitoring_source: "infra-agent".to_string(),
         }
     }

test/e2e-runner/src/common/config.rs

@@ -37,7 +37,6 @@ pub fn update_config(config_path: impl AsRef<str>, new_content: impl AsRef<str>)
     write(config_path, updated_content);
 }
 
-#[cfg(target_os = "windows")]
 /// Updates the agent control agents config in `config_path` to the specified in `new_content`
 pub fn modify_agents_config(
     config_path: impl AsRef<str>,
@@ -79,7 +78,6 @@ log:
     formatter: pretty
 "#;
 
-#[cfg(target_os = "linux")]
 /// Modifies the agent-control configuration file to enable debug logging and write logs to a file.
 pub fn update_config_for_debug_logging(config_path: &str) {
     update_config(config_path, DEBUG_LOGGING_CONFIG)

test/e2e-runner/src/common/file.rs

@@ -2,7 +2,6 @@ use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
 
-#[cfg(target_os = "windows")]
 use crate::common::test::TestResult;
 
 /// Writes contents to a file and ensures data is flushed to disk before returning.
@@ -34,7 +33,6 @@ pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) {
     });
 }
 
-#[cfg(target_os = "windows")]
 /// Removes the directories receives as list
 pub fn remove_dirs(dirs: &[&str]) -> TestResult<()> {
     dirs.iter()

test/e2e-runner/src/common/fleet_control_api.rs

@@ -37,8 +37,8 @@ pub struct FinishedTestResponse {
     triggered_test_count: usize,
     debug_run: bool,
     passed_count: usize,
-    failed_count: usize,
-    inconclusive_count: usize,
+    pub(crate) failed_count: usize,
+    pub(crate) inconclusive_count: usize,
     ignored_count: usize,
     passed_tests: TestSuitesReport,
     failed_tests: TestSuitesReport,

test/e2e-runner/src/linux/scenarios/fleet_control.rs

@@ -1,6 +1,6 @@
 use crate::common::config::{DEBUG_LOGGING_CONFIG, update_config};
-use crate::common::fleet_control_api;
 use crate::common::on_drop::CleanUp;
+use crate::common::{FleetControlArgs, fleet_control_api};
 use crate::common::{InstallationArgs, RecipeData};
 use crate::linux;
 use crate::linux::install::{install_agent_control_from_recipe, tear_down_test};

test/e2e-runner/src/main.rs

@@ -1,9 +1,6 @@
 mod common;
-#[cfg(target_os = "linux")]
 mod linux;
-#[cfg(target_os = "macos")]
 mod macos;
-#[cfg(target_os = "windows")]
 mod windows;
 
 use crate::common::{FleetControlApiArgs, InstallationArgs};
@@ -12,11 +9,14 @@ use std::process;
 use tracing_subscriber::EnvFilter;
 
 fn main() {
-    cfg_select! {
-        target_os = "windows" => windows::run_windows_e2e(),
-        target_os = "linux" => linux::run_linux_e2e(),
-        target_os = "macos" => macos::run_macos_e2e(),
-        _ => panic!("Unsupported OS -- only Linux, Windows, and macOS are supported")
+    if cfg!(target_os = "windows") {
+        windows::run_windows_e2e()
+    } else if cfg!(target_os = "linux") {
+        linux::run_linux_e2e()
+    } else if cfg!(target_os = "macos") {
+        macos::run_macos_e2e()
+    } else {
+        panic!("Unsupported OS -- only Linux, Windows, and macOS are supported")
     }
     process::exit(0);
 }

test/e2e-runner/src/windows/scenarios/fleet_control.rs

@@ -1,6 +1,6 @@
 use crate::common::config::{DEBUG_LOGGING_CONFIG, update_config};
-use crate::common::fleet_control_api;
 use crate::common::on_drop::CleanUp;
+use crate::common::{FleetControlArgs, fleet_control_api};
 use crate::common::{InstallationArgs, RecipeData};
 use crate::windows;
 use crate::windows::install::{install_agent_control_from_recipe, tear_down_test};