From a4777fc5519a7fad2f1bf1c0dcc1de8ca973a52c Mon Sep 17 00:00:00 2001 From: carvilsi Date: Wed, 19 Mar 2025 04:11:04 +0100 Subject: [PATCH 1/3] adds get_node_id for api --- veilid-core/src/tests/common/test_veilid_core.rs | 15 +++++++++++++++ veilid-core/src/veilid_api/api.rs | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/veilid-core/src/tests/common/test_veilid_core.rs b/veilid-core/src/tests/common/test_veilid_core.rs index e54038d7..b89d0c68 100644 --- a/veilid-core/src/tests/common/test_veilid_core.rs +++ b/veilid-core/src/tests/common/test_veilid_core.rs @@ -192,6 +192,20 @@ pub async fn test_attach_detach_multiple() { } } +pub async fn test_get_node_id() { + trace!("test get node id"); + let (update_callback, config_callback) = setup_veilid_core(); + let api = api_startup(update_callback, config_callback) + .await + .expect("startup failed"); + api.attach().await.unwrap(); + sleep(5000).await; + assert_eq!(api.get_node_id().unwrap(), api.config().unwrap().get().network.routing_table.node_id); + api.detach().await.unwrap(); + sleep(2000).await; + api.shutdown().await; +} + pub async fn test_all() { test_startup_shutdown().await; test_startup_shutdown_from_config().await; @@ -199,4 +213,5 @@ pub async fn test_all() { test_startup_shutdown_multiple().await; test_startup_shutdown_from_config_multiple().await; test_attach_detach_multiple().await; + test_get_node_id().await; } diff --git a/veilid-core/src/veilid_api/api.rs b/veilid-core/src/veilid_api/api.rs index 5e1fb4bb..7adcf973 100644 --- a/veilid-core/src/veilid_api/api.rs +++ b/veilid-core/src/veilid_api/api.rs @@ -136,6 +136,10 @@ impl VeilidAPI { .ok_or(VeilidAPIError::NotInitialized) } + pub fn get_node_id(&self) -> VeilidAPIResult> { + Ok(self.config()?.get().network.routing_table.node_id.clone()) + } + //////////////////////////////////////////////////////////////// // Internal Accessors From a2e39e57ee5b0b6342b6c728dc19861d3bc59a34 Mon Sep 17 00:00:00 2001 From: carvilsi Date: Fri, 21 Mar 2025 10:57:48 +0100 Subject: [PATCH 2/3] removes get_node_id from api, don't know why I added this commit on the first place to main --- veilid-core/src/tests/common/test_veilid_core.rs | 15 --------------- veilid-core/src/veilid_api/api.rs | 4 ---- 2 files changed, 19 deletions(-) diff --git a/veilid-core/src/tests/common/test_veilid_core.rs b/veilid-core/src/tests/common/test_veilid_core.rs index b89d0c68..e54038d7 100644 --- a/veilid-core/src/tests/common/test_veilid_core.rs +++ b/veilid-core/src/tests/common/test_veilid_core.rs @@ -192,20 +192,6 @@ pub async fn test_attach_detach_multiple() { } } -pub async fn test_get_node_id() { - trace!("test get node id"); - let (update_callback, config_callback) = setup_veilid_core(); - let api = api_startup(update_callback, config_callback) - .await - .expect("startup failed"); - api.attach().await.unwrap(); - sleep(5000).await; - assert_eq!(api.get_node_id().unwrap(), api.config().unwrap().get().network.routing_table.node_id); - api.detach().await.unwrap(); - sleep(2000).await; - api.shutdown().await; -} - pub async fn test_all() { test_startup_shutdown().await; test_startup_shutdown_from_config().await; @@ -213,5 +199,4 @@ pub async fn test_all() { test_startup_shutdown_multiple().await; test_startup_shutdown_from_config_multiple().await; test_attach_detach_multiple().await; - test_get_node_id().await; } diff --git a/veilid-core/src/veilid_api/api.rs b/veilid-core/src/veilid_api/api.rs index 7adcf973..5e1fb4bb 100644 --- a/veilid-core/src/veilid_api/api.rs +++ b/veilid-core/src/veilid_api/api.rs @@ -136,10 +136,6 @@ impl VeilidAPI { .ok_or(VeilidAPIError::NotInitialized) } - pub fn get_node_id(&self) -> VeilidAPIResult> { - Ok(self.config()?.get().network.routing_table.node_id.clone()) - } - //////////////////////////////////////////////////////////////// // Internal Accessors From 6f1bda79a6e74cc129f5f0e9d60af53d5ea07053 Mon Sep 17 00:00:00 2001 From: carvilsi Date: Fri, 21 Mar 2025 11:10:03 +0100 Subject: [PATCH 3/3] adds audit dependencies stage and for now let it fail --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6142bbc..909ae07b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ variables: stages: - prepare - test + - audit_dependencies - build_packages - distribute - release @@ -28,6 +29,21 @@ format: when: never - when: always +audit_dependencies: + stage: audit_dependencies + image: rust:latest + before_script: + - cargo install cargo-audit --locked + script: + - cargo audit + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + # Allowing to fail since there are some dependencies + # with vulnerabilities. + # Once the affected ones will be upgraded, if we want + # to be more strict setup to false + allow_failure: true + # base earthly setup for jobs .base: tags: [ saas-linux-medium-amd64 ]