use valid format for dummy uris connect through UDS channel (#668)

* use valid format for dummy uris connect through UDS channel Signed-off-by: Johnson Shih <jshih@microsoft.com> * update patch version Signed-off-by: Johnson Shih <jshih@microsoft.com> * update patch version Signed-off-by: Johnson Shih <jshih@microsoft.com> * update node version Signed-off-by: Johnson Shih <jshih@microsoft.com> --------- Signed-off-by: Johnson Shih <jshih@microsoft.com>
project-akri · Oct 19, 2023 · 12e66e7 · 12e66e7
1 parent 172eb2b
commit 12e66e7
Show file tree

Hide file tree

Showing 30 changed files with 61 additions and 49 deletions.
diff --git a/.github/workflows/build-agent-container.yml b/.github/workflows/build-agent-container.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install
@@ -87,7 +87,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install

diff --git a/.github/workflows/build-controller-container.yml b/.github/workflows/build-controller-container.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install
@@ -82,7 +82,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install

diff --git a/.github/workflows/build-discovery-handlers.yml b/.github/workflows/build-discovery-handlers.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install
@@ -91,7 +91,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install

diff --git a/.github/workflows/build-opencv-base-container.yml b/.github/workflows/build-opencv-base-container.yml
@@ -121,7 +121,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install

diff --git a/.github/workflows/build-rust-crossbuild-container.yml b/.github/workflows/build-rust-crossbuild-container.yml
@@ -121,7 +121,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install

diff --git a/.github/workflows/build-udev-video-broker-container.yml b/.github/workflows/build-udev-video-broker-container.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install
@@ -83,7 +83,7 @@ jobs:
     - name: Prepare To Install
       uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 18
     - name: Install Deps
       run: |
         yarn install

diff --git a/.github/workflows/build-webhook-configuration-container.yml b/.github/workflows/build-webhook-configuration-container.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Prepare To Install
         uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 18
       - name: Install Deps
         run: |
           yarn install
@@ -80,7 +80,7 @@ jobs:
       - name: Prepare To Install
         uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 18
       - name: Install Deps
         run: |
           yarn install

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"

diff --git a/agent/src/util/device_plugin_builder.rs b/agent/src/util/device_plugin_builder.rs
@@ -249,8 +249,11 @@ impl DevicePluginBuilder {
         };
 
         // We will ignore this dummy uri because UDS does not use it.
+        // Some servers will check the uri content so the uri needs to
+        // be in valid format even it's not used, the scheme part is used
+        // to specific what scheme to use, such as http or https
         let kubelet_socket_closure = kubelet_socket.to_string();
-        let channel = Endpoint::try_from("http://[::]:50051")?
+        let channel = Endpoint::try_from("http://[::1]:50051")?
             .connect_with_connector(service_fn(move |_: Uri| {
                 UnixStream::connect(kubelet_socket_closure.clone())
             }))

diff --git a/agent/src/util/discovery_operator.rs b/agent/src/util/discovery_operator.rs
@@ -187,7 +187,10 @@ impl DiscoveryOperator {
                 // Clone socket for closure which has static lifetime
                 let socket = socket.clone();
                 // We will ignore this dummy uri because UDS does not use it.
-                match Endpoint::try_from("http://[::]:50051")
+                // Some servers will check the uri content so the uri needs to
+                // be in valid format even it's not used, the scheme part is used
+                // to specific what scheme to use, such as http or https
+                match Endpoint::try_from("http://[::1]:50051")
                     .unwrap()
                     .connect_with_connector(tower::service_fn(move |_: Uri| {
                         let endpoint = socket.clone();

diff --git a/agent/src/util/registration.rs b/agent/src/util/registration.rs
@@ -365,7 +365,7 @@ mod tests {
             .await
             .is_ok());
         // Connect to registration service
-        let channel = Endpoint::try_from("http://[::]:50051")
+        let channel = Endpoint::try_from("http://[::1]:50051")
             .unwrap()
             .connect_with_connector(tower::service_fn(move |_: Uri| {
                 UnixStream::connect(registration_socket_path_string.clone())

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["<bfjelds@microsoft.com>", "<kagold@microsoft.com>"]
 edition = "2018"

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -16,9 +16,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.12.13
+version: 0.12.14
 
 # 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.12.13
+appVersion: 0.12.14
diff --git 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.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git 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.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git 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.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git 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.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git 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.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"

diff --git a/discovery-utils/src/discovery/mod.rs b/discovery-utils/src/discovery/mod.rs
@@ -280,7 +280,7 @@ pub mod server {
                 Vec::new(),
             )
             .await;
-            let channel = Endpoint::try_from("http://[::]:50051")
+            let channel = Endpoint::try_from("http://[::1]:50051")
                 .unwrap()
                 .connect_with_connector(tower::service_fn(move |_: Uri| {
                     UnixStream::connect(discovery_handler_socket.clone())

diff --git a/discovery-utils/src/registration_client.rs b/discovery-utils/src/registration_client.rs
@@ -14,7 +14,10 @@ pub async fn register_discovery_handler(
     info!("register_discovery_handler - entered");
     loop {
         // We will ignore this dummy uri because UDS does not use it.
-        if let Ok(channel) = Endpoint::try_from("http://[::]:50051")?
+        // Some servers will check the uri content so the uri needs to
+        // be in valid format even it's not used, the scheme part is used
+        // to specific what scheme to use, such as http or https
+        if let Ok(channel) = Endpoint::try_from("http://[::1]:50051")?
             .connect_with_connector(tower::service_fn(move |_: Uri| {
                 tokio::net::UnixStream::connect(super::get_registration_socket())
             }))

diff --git 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.12.13"
+version = "0.12.14"
 license = "Apache-2.0"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"