hmon: Cargo fix 2nd post-review fixes

Use `score_supervisor_api_client` as a default.

Author: arkjedrz

.vscode/settings.json

@@ -9,6 +9,9 @@
     "rust-analyzer.cargo.cfgs": [
         "!miri"
     ],
+    "rust-analyzer.cargo.features": [
+        "stub_supervisor_api_client"
+    ],
     "rust-analyzer.check.command": "clippy",
     "rust-analyzer.rustfmt.overrideCommand": [
         "${workspaceFolder}/.vscode/rustfmt.sh"

src/health_monitoring_lib/BUILD

@@ -42,7 +42,6 @@ CC_HDRS = [
 rust_library(
     name = "health_monitoring_lib",
     srcs = glob(["rust/**/*.rs"]),
-    crate_features = ["score_supervisor_api_client"],
     crate_root = "rust/lib.rs",
     proc_macro_deps = PROC_MACRO_DEPS,
     visibility = ["//visibility:public"],
@@ -66,7 +65,6 @@ cc_library(
 rust_static_library(
     name = "health_monitoring_lib_ffi",
     srcs = glob(["rust/**/*.rs"]),
-    crate_features = ["score_supervisor_api_client"],
     crate_name = "health_monitoring_lib",
     crate_root = "rust/lib.rs",
     proc_macro_deps = [

src/health_monitoring_lib/Cargo.toml

@@ -23,6 +23,5 @@ monitor_rs = { workspace = true, optional = true }
 stdout_logger.workspace = true
 
 [features]
-default = ["stub_supervisor_api_client"]
+default = ["monitor_rs"]
 stub_supervisor_api_client = []
-score_supervisor_api_client = ["monitor_rs"]

src/health_monitoring_lib/rust/lib.rs

@@ -218,12 +218,9 @@ impl HealthMonitor {
         let monitoring_logic = worker::MonitoringLogic::new(
             monitors,
             self.supervisor_api_cycle,
-            #[cfg(all(not(test), feature = "score_supervisor_api_client"))]
+            #[cfg(not(any(test, feature = "stub_supervisor_api_client")))]
             supervisor_api_client::score_supervisor_api_client::ScoreSupervisorAPIClient::new(),
-            #[cfg(any(
-                test,
-                all(feature = "stub_supervisor_api_client", not(feature = "score_supervisor_api_client"))
-            ))]
+            #[cfg(any(test, feature = "stub_supervisor_api_client"))]
             supervisor_api_client::stub_supervisor_api_client::StubSupervisorAPIClient::new(),
         );
 

src/health_monitoring_lib/rust/supervisor_api_client/mod.rs

@@ -22,7 +22,7 @@ pub trait SupervisorAPIClient {
 
 // NOTE: various implementations are not mutually exclusive.
 
-#[cfg(feature = "score_supervisor_api_client")]
+#[cfg(not(feature = "stub_supervisor_api_client"))]
 pub mod score_supervisor_api_client;
 #[cfg(feature = "stub_supervisor_api_client")]
 pub mod stub_supervisor_api_client;