fix all clippy errors and update versions (#442)

project-akri · Jan 27, 2022 · 4cad8e7 · 4cad8e7
1 parent ad45736
commit 4cad8e7
Show file tree

Hide file tree

Showing 37 changed files with 96 additions and 87 deletions.
diff --git a/.github/workflows/check-rust.yml b/.github/workflows/check-rust.yml
@@ -46,6 +46,8 @@ jobs:
       run: cargo fmt --all -- --check
     - name: Check clippy
       run: cargo clippy --all
+    - name: Check clippy for tests
+      run: cargo clippy --all-targets --all-features -- -D warnings
     - name: Run check
       run:  cargo check
     - name: Check for H2 patch not being applied
@@ -57,4 +59,4 @@ jobs:
     - name: Run tests --ignored
       run: cargo test -- --ignored
     - name: Run doc
-      run: cargo doc --no-deps
+      run: export RUSTDOCFLAGS="-Dwarnings" && cargo doc --no-deps
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.8.1"
+version = "0.8.2"
 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
@@ -140,7 +140,8 @@ impl DevicePluginBuilderInterface for DevicePluginBuilder {
                     UnixListener::bind(task_socket_path).expect("Failed to bind to socket path");
 
                 async_stream::stream! {
-                    while let item = uds.accept().map_ok(|(st, _)| unix_stream::UnixStream(st)).await {
+                    loop {
+                        let item = uds.accept().map_ok(|(st, _)| unix_stream::UnixStream(st)).await;
                         yield item;
                     }
                 }
@@ -270,7 +271,8 @@ pub mod tests {
             let uds = UnixListener::bind(socket).expect("Failed to bind to socket path");
 
             async_stream::stream! {
-                while let item = uds.accept().map_ok(|(st, _)| unix_stream::UnixStream(st)).await {
+                loop {
+                    let item = uds.accept().map_ok(|(st, _)| unix_stream::UnixStream(st)).await;
                     yield item;
                 }
             }
@@ -348,7 +350,7 @@ pub mod tests {
         });
 
         // Make sure registration server has started
-        akri_shared::uds::unix_stream::try_connect(&kubelet_socket_str)
+        akri_shared::uds::unix_stream::try_connect(kubelet_socket_str)
             .await
             .unwrap();
 

diff --git a/agent/src/util/device_plugin_service.rs b/agent/src/util/device_plugin_service.rs
@@ -83,7 +83,7 @@ pub struct DevicePluginService {
     pub config_uid: String,
     /// Namespace of Instance's Configuration CRD
     pub config_namespace: String,
-    /// Instance is [not]shared
+    /// Instance is \[not\]shared
     pub shared: bool,
     /// Hostname of node this Device Plugin is running on
     pub node_name: String,
@@ -340,11 +340,11 @@ impl DevicePluginService {
 /// This returns the value that should be inserted at `device_usage_id` slot for an instance else an error.
 /// # More details
 /// Cases based on the usage slot (`device_usage_id`) value
-/// 1. device_usage[id] == "" ... this means that the device is available for use
+/// 1. device_usage\[id\] == "" ... this means that the device is available for use
 ///     * <ACTION> return this node name
-/// 2. device_usage[id] == self.nodeName ... this means THIS node previously used id, but the DevicePluginManager knows that this is no longer true
+/// 2. device_usage\[id\] == self.nodeName ... this means THIS node previously used id, but the DevicePluginManager knows that this is no longer true
 ///     * <ACTION> return ""
-/// 3. device_usage[id] == <some other node> ... this means that we believe this device is in use by another node and should be marked unhealthy
+/// 3. device_usage\[id\] == <some other node> ... this means that we believe this device is in use by another node and should be marked unhealthy
 ///     * <ACTION> return error
 /// 4. No corresponding id found ... this is an unknown error condition (BAD)
 ///     * <ACTION> return error
@@ -893,10 +893,11 @@ mod device_plugin_service_tests {
             .map(|x| format!("{}-{}", instance_name, x))
             .collect();
         assert_eq!(devices.len(), capacity);
-        // Can't use map on Device type
-        let device_ids: Vec<String> = devices.into_iter().map(|device| device.id).collect();
         for device in expected_device_ids {
-            assert!(device_ids.contains(&device));
+            assert!(devices
+                .iter()
+                .map(|device| device.id.clone())
+                .any(|d| d == device));
         }
     }
 

diff --git a/agent/src/util/discovery_operator.rs b/agent/src/util/discovery_operator.rs
@@ -871,7 +871,7 @@ pub mod tests {
             name: name.to_string(),
             endpoint,
             shared,
-            close_discovery_handler_connection: close_discovery_handler_connection,
+            close_discovery_handler_connection,
         }
     }
 

diff --git a/agent/src/util/registration.rs b/agent/src/util/registration.rs
@@ -186,7 +186,8 @@ pub async fn internal_run_registration_server(
             tokio::net::UnixListener::bind(socket_path).expect("Failed to bind to socket path");
 
         async_stream::stream! {
-            while let item = uds.accept().map_ok(|(st, _)| unix_stream::UnixStream(st)).await {
+            loop {
+                let item = uds.accept().map_ok(|(st, _)| unix_stream::UnixStream(st)).await;
                 yield item;
             }
         }

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

diff --git a/controller/src/util/instance_action.rs b/controller/src/util/instance_action.rs
@@ -334,6 +334,7 @@ mod handle_deletion_work_tests {
 /// broker Pod, the broker Service, and the capability Service.
 /// TODO: reduce parameters by passing Instance object instead of
 /// individual fields
+#[allow(clippy::too_many_arguments)]
 async fn handle_addition_work(
     instance_name: &str,
     instance_uid: &str,
@@ -689,7 +690,7 @@ mod handle_instance_tests {
                     "\"startTime\": \"2020-02-25T20:48:03Z\"",
                     &format!(
                         "\"startTime\": \"{}\"",
-                        start_time.format("%Y-%m-%dT%H:%M:%SZ").to_string()
+                        start_time.format("%Y-%m-%dT%H:%M:%SZ")
                     ),
                 );
                 let pods: PodList = serde_json::from_str(&start_time_adjusted_json).unwrap();

diff --git a/controller/src/util/node_watcher.rs b/controller/src/util/node_watcher.rs
@@ -550,7 +550,7 @@ mod tests {
         "selfLink": ""
     }
 }"#;
-    fn listify_node(node_json: &String) -> String {
+    fn listify_node(node_json: &str) -> String {
         format!("{}\n{}\n{}", LIST_PREFIX, node_json, LIST_SUFFIX)
     }
 

diff --git a/controller/src/util/pod_watcher.rs b/controller/src/util/pod_watcher.rs
@@ -523,6 +523,7 @@ impl BrokerPodWatcher {
     }
 
     /// This creates new service or updates existing service with ownership.
+    #[allow(clippy::too_many_arguments)]
     async fn create_or_update_service(
         &self,
         instance_name: &str,
@@ -1584,7 +1585,11 @@ mod tests {
 
     #[derive(Clone)]
     struct CleanupServices {
+        // This field is used for testing
+        #[allow(dead_code)]
         find_svc_selector: &'static str,
+        // This field is used for testing
+        #[allow(dead_code)]
         find_svc_result: &'static str,
         cleanup_services: Vec<CleanupService>,
         find_instance_id: &'static str,

diff --git a/controller/src/util/shared_test_utils.rs b/controller/src/util/shared_test_utils.rs
@@ -57,7 +57,7 @@ pub mod config_for_tests {
         "selfLink": ""
     }
 }"#;
-    fn listify_kube_object(node_json: &String) -> String {
+    fn listify_kube_object(node_json: &str) -> String {
         format!("{}\n{}\n{}", LIST_PREFIX, node_json, LIST_SUFFIX)
     }
 

diff --git 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.8.1
+version: 0.8.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.8.1
+appVersion: 0.8.2
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.8.1"
+version = "0.8.2"
 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.8.1"
+version = "0.8.2"
 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.8.1"
+version = "0.8.2"
 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.8.1"
+version = "0.8.2"
 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.8.1"
+version = "0.8.2"
 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.8.1"
+version = "0.8.2"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/onvif/src/discovery_handler.rs b/discovery-handlers/onvif/src/discovery_handler.rs
@@ -108,7 +108,7 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
                 let futures: Vec<_> = latest_cameras
                     .iter()
                     .filter(|c| !previous_cameras.contains(c))
-                    .map(|c| apply_filters(&discovery_handler_config, &c, &onvif_query))
+                    .map(|c| apply_filters(&discovery_handler_config, c, &onvif_query))
                     .collect();
                 let options = futures_util::future::join_all(futures).await;
                 // Insert newly discovered camera that are not filtered out
@@ -154,7 +154,7 @@ async fn apply_filters(
 ) -> Option<(String, Device)> {
     info!("apply_filters - device service url {}", device_service_uri);
     let (ip_address, mac_address) = match onvif_query
-        .get_device_ip_and_mac_address(&device_service_uri)
+        .get_device_ip_and_mac_address(device_service_uri)
         .await
     {
         Ok(ip_and_mac) => ip_and_mac,

diff --git a/discovery-handlers/onvif/src/discovery_impl.rs b/discovery-handlers/onvif/src/discovery_impl.rs
@@ -304,7 +304,7 @@ pub mod util {
 
         let envelope_as_string = create_onvif_discovery_message(&uuid_str);
         socket
-            .send_to(&envelope_as_string.as_bytes(), multi_socket_addr)
+            .send_to(envelope_as_string.as_bytes(), multi_socket_addr)
             .await?;
         Ok(socket)
     }

diff --git a/discovery-handlers/onvif/src/discovery_utils.rs b/discovery-handlers/onvif/src/discovery_utils.rs
@@ -364,7 +364,7 @@ async fn inner_get_device_profile_streaming_uri(
 /// Gets the streaming uri for a given profile for an ONVIF camera
 async fn inner_is_device_responding(url: &str, http: &impl Http) -> Result<String, anyhow::Error> {
     http.post(
-        &url,
+        url,
         &get_action(DEVICE_WSDL, "GetSystemDateAndTime"),
         &GET_SYSTEM_DATE_AND_TIME_TEMPLATE.to_string(),
     )