style: uniform target family conditional compilation (#1831)

* chore: gate nix dependency to unix-only

* style: use one variant of target_family conditional compilation

#[cfg(unix)] and #[cfg(target_family = "unix")] are equivalent per the [docs](https://doc.rust-lang.org/reference/conditional-compilation.html#unix-and-windows). Let's stick to the most explicit of them.

Author: DavSanchez

agent-control/Cargo.toml

@@ -13,9 +13,7 @@ license-file.workspace = true
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
 serde = { workspace = true, features = ["derive"] }
-
 thiserror = { workspace = true }
-nix = { workspace = true, features = ["signal", "user", "hostname"] }
 tracing-subscriber = { workspace = true, features = ["env-filter", "chrono"] }
 tracing = { workspace = true, features = ["attributes"] }
 ctrlc = { version = "3.5.0", features = ["termination"] }
@@ -34,8 +32,7 @@ serde_json = { workspace = true }
 semver = { workspace = true, features = ["serde"] }
 chrono = { workspace = true }
 base64 = { version = "0.22.1" }
-# New Relic dependencies (private external repos)
-# IMPORTANT: GitHub deployment keys are used to access these repos on the CI/CD pipelines
+# New Relic dependencies (external repos)
 nr-auth = { git = "https://github.com/newrelic/newrelic-auth-rs.git", tag = "0.1.1" }
 opamp-client = { git = "https://github.com/newrelic/newrelic-opamp-rs.git", tag = "0.0.34" }
 # local dependencies
@@ -75,6 +72,9 @@ opentelemetry-appender-tracing = { version = "0.31.1", features = [
 ] }
 async-trait = "0.1.89"
 
+[target.'cfg(target_family = "unix")'.dependencies]
+nix = { workspace = true, features = ["signal", "user", "hostname"] }
+
 [dev-dependencies]
 assert_cmd = { workspace = true }
 predicates = { workspace = true }

agent-control/src/sub_agent/on_host/command/command_os.rs

@@ -124,7 +124,7 @@ impl CommandOSStarted {
     }
 }
 
-#[cfg(unix)]
+#[cfg(target_family = "unix")]
 mod unix {
     use crate::sub_agent::on_host::command::{command_os::CommandOSStarted, error::CommandError};
 
@@ -163,7 +163,7 @@ mod unix {
 }
 
 //TODO Properly design unix/windows shutdown when Windows support is added
-#[cfg(windows)]
+#[cfg(target_family = "windows")]
 mod windows {
     use crate::sub_agent::on_host::command::{command_os::CommandOSStarted, error::CommandError};
 

agent-control/tests/on_host/cli.rs

@@ -45,7 +45,7 @@ fn print_debug_info() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-#[cfg(unix)]
+#[cfg(target_family = "unix")]
 #[test]
 fn does_not_run_if_no_root() -> Result<(), Box<dyn std::error::Error>> {
     let dir = TempDir::new()?;
@@ -58,7 +58,7 @@ fn does_not_run_if_no_root() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-#[cfg(unix)]
+#[cfg(target_family = "unix")]
 #[test]
 fn basic_startup() -> Result<(), Box<dyn std::error::Error>> {
     use std::time::Duration;
@@ -108,7 +108,7 @@ logs:
     Ok(())
 }
 
-#[cfg(unix)]
+#[cfg(target_family = "unix")]
 #[test]
 fn custom_logging_format() -> Result<(), Box<dyn std::error::Error>> {
     use std::time::Duration;
@@ -158,7 +158,7 @@ server:
     Ok(())
 }
 
-#[cfg(unix)]
+#[cfg(target_family = "unix")]
 #[test]
 #[ignore = "requires root"]
 fn custom_directory_overrides_as_root() -> Result<(), Box<dyn std::error::Error>> {
@@ -234,7 +234,7 @@ server:
     Ok(())
 }
 
-#[cfg(unix)]
+#[cfg(target_family = "unix")]
 #[test]
 fn runs_with_no_config() -> Result<(), Box<dyn std::error::Error>> {
     use std::{env, time::Duration};