feat: receive the image in the command

Author: tembleking

src/app/commands.rs

@@ -67,45 +67,39 @@ impl<C> CommandExecutor<C>
 where
     C: LSPClient,
 {
-    pub async fn scan_image_from_file(
+    pub async fn scan_image(
         &self,
         uri: &str,
         line: u32,
+        image_name: &str,
         image_scanner: &impl ImageScanner,
     ) -> Result<()> {
-        let document_text = self
-            .document_database
-            .read_document_text(uri)
-            .await
-            .ok_or_else(|| {
-                Error::internal_error().with_message("unable to obtain document to scan")
-            })?;
-
-        let image_for_selected_line =
-            self.image_from_line(line, &document_text).ok_or_else(|| {
-                Error::parse_error().with_message(format!(
-                    "unable to retrieve image for the selected line: {line}"
-                ))
-            })?;
-
         self.show_message(
             MessageType::INFO,
-            format!("Starting scan of {image_for_selected_line}...").as_str(),
+            format!("Starting scan of {image_name}...").as_str(),
         )
         .await;
 
         let scan_result = image_scanner
-            .scan_image(image_for_selected_line)
+            .scan_image(image_name)
             .await
             .map_err(|e| Error::internal_error().with_message(e.to_string()))?;
 
         self.show_message(
             MessageType::INFO,
-            format!("Finished scan of {image_for_selected_line}.").as_str(),
+            format!("Finished scan of {image_name}.").as_str(),
         )
         .await;
 
         let diagnostic = {
+            let document_text = self
+                .document_database
+                .read_document_text(uri)
+                .await
+                .ok_or_else(|| {
+                    Error::internal_error().with_message("unable to obtain document to scan")
+                })?;
+
             let range_for_selected_line = Range::new(
                 Position::new(line, 0),
                 Position::new(
@@ -128,7 +122,7 @@ where
             if scan_result.has_vulnerabilities() {
                 diagnostic.message = format!(
                     "Vulnerabilities found for {}: {} Critical, {} High, {} Medium, {} Low, {} Negligible",
-                    image_for_selected_line,
+                    image_name,
                     scan_result.count_vulns_of_severity(VulnSeverity::Critical),
                     scan_result.count_vulns_of_severity(VulnSeverity::High),
                     scan_result.count_vulns_of_severity(VulnSeverity::Medium),

src/app/lsp_server.rs

@@ -352,6 +352,14 @@ async fn execute_command_scan_base_image<C: LSPClient>(
         return Err(Error::internal_error().with_message("line is not a u32"));
     };
 
+    let Some(image_name) = params.arguments.get(2) else {
+        return Err(Error::internal_error().with_message("no image name was provided"));
+    };
+
+    let Some(image_name) = image_name.as_str() else {
+        return Err(Error::internal_error().with_message("image name is not a string"));
+    };
+
     let image_scanner = {
         let mut lock = server.component_factory.write().await;
         lock.image_scanner().map_err(|e| {
@@ -361,7 +369,7 @@ async fn execute_command_scan_base_image<C: LSPClient>(
 
     server
         .command_executor
-        .scan_image_from_file(uri, line, &image_scanner)
+        .scan_image(uri, line, image_name, &image_scanner)
         .await?;
 
     Ok(())