From eef8ec59b840eec8ccba37578f40739b8100deaa Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Fri, 3 Oct 2025 00:19:43 -0700 Subject: [PATCH] deploy 2.0.0-dev-22 --- Cargo.lock | 36 +++++++++++++++++----------------- Cargo.toml | 2 +- bin/core/src/connection/mod.rs | 21 ++++++++++---------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8107bd5d2..3295ceb53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -939,7 +939,7 @@ dependencies = [ [[package]] name = "cache" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "tokio", @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "command" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "komodo_client", "run_command", @@ -1157,7 +1157,7 @@ checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" [[package]] name = "config" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "colored", "indexmap 2.11.4", @@ -1442,7 +1442,7 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "database" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "async-compression", @@ -1750,7 +1750,7 @@ dependencies = [ [[package]] name = "environment" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "formatting", @@ -1760,7 +1760,7 @@ dependencies = [ [[package]] name = "environment_file" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "thiserror 2.0.17", ] @@ -1856,7 +1856,7 @@ dependencies = [ [[package]] name = "formatting" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "serror", ] @@ -2028,7 +2028,7 @@ checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "git" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "cache", @@ -2628,7 +2628,7 @@ dependencies = [ [[package]] name = "interpolate" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "komodo_client", @@ -2759,7 +2759,7 @@ dependencies = [ [[package]] name = "komodo_cli" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "chrono", @@ -2785,7 +2785,7 @@ dependencies = [ [[package]] name = "komodo_client" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "async_timing_util", @@ -2821,7 +2821,7 @@ dependencies = [ [[package]] name = "komodo_core" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "arc-swap", @@ -2895,7 +2895,7 @@ dependencies = [ [[package]] name = "komodo_periphery" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "arc-swap", @@ -3019,7 +3019,7 @@ dependencies = [ [[package]] name = "logger" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "komodo_client", @@ -3291,7 +3291,7 @@ dependencies = [ [[package]] name = "noise" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "base64 0.22.1", @@ -3796,7 +3796,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "periphery_client" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "komodo_client", "resolver_api", @@ -4343,7 +4343,7 @@ dependencies = [ [[package]] name = "response" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "axum", @@ -5672,7 +5672,7 @@ dependencies = [ [[package]] name = "transport" -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" dependencies = [ "anyhow", "axum", diff --git a/Cargo.toml b/Cargo.toml index dcbdb59e3..d590d56b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ ] [workspace.package] -version = "2.0.0-dev-21" +version = "2.0.0-dev-22" edition = "2024" authors = ["mbecker20 "] license = "GPL-3.0-or-later" diff --git a/bin/core/src/connection/mod.rs b/bin/core/src/connection/mod.rs index 65cd07fcb..a269a8b08 100644 --- a/bin/core/src/connection/mod.rs +++ b/bin/core/src/connection/mod.rs @@ -107,24 +107,25 @@ impl PublicKeyValidator for PeripheryConnectionArgs<'_> { let invalid_error = || { // Spawn task to set the 'attempted_public_key' // for easy manual connection acceptance later on. + let id = self.id.to_string(); + let attempted = public_key.clone(); tokio::spawn(async move { - update_one_by_id( + if let Err(e) = update_one_by_id( &db_client().servers, - self.id, + &id, doc! { "$set": { - "info.attempted_public_key": &public_key, + "info.attempted_public_key": &attempted, } }, None, ) .await - .inspect_err(|e| { + { warn!( - "Failed to update attempted public_key for Server {}", - self.id - ) - }); + "Failed to update attempted public_key for Server {id} | {e:?}" + ); + }; }); anyhow!("{public_key} is invalid") .context( @@ -173,7 +174,7 @@ impl<'a> PeripheryConnectionArgs<'a> { } pub fn from_url_builder( - id: &str, + id: &'a str, config: &'a UrlBuilderConfig, ) -> Self { Self { @@ -187,7 +188,7 @@ impl<'a> PeripheryConnectionArgs<'a> { } pub fn from_aws_builder( - id: &str, + id: &'a str, address: &'a str, config: &'a AwsBuilderConfig, ) -> Self {