NS API with directory v2 (#5058)

* Use unstable explorer client

* Clean up stale testruns & logging
- log gw identity key
- better agent testrun logging
- log responses
- change response code for agents

* Better logging on agent

* Testrun stores gw identity key instead of gw pk

* Agent 0.1.3

* Agent 0.1.4

* Sqlx offline query data + clippy

* Compatible with directory v2

* Point to internal deps + rebase + v0.1.5

* self described field not null

* Fix build.rs typo

common/models/src/ns_api.rs

@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct TestrunAssignment {
-    /// has nothing to do with GW identity key. This is PK from `gateways` table
     pub testrun_id: i64,
-    pub gateway_pk_id: i64,
+    pub gateway_identity_key: String,
 }

nym-node-status-agent/Cargo.toml

@@ -4,7 +4,7 @@
 
 [package]
 name = "nym-node-status-agent"
-version = "0.1.0"
+version = "0.1.4"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

nym-node-status-agent/run.sh

@@ -2,7 +2,11 @@
 
 set -eu
 
-export RUST_LOG=${RUST_LOG:-debug}
+environment="qa"
+
+source ../envs/${environment}.env
+
+export RUST_LOG="debug"
 
 crate_root=$(dirname $(realpath "$0"))
 gateway_probe_src=$(dirname $(dirname "$crate_root"))/nym-vpn-client/nym-vpn-core
@@ -14,6 +18,8 @@ export NODE_STATUS_AGENT_PROBE_PATH="$crate_root/nym-gateway-probe"
 # build & copy over GW probe
 function copy_gw_probe() {
     pushd $gateway_probe_src
+    git switch main
+    git pull
     cargo build --release --package nym-gateway-probe
     cp target/release/nym-gateway-probe "$crate_root"
     $crate_root/nym-gateway-probe --version
@@ -30,8 +36,8 @@ function swarm() {
 
     build_agent
 
-    for ((i=1; i<=$workers; i++)); do
-        ../target/release/nym-node-status-agent run-probe  &
+    for ((i = 1; i <= $workers; i++)); do
+        ../target/release/nym-node-status-agent run-probe &
     done
 
     wait
@@ -44,6 +50,6 @@ export NODE_STATUS_AGENT_SERVER_PORT="8000"
 
 copy_gw_probe
 
-swarm 30
+swarm 8
 
 # cargo run -- run-probe

nym-node-status-agent/src/cli.rs

@@ -31,24 +31,19 @@ pub(crate) enum Command {
         /// path of binary to run
         #[arg(long, env = "NODE_STATUS_AGENT_PROBE_PATH")]
         probe_path: String,
-        #[arg(short, long, env = "NODE_STATUS_AGENT_GATEWAY_ID")]
-        gateway_id: Option<String>,
     },
 }
 
 impl Args {
     pub(crate) async fn execute(&self) -> anyhow::Result<()> {
         match &self.command {
-            Command::RunProbe {
-                probe_path,
-                gateway_id,
-            } => self.run_probe(probe_path, gateway_id).await?,
+            Command::RunProbe { probe_path } => self.run_probe(probe_path).await?,
         }
 
         Ok(())
     }
 
-    async fn run_probe(&self, probe_path: &str, gateway_id: &Option<String>) -> anyhow::Result<()> {
+    async fn run_probe(&self, probe_path: &str) -> anyhow::Result<()> {
         let server_address = format!("{}:{}", &self.server_address, self.server_port);
 
         let probe = GwProbe::new(probe_path.to_string());
@@ -58,7 +53,7 @@ impl Args {
 
         let testrun = request_testrun(&server_address).await?;
 
-        let log = probe.run_and_get_log(gateway_id);
+        let log = probe.run_and_get_log(&Some(testrun.gateway_identity_key));
 
         submit_results(&server_address, testrun.testrun_id, log).await?;
 
@@ -97,6 +92,7 @@ async fn submit_results(
 ) -> anyhow::Result<()> {
     let target_url = format!("{}/{}/{}", server_addr, URL_BASE, testrun_id);
     let client = reqwest::Client::new();
+
     let res = client
         .post(target_url)
         .body(probe_outcome)

nym-node-status-agent/src/probe.rs

@@ -40,6 +40,12 @@ impl GwProbe {
         match command.spawn() {
             Ok(child) => {
                 if let Ok(output) = child.wait_with_output() {
+                    if !output.status.success() {
+                        let out = String::from_utf8_lossy(&output.stdout);
+                        let err = String::from_utf8_lossy(&output.stderr);
+                        tracing::error!("Probe exited with {:?}:\n{}\n{}", output.status, out, err);
+                    }
+
                     return String::from_utf8(output.stdout)
                         .unwrap_or("Unable to get log from test run".to_string());
                 }