Merge pull request #95 from Opetushallitus/OY-4820_estetaan_tyhja_buc…

…ketav_pyynto OY-4820 Ei lähetetä BucketAV:lle skannauspyyntöä tyhjälle joukolle tiedostoja
Opetushallitus · May 7, 2024 · cd3ed40 · cd3ed40
2 parents 242b0f7 + f44e69b
commit cd3ed40
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/liiteri/virus_scan.clj b/src/liiteri/virus_scan.clj
@@ -102,17 +102,18 @@
   Scanner
 
   (request-file-scan [this metadata]
-    (doseq [file metadata]
-      (log/info (str "Requesting file scan for " (:key file) ", to bucket " (:s3-bucket this))))
-    (.sendMessage (:sqs-request-scan-client this) (:request-queue-url this)
-                  (json/generate-string {:objects
-                                         (map (fn [file]
-                                                {:bucket (:s3-bucket this)
-                                                 :key (:key file)
-                                                 :custom_data (json/generate-string {:start-time (System/currentTimeMillis)
-                                                                                     :filename (:filename file)
-                                                                                     :content-type (:content-type file)})})
-                                              metadata)}))))
+    (when (not-empty metadata)
+      (doseq [file metadata]
+        (log/info (str "Requesting file scan for " (:key file) ", to bucket " (:s3-bucket this))))
+      (.sendMessage (:sqs-request-scan-client this) (:request-queue-url this)
+                    (json/generate-string {:objects
+                                           (map (fn [file]
+                                                  {:bucket (:s3-bucket this)
+                                                   :key (:key file)
+                                                   :custom_data (json/generate-string {:start-time (System/currentTimeMillis)
+                                                                                       :filename (:filename file)
+                                                                                       :content-type (:content-type file)})})
+                                                metadata)})))))
 
 (defn new-scanner []
   (map->VirusScanner {}))