refactor: Fix clippy warnings

Author: ValentinLeTallec

cloud-scanner-cli/src/aws_cloud_provider.rs

@@ -431,12 +431,12 @@ mod tests {
     async fn get_cpu_usage_metrics_of_running_instance_should_return_right_number_of_data_points() {
         let aws: AwsCloudProvider = AwsCloudProvider::new("eu-west-1").await.unwrap();
         let res = aws
-            .get_average_cpu_usage_of_last_10_minutes(&RUNNING_INSTANCE_ID)
+            .get_average_cpu_usage_of_last_10_minutes(RUNNING_INSTANCE_ID)
             .await
             .unwrap();
         let datapoints = res.datapoints.unwrap();
         assert!(
-            0 < datapoints.len() && datapoints.len() < 3,
+            !datapoints.is_empty() && datapoints.len() < 3,
             "Strange number of datapoint returned for instance {}, is it really up ?. I was expecting 1 or 2  but got {} .\n {:#?}",
             &RUNNING_INSTANCE_ID,
             datapoints.len(),
@@ -476,15 +476,15 @@ mod tests {
         // This instance  needs to be running for the test to pass
         let aws: AwsCloudProvider = AwsCloudProvider::new("eu-west-1").await.unwrap();
 
-        let avg_cpu_load = aws.get_average_cpu(&RUNNING_INSTANCE_ID).await.unwrap();
+        let avg_cpu_load = aws.get_average_cpu(RUNNING_INSTANCE_ID).await.unwrap();
         assert_ne!(
             0 as f64, avg_cpu_load,
             "CPU load of instance {} is zero, is it really running ?",
             &RUNNING_INSTANCE_ID
         );
         println!("{:#?}", avg_cpu_load);
-        assert!((0 as f64) < avg_cpu_load);
-        assert!((100 as f64) > avg_cpu_load);
+        assert!(0_f64 < avg_cpu_load);
+        assert!(100_f64 > avg_cpu_load);
     }
 
     #[tokio::test]

cloud-scanner-cli/src/boavizta_api_v1.rs

@@ -377,7 +377,7 @@ mod tests {
             tags: Vec::new(),
         };
         let api: BoaviztaApiV1 = BoaviztaApiV1::new(TEST_API_URL);
-        let one_hour = 1.0 as f32;
+        let one_hour = 1.0_f32;
         let res = api
             .get_raws_impacts(instance1, &one_hour, false)
             .await
@@ -404,7 +404,7 @@ mod tests {
         };
 
         let api: BoaviztaApiV1 = BoaviztaApiV1::new(TEST_API_URL);
-        let one_hour = 1.0 as f32;
+        let one_hour = 1.0_f32;
         let res = api.get_raws_impacts(hdd, &one_hour, true).await.unwrap();
 
         let expected: serde_json::Value = serde_json::from_str(DEFAULT_RAW_IMPACTS_OF_HDD).unwrap();
@@ -429,7 +429,7 @@ mod tests {
         };
 
         let api: BoaviztaApiV1 = BoaviztaApiV1::new(TEST_API_URL);
-        let one_hour = 1.0 as f32;
+        let one_hour = 1.0_f32;
         let res = api.get_raws_impacts(ssd, &one_hour, true).await.unwrap();
 
         let expected: serde_json::Value =
@@ -470,11 +470,9 @@ mod tests {
         };
 
         let api: BoaviztaApiV1 = BoaviztaApiV1::new(TEST_API_URL);
-        let one_hour = 1.0 as f32;
+        let one_hour = 1.0_f32;
 
-        let mut instances: Vec<CloudResource> = Vec::new();
-        instances.push(instance1);
-        instances.push(instance1_1percent);
+        let instances: Vec<CloudResource> = vec![instance1, instance1_1percent];
 
         let inventory = Inventory {
             metadata: InventoryMetadata {
@@ -538,11 +536,8 @@ mod tests {
             tags: Vec::new(),
         };
 
-        let mut instances: Vec<CloudResource> = Vec::new();
-        instances.push(instance1);
-        instances.push(instance2);
-        instances.push(instance3);
-        let one_hour = 1.0 as f32;
+        let instances: Vec<CloudResource> = vec![instance1, instance2, instance3];
+        let one_hour = 1.0_f32;
 
         let inventory = Inventory {
             metadata: InventoryMetadata {
@@ -590,7 +585,7 @@ mod tests {
 
         let raw_impacts =
             Some(serde_json::from_str(DEFAULT_RAW_IMPACTS_OF_M6GXLARGE_1HRS_FR).unwrap());
-        let one_hour: f32 = 1 as f32;
+        let one_hour: f32 = 1_f32;
         let cloud_resource_with_impacts: CloudResourceWithImpacts =
             boa_impacts_to_cloud_resource_with_impacts(&instance1, &raw_impacts, &one_hour);
         assert!(
@@ -636,7 +631,7 @@ mod tests {
 
         let raw_impacts =
             Some(serde_json::from_str(DEFAULT_RAW_IMPACTS_OF_M6GXLARGE_1HRS_FR_VERBOSE).unwrap());
-        let one_hour: f32 = 1 as f32;
+        let one_hour: f32 = 1_f32;
         let cloud_resource_with_impacts: CloudResourceWithImpacts =
             boa_impacts_to_cloud_resource_with_impacts(&instance1, &raw_impacts, &one_hour);
         assert!(

cloud-scanner-cli/src/model.rs

@@ -285,11 +285,10 @@ mod tests {
             },
         );
 
-        let mut instance1tags: Vec<CloudResourceTag> = Vec::new();
-        instance1tags.push(CloudResourceTag {
+        let instance1tags: Vec<CloudResourceTag> = vec![CloudResourceTag {
             key: "Name".to_string(),
             value: Some("App1".to_string()),
-        });
+        }];
 
         let instance1: CloudResource = CloudResource {
             provider: CloudProvider::AWS,
@@ -302,8 +301,7 @@ mod tests {
             tags: instance1tags,
         };
 
-        assert_eq!(
-            true,
+        assert!(
             instance1.has_matching_tagmap(&filtertags),
             "Tags should match"
         );
@@ -317,9 +315,8 @@ mod tests {
                 value: Some("OtherApp".to_string()),
             },
         );
-        assert_eq!(
-            false,
-            instance1.has_matching_tagmap(&other_name_tag),
+        assert!(
+            !instance1.has_matching_tagmap(&other_name_tag),
             "Tags should not match"
         );
 
@@ -332,9 +329,8 @@ mod tests {
                 value: Some("PROD".to_string()),
             },
         );
-        assert_eq!(
-            false,
-            instance1.has_matching_tagmap(&more_tags),
+        assert!(
+            !instance1.has_matching_tagmap(&more_tags),
             "Tags should not match"
         );
 
@@ -347,16 +343,14 @@ mod tests {
                 value: None,
             },
         );
-        assert_eq!(
-            false,
-            instance1.has_matching_tagmap(&tag_without_val),
+        assert!(
+            !instance1.has_matching_tagmap(&tag_without_val),
             "Tag without a value should not match"
         );
 
         // Trying an empty filter
         let empty_filter = HashMap::new();
-        assert_eq!(
-            true,
+        assert!(
             instance1.has_matching_tagmap(&empty_filter),
             "Tags should match"
         );
@@ -372,8 +366,7 @@ mod tests {
                 value: Some("whatever".to_string()),
             },
         );
-        assert_eq!(
-            true,
+        assert!(
             instance1.has_matching_tagmap(&empty_filter),
             "Tags should match (i.e. we should ignore this invalid filter"
         );