From fde18b627bd347b31e0d69d3815cf345a5b2dbf2 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Mon, 20 Mar 2023 19:28:04 -0700 Subject: [PATCH 01/15] convert to IP Signed-off-by: harrisontin --- .../opcua/src/discovery_impl.rs | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index 35e8f4444..716be95fa 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -74,6 +74,7 @@ fn get_discovery_urls( get_discovery_url_from_application_description( application, filter_list.as_ref(), + url, ) }) .collect::>(); @@ -115,6 +116,7 @@ fn test_tcp_connection(url: &str, tcp_stream: &impl TcpStream) -> Result<(), any fn get_discovery_url_from_application_description( server: &ApplicationDescription, filter_list: Option<&FilterList>, + ip_url: &String, ) -> Option { trace!( "get_discovery_url_from_application - found server : {}", @@ -135,7 +137,6 @@ fn get_discovery_url_from_application_description( None } else if let Some(ref server_discovery_urls) = server.discovery_urls { // TODO: could two different DiscoveryUrls be registered as localhost: on different lds's? - // Should this ensure that DiscoveryUrls are IP addresses instead of DNS? trace!( "get_discovery_url_from_application - server has {:?} DiscoveryUrls", server_discovery_urls @@ -149,7 +150,9 @@ fn get_discovery_url_from_application_description( Some(tcp_discovery_url) => tcp_discovery_url.to_string(), None => server_discovery_urls[0].to_string(), }; - Some(discovery_url) + // If discovery_url is DNS, convert it to IP address + let discovery_url_ip = get_discovery_url_ip(ip_url, discovery_url); + Some(discovery_url_ip) } else { trace!( "get_discovery_urls - Server {} doesn't have any DiscoveryUrls", @@ -180,6 +183,25 @@ fn get_socket_addr(url: &str) -> Result { Ok(addr) } +// This checks if the discovery_url can be resolved, if not use ip address instead +fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { + + let url = Url::parse(&discovery_url).unwrap(); + let path = url.path(); + let host = url.host_str().unwrap(); + let port = url.port().unwrap(); + + let addr_str = format!("{}:{}", host, port); + + // check if the hostname can be resolved to socket address + match addr_str.to_socket_addrs() { + Ok(_url) => discovery_url, + Err(_) => { + format!("{}{}", ip_url, path) + }, + } +} + #[cfg(test)] mod tests { use super::super::wrappers::{ @@ -326,7 +348,7 @@ mod tests { fn test_get_discovery_urls_removes_duplicates() { let lds_url = "opc.tcp://127.0.0.1:4840/"; let lds_url2 = "opc.tcp://10.0.0.1:4840/"; - let discovery_url = "opc.tcp://10.123.456.7:4855/"; + let discovery_url = "opc.tcp://10.123.45.6:4855/"; let mut mock_client = MockOpcuaClient::new(); let mut find_servers_seq = Sequence::new(); let mock_tcp_stream = set_up_mock_tcp_stream(lds_url, lds_url2); @@ -364,6 +386,7 @@ mod tests { None, mock_tcp_stream, ); + println!("!!! {:?}", discovery_urls); assert_eq!(discovery_urls.len(), 1); } @@ -417,4 +440,16 @@ mod tests { ); assert!(discovery_urls.is_empty()); } + + #[test] + + fn test_get_discovery_url_ip() { + let ip_url = "opc.tcp://192.168.0.1:50000"; + let discovery_url = "opc.tcp://OPCTest:50000/OPCUA/Simluation"; + + assert_eq!(get_discovery_url_ip(&ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.1:50000/OPCUA/Simluation"); + + let discovery_url = "opc.tcp://192.168.0.2:50000/OPCUA/Simluation"; + assert_eq!(get_discovery_url_ip(&ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.2:50000/OPCUA/Simluation"); + } } From 83926c30606cf95ac0c87564a86065fb6fd14cdb Mon Sep 17 00:00:00 2001 From: harrisontin Date: Tue, 21 Mar 2023 11:03:52 -0700 Subject: [PATCH 02/15] escape double slash Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index 716be95fa..109791dda 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -187,7 +187,7 @@ fn get_socket_addr(url: &str) -> Result { fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { let url = Url::parse(&discovery_url).unwrap(); - let path = url.path(); + let mut path = url.path().to_string(); let host = url.host_str().unwrap(); let port = url.port().unwrap(); @@ -197,7 +197,15 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { match addr_str.to_socket_addrs() { Ok(_url) => discovery_url, Err(_) => { - format!("{}{}", ip_url, path) + if ip_url.chars().last().unwrap() == '/' && path.chars().nth(0).unwrap() == '/' { + path.remove(0); + } + let url = format!("{}{}", ip_url, path); + trace!( + "get_discovery_url_ip - cannot resolve the application url from server, using ip address instead of hostname: {}", + url + ); + url }, } } @@ -444,7 +452,7 @@ mod tests { #[test] fn test_get_discovery_url_ip() { - let ip_url = "opc.tcp://192.168.0.1:50000"; + let ip_url = "opc.tcp://192.168.0.1:50000/"; let discovery_url = "opc.tcp://OPCTest:50000/OPCUA/Simluation"; assert_eq!(get_discovery_url_ip(&ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.1:50000/OPCUA/Simluation"); From 65189de38d8e7c770aaf448dc387c4667a3b5ad5 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Tue, 21 Mar 2023 11:06:44 -0700 Subject: [PATCH 03/15] remove debug statement Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index 109791dda..afbd0f04c 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -394,7 +394,6 @@ mod tests { None, mock_tcp_stream, ); - println!("!!! {:?}", discovery_urls); assert_eq!(discovery_urls.len(), 1); } From 2720b51a8a3ec961630edc2d48701499dc5fd067 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Tue, 21 Mar 2023 11:09:41 -0700 Subject: [PATCH 04/15] cargo formatting Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index afbd0f04c..f874b3d60 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -185,7 +185,6 @@ fn get_socket_addr(url: &str) -> Result { // This checks if the discovery_url can be resolved, if not use ip address instead fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { - let url = Url::parse(&discovery_url).unwrap(); let mut path = url.path().to_string(); let host = url.host_str().unwrap(); @@ -206,7 +205,7 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { url ); url - }, + } } } @@ -454,9 +453,15 @@ mod tests { let ip_url = "opc.tcp://192.168.0.1:50000/"; let discovery_url = "opc.tcp://OPCTest:50000/OPCUA/Simluation"; - assert_eq!(get_discovery_url_ip(&ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.1:50000/OPCUA/Simluation"); + assert_eq!( + get_discovery_url_ip(&ip_url, discovery_url.to_string()), + "opc.tcp://192.168.0.1:50000/OPCUA/Simluation" + ); let discovery_url = "opc.tcp://192.168.0.2:50000/OPCUA/Simluation"; - assert_eq!(get_discovery_url_ip(&ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.2:50000/OPCUA/Simluation"); + assert_eq!( + get_discovery_url_ip(&ip_url, discovery_url.to_string()), + "opc.tcp://192.168.0.2:50000/OPCUA/Simluation" + ); } } From 54ad601ccf0d915f792897a8b9dd4692db415516 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Tue, 21 Mar 2023 11:24:10 -0700 Subject: [PATCH 05/15] version patch Signed-off-by: harrisontin --- Cargo.lock | 28 +++++++++---------- agent/Cargo.toml | 2 +- controller/Cargo.toml | 2 +- deployment/helm/Chart.yaml | 4 +-- .../debug-echo-discovery-handler/Cargo.toml | 2 +- .../onvif-discovery-handler/Cargo.toml | 2 +- .../opcua-discovery-handler/Cargo.toml | 2 +- .../udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- version.txt | 2 +- webhooks/validating/configuration/Cargo.toml | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5551d4c8e..c3bf3d3b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -421,7 +421,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-shared", "anyhow", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "async-trait", @@ -524,7 +524,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-discovery-utils", "anyhow", @@ -992,7 +992,7 @@ checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "controller" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-shared", "anyhow", @@ -1202,7 +1202,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2433,7 +2433,7 @@ checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "onvif-discovery-handler" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4155,7 +4155,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.9.1" +version = "0.9.2" dependencies = [ "akri-shared", "env_logger", @@ -4425,7 +4425,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.9.1" +version = "0.9.2" dependencies = [ "actix", "actix-rt 2.7.0", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index b0d07c78d..ade9cb1f4 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 5ccc09bec..869e5080e 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.9.1" +version = "0.9.2" authors = ["", ""] edition = "2018" rust-version = "1.63.0" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index b2e781215..5adb06743 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.1 +version: 0.9.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.9.1 +appVersion: 0.9.2 diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 78d28f6b1..30a4be94d 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "debug-echo-discovery-handler" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index a839dc142..bf1a6fb4a 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "onvif-discovery-handler" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index 96cdba53b..dbf7c7dd4 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opcua-discovery-handler" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index ebe81d569..8f5e22b83 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-discovery-handler" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 6ed0b1cb5..7c504443c 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-debug-echo" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 88338631c..41422c643 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index f0a91a9b5..477dbda5f 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index 79cc27447..74de79606 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index 32b3522a6..d79bcee77 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 3f9c86078..094f4ff10 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-video-broker" -version = "0.9.1" +version = "0.9.2" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 355aa179d..ccbbe1375 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.9.1" +version = "0.9.2" authors = [""] edition = "2018" rust-version = "1.63.0" diff --git a/version.txt b/version.txt index f374f6662..2003b639c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.9.1 +0.9.2 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 17342b458..bccef0459 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.9.1" +version = "0.9.2" authors = ["DazWilkin "] edition = "2018" rust-version = "1.63.0" From 4a9825b9a6793e20360771b0f602ad4d39d7f21f Mon Sep 17 00:00:00 2001 From: harrisontin Date: Tue, 21 Mar 2023 11:38:22 -0700 Subject: [PATCH 06/15] cargo clippy suggestion Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index f874b3d60..c2cd10a72 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -116,7 +116,7 @@ fn test_tcp_connection(url: &str, tcp_stream: &impl TcpStream) -> Result<(), any fn get_discovery_url_from_application_description( server: &ApplicationDescription, filter_list: Option<&FilterList>, - ip_url: &String, + ip_url: &str, ) -> Option { trace!( "get_discovery_url_from_application - found server : {}", @@ -196,7 +196,7 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { match addr_str.to_socket_addrs() { Ok(_url) => discovery_url, Err(_) => { - if ip_url.chars().last().unwrap() == '/' && path.chars().nth(0).unwrap() == '/' { + if ip_url.ends_with('/') && path.starts_with('/') { path.remove(0); } let url = format!("{}{}", ip_url, path); @@ -454,13 +454,13 @@ mod tests { let discovery_url = "opc.tcp://OPCTest:50000/OPCUA/Simluation"; assert_eq!( - get_discovery_url_ip(&ip_url, discovery_url.to_string()), + get_discovery_url_ip(ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.1:50000/OPCUA/Simluation" ); let discovery_url = "opc.tcp://192.168.0.2:50000/OPCUA/Simluation"; assert_eq!( - get_discovery_url_ip(&ip_url, discovery_url.to_string()), + get_discovery_url_ip(ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.2:50000/OPCUA/Simluation" ); } From ac27c5142c8c43b16c142df0c1758025c2e8c2e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 21 Mar 2023 18:44:41 +0000 Subject: [PATCH 07/15] Update patch version Signed-off-by: github-actions[bot] --- Cargo.lock | 28 +++++++++---------- agent/Cargo.toml | 2 +- controller/Cargo.toml | 2 +- deployment/helm/Chart.yaml | 4 +-- .../debug-echo-discovery-handler/Cargo.toml | 2 +- .../onvif-discovery-handler/Cargo.toml | 2 +- .../opcua-discovery-handler/Cargo.toml | 2 +- .../udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- version.txt | 2 +- webhooks/validating/configuration/Cargo.toml | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3bf3d3b4..e00f892d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -421,7 +421,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-shared", "anyhow", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.9.2" +version = "0.9.3" dependencies = [ "anyhow", "async-trait", @@ -524,7 +524,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-discovery-utils", "anyhow", @@ -992,7 +992,7 @@ checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "controller" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-shared", "anyhow", @@ -1202,7 +1202,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2433,7 +2433,7 @@ checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "onvif-discovery-handler" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4155,7 +4155,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.9.2" +version = "0.9.3" dependencies = [ "akri-shared", "env_logger", @@ -4425,7 +4425,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.9.2" +version = "0.9.3" dependencies = [ "actix", "actix-rt 2.7.0", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index ade9cb1f4..f44e47650 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 869e5080e..de8017972 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.9.2" +version = "0.9.3" authors = ["", ""] edition = "2018" rust-version = "1.63.0" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index 5adb06743..2eddddca0 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.2 +version: 0.9.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.9.2 +appVersion: 0.9.3 diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 30a4be94d..5686a59a0 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "debug-echo-discovery-handler" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index bf1a6fb4a..4d1f342f1 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "onvif-discovery-handler" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index dbf7c7dd4..b6e6cdacf 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opcua-discovery-handler" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 8f5e22b83..16e840bd6 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-discovery-handler" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 7c504443c..b24e57afb 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-debug-echo" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 41422c643..513774bb9 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 477dbda5f..e79e219b7 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index 74de79606..53cd8c420 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index d79bcee77..725ff8e64 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 094f4ff10..c88337b55 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-video-broker" -version = "0.9.2" +version = "0.9.3" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index ccbbe1375..9b921f019 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.9.2" +version = "0.9.3" authors = [""] edition = "2018" rust-version = "1.63.0" diff --git a/version.txt b/version.txt index 2003b639c..965065db5 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.9.2 +0.9.3 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index bccef0459..98113991e 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.9.2" +version = "0.9.3" authors = ["DazWilkin "] edition = "2018" rust-version = "1.63.0" From 1425f6dc0603ef6e4bcf98d03607c84b0346e67f Mon Sep 17 00:00:00 2001 From: harrisontin Date: Tue, 21 Mar 2023 11:52:31 -0700 Subject: [PATCH 08/15] unit test comment Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index c2cd10a72..4906f885a 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -448,7 +448,7 @@ mod tests { } #[test] - + // Test that it converts the discovery url to an ip address if the discovery url is a hostname that is not resolvable fn test_get_discovery_url_ip() { let ip_url = "opc.tcp://192.168.0.1:50000/"; let discovery_url = "opc.tcp://OPCTest:50000/OPCUA/Simluation"; From 254bda0bfbafccd0f7a8f51da314732a5020dab2 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Fri, 24 Mar 2023 09:49:28 -0700 Subject: [PATCH 09/15] better comment in test Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index 4906f885a..609d9660f 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -188,7 +188,7 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { let url = Url::parse(&discovery_url).unwrap(); let mut path = url.path().to_string(); let host = url.host_str().unwrap(); - let port = url.port().unwrap(); + let port = url.port().unwrap_or(4841); let addr_str = format!("{}:{}", host, port); @@ -451,13 +451,15 @@ mod tests { // Test that it converts the discovery url to an ip address if the discovery url is a hostname that is not resolvable fn test_get_discovery_url_ip() { let ip_url = "opc.tcp://192.168.0.1:50000/"; - let discovery_url = "opc.tcp://OPCTest:50000/OPCUA/Simluation"; + // OPCTest.invalid is not a valid hostname, it should be overwritten by the ip_url + let discovery_url = "opc.tcp://OPCTest.invalid:50000/OPCUA/Simluation"; assert_eq!( get_discovery_url_ip(ip_url, discovery_url.to_string()), "opc.tcp://192.168.0.1:50000/OPCUA/Simluation" ); + // 192.168.0.2 is a valid ip address, it should not be overwritten let discovery_url = "opc.tcp://192.168.0.2:50000/OPCUA/Simluation"; assert_eq!( get_discovery_url_ip(ip_url, discovery_url.to_string()), From cc7a23ec57281abce589a3a522f588b5f683cbea Mon Sep 17 00:00:00 2001 From: harrisontin Date: Fri, 24 Mar 2023 09:52:03 -0700 Subject: [PATCH 10/15] revert change on default port Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index 609d9660f..4e4fd1734 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -188,7 +188,7 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { let url = Url::parse(&discovery_url).unwrap(); let mut path = url.path().to_string(); let host = url.host_str().unwrap(); - let port = url.port().unwrap_or(4841); + let port = url.port().unwrap(); let addr_str = format!("{}:{}", host, port); From 71adf26fe1d6990a872e78eeb9c1d84bea29347a Mon Sep 17 00:00:00 2001 From: harrisontin Date: Fri, 24 Mar 2023 10:45:41 -0700 Subject: [PATCH 11/15] error handling Signed-off-by: harrisontin --- .../opcua/src/discovery_impl.rs | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index 4e4fd1734..696fcbc83 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -150,9 +150,17 @@ fn get_discovery_url_from_application_description( Some(tcp_discovery_url) => tcp_discovery_url.to_string(), None => server_discovery_urls[0].to_string(), }; - // If discovery_url is DNS, convert it to IP address - let discovery_url_ip = get_discovery_url_ip(ip_url, discovery_url); - Some(discovery_url_ip) + // If discovery_url is DNS, check if it is resolvable, if not convert it to ip address + match get_discovery_url_ip(ip_url, discovery_url) { + Ok(discovery_url) => Some(discovery_url), + Err(e) => { + trace!( + "get_discovery_url_from_application - failed to resolve discovery url with error {:?}", + e + ); + None + } + } } else { trace!( "get_discovery_urls - Server {} doesn't have any DiscoveryUrls", @@ -184,8 +192,14 @@ fn get_socket_addr(url: &str) -> Result { } // This checks if the discovery_url can be resolved, if not use ip address instead -fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { - let url = Url::parse(&discovery_url).unwrap(); +fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> Result { + let url = Url::parse(&discovery_url).map_err(|_| anyhow::format_err!("could not parse url"))?; + if url.scheme() != OPC_TCP_SCHEME { + return Err(anyhow::format_err!( + "format of OPC UA url {} is not valid", + url + )); + } let mut path = url.path().to_string(); let host = url.host_str().unwrap(); let port = url.port().unwrap(); @@ -194,7 +208,7 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { // check if the hostname can be resolved to socket address match addr_str.to_socket_addrs() { - Ok(_url) => discovery_url, + Ok(_url) => Ok(discovery_url), Err(_) => { if ip_url.ends_with('/') && path.starts_with('/') { path.remove(0); @@ -204,7 +218,7 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> String { "get_discovery_url_ip - cannot resolve the application url from server, using ip address instead of hostname: {}", url ); - url + Ok(url) } } } @@ -455,14 +469,14 @@ mod tests { // OPCTest.invalid is not a valid hostname, it should be overwritten by the ip_url let discovery_url = "opc.tcp://OPCTest.invalid:50000/OPCUA/Simluation"; assert_eq!( - get_discovery_url_ip(ip_url, discovery_url.to_string()), + get_discovery_url_ip(ip_url, discovery_url.to_string()).unwrap(), "opc.tcp://192.168.0.1:50000/OPCUA/Simluation" ); // 192.168.0.2 is a valid ip address, it should not be overwritten let discovery_url = "opc.tcp://192.168.0.2:50000/OPCUA/Simluation"; assert_eq!( - get_discovery_url_ip(ip_url, discovery_url.to_string()), + get_discovery_url_ip(ip_url, discovery_url.to_string()).unwrap(), "opc.tcp://192.168.0.2:50000/OPCUA/Simluation" ); } From 1c8720c6b033a2c713c392b49ae7227067a4b462 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Mon, 27 Mar 2023 10:02:11 -0700 Subject: [PATCH 12/15] default opcua port: 4840 Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index 696fcbc83..b893e5533 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -6,6 +6,7 @@ use ::url::Url; use akri_discovery_utils::filtering::{should_include, FilterList}; use log::{error, info, trace}; use opcua::client::prelude::*; +use opcua::core::constants::DEFAULT_OPC_UA_SERVER_PORT; use std::{ net::{SocketAddr, ToSocketAddrs}, time::Duration, @@ -202,7 +203,7 @@ fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> Result Date: Fri, 7 Apr 2023 09:38:18 -0700 Subject: [PATCH 13/15] add discovery url in error msg Signed-off-by: harrisontin --- discovery-handlers/opcua/src/discovery_impl.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/discovery-handlers/opcua/src/discovery_impl.rs b/discovery-handlers/opcua/src/discovery_impl.rs index b893e5533..5a1398641 100644 --- a/discovery-handlers/opcua/src/discovery_impl.rs +++ b/discovery-handlers/opcua/src/discovery_impl.rs @@ -194,7 +194,8 @@ fn get_socket_addr(url: &str) -> Result { // This checks if the discovery_url can be resolved, if not use ip address instead fn get_discovery_url_ip(ip_url: &str, discovery_url: String) -> Result { - let url = Url::parse(&discovery_url).map_err(|_| anyhow::format_err!("could not parse url"))?; + let url = Url::parse(&discovery_url) + .map_err(|_| anyhow::format_err!("could not parse url {discovery_url}"))?; if url.scheme() != OPC_TCP_SCHEME { return Err(anyhow::format_err!( "format of OPC UA url {} is not valid", From 93ef0801af0773c022dd763ac00017a63b0f98f6 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Mon, 10 Apr 2023 18:24:16 -0700 Subject: [PATCH 14/15] version patch Signed-off-by: harrisontin --- Cargo.lock | 28 +++++++++---------- agent/Cargo.toml | 2 +- controller/Cargo.toml | 2 +- deployment/helm/Chart.yaml | 4 +-- .../debug-echo-discovery-handler/Cargo.toml | 2 +- .../onvif-discovery-handler/Cargo.toml | 2 +- .../opcua-discovery-handler/Cargo.toml | 2 +- .../udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- version.txt | 2 +- webhooks/validating/configuration/Cargo.toml | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e00f892d0..e12588ef0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -421,7 +421,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-shared", "anyhow", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.9.3" +version = "0.9.4" dependencies = [ "anyhow", "async-trait", @@ -524,7 +524,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-discovery-utils", "anyhow", @@ -992,7 +992,7 @@ checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "controller" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-shared", "anyhow", @@ -1202,7 +1202,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2433,7 +2433,7 @@ checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "onvif-discovery-handler" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4155,7 +4155,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.9.3" +version = "0.9.4" dependencies = [ "akri-shared", "env_logger", @@ -4425,7 +4425,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.9.3" +version = "0.9.4" dependencies = [ "actix", "actix-rt 2.7.0", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index f44e47650..4d96ba847 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index de8017972..289312062 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.9.3" +version = "0.9.4" authors = ["", ""] edition = "2018" rust-version = "1.63.0" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index 2eddddca0..fff9dc290 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.3 +version: 0.9.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.9.3 +appVersion: 0.9.4 diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 5686a59a0..798e95f36 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "debug-echo-discovery-handler" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 4d1f342f1..80f2bcbef 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "onvif-discovery-handler" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index b6e6cdacf..c080259b5 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opcua-discovery-handler" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 16e840bd6..4910e6cda 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-discovery-handler" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index b24e57afb..556c63463 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-debug-echo" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 513774bb9..2b712f9b2 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index e79e219b7..3eb6b6d00 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index 53cd8c420..56a4afc70 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index 725ff8e64..6a4d81059 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index c88337b55..819ff5715 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-video-broker" -version = "0.9.3" +version = "0.9.4" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 9b921f019..7f2b2eb8c 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.9.3" +version = "0.9.4" authors = [""] edition = "2018" rust-version = "1.63.0" diff --git a/version.txt b/version.txt index 965065db5..a602fc9e2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.9.3 +0.9.4 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 98113991e..b852fcc40 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.9.3" +version = "0.9.4" authors = ["DazWilkin "] edition = "2018" rust-version = "1.63.0" From b0bd81f85dbd126ffe21eb351bbe99031b653322 Mon Sep 17 00:00:00 2001 From: harrisontin Date: Mon, 10 Apr 2023 18:30:51 -0700 Subject: [PATCH 15/15] version patch Signed-off-by: harrisontin --- Cargo.lock | 28 +++++++++---------- agent/Cargo.toml | 2 +- controller/Cargo.toml | 2 +- deployment/helm/Chart.yaml | 4 +-- .../debug-echo-discovery-handler/Cargo.toml | 2 +- .../onvif-discovery-handler/Cargo.toml | 2 +- .../opcua-discovery-handler/Cargo.toml | 2 +- .../udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- version.txt | 2 +- webhooks/validating/configuration/Cargo.toml | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c1e6c9b8..da981f57f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -402,7 +402,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -422,7 +422,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-shared", "anyhow", @@ -444,7 +444,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -496,7 +496,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "async-trait", @@ -525,7 +525,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-discovery-utils", "anyhow", @@ -999,7 +999,7 @@ checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "controller" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-shared", "anyhow", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2473,7 +2473,7 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "onvif-discovery-handler" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2523,7 +2523,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4152,7 +4152,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4163,7 +4163,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.10.0" +version = "0.10.1" dependencies = [ "akri-shared", "env_logger", @@ -4434,7 +4434,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.10.0" +version = "0.10.1" dependencies = [ "actix", "actix-rt 2.7.0", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index 93f60abc2..fec176098 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 624c0fadf..93a6a74bd 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.10.0" +version = "0.10.1" authors = ["", ""] edition = "2018" rust-version = "1.63.0" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index 0e49d0152..d736c1115 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.10.0 +version: 0.10.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.10.0 +appVersion: 0.10.1 diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 2ebabfef5..b3d68c810 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "debug-echo-discovery-handler" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 12c41173b..5a8bb89c8 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "onvif-discovery-handler" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index 8e966aa77..3a7e70787 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opcua-discovery-handler" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 12f4f0c73..737f37a08 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-discovery-handler" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 69dde96f8..e603fa8cf 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-debug-echo" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 7a5b6a862..faaf19b73 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 7a8cd4b4b..7b7b82343 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index ee56b4bc7..2ec9ecaef 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index fa022f7de..8ad802434 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring "] edition = "2018" rust-version = "1.63.0" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 4b4b80f72..438ba9e78 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-video-broker" -version = "0.10.0" +version = "0.10.1" authors = ["Kate Goldenring ", ""] edition = "2018" rust-version = "1.63.0" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 3906083a0..5ed8e00ba 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.10.0" +version = "0.10.1" authors = [""] edition = "2018" rust-version = "1.63.0" diff --git a/version.txt b/version.txt index 78bc1abd1..571215736 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.10.0 +0.10.1 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index dde6b15fb..523ec32df 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.10.0" +version = "0.10.1" authors = ["DazWilkin "] edition = "2018" rust-version = "1.63.0"