fix: trigger scan on startup for non-code

snyk · Apr 16, 2024 · ae662fe · ae662fe
1 parent b532c4c
commit ae662fe
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/main/kotlin/io/snyk/plugin/SnykPostStartupActivity.kt b/src/main/kotlin/io/snyk/plugin/SnykPostStartupActivity.kt
@@ -116,7 +116,7 @@ class SnykPostStartupActivity : ProjectActivity {
         }
 
         if (settings.scanOnSave && isSnykCodeLSEnabled()) {
-            getSnykTaskQueueService(project)?.scan()
+            getSnykTaskQueueService(project)?.scanOnSave()
         }
 
         ExtensionPointsUtil.controllerManager.extensionList.forEach {

diff --git a/src/main/kotlin/io/snyk/plugin/services/SnykTaskQueueService.kt b/src/main/kotlin/io/snyk/plugin/services/SnykTaskQueueService.kt
@@ -130,6 +130,32 @@ class SnykTaskQueueService(val project: Project) {
         })
     }
 
+    fun scanOnSave() {
+        taskQueue.run(object : Task.Backgroundable(project, "Snyk: initializing...", true) {
+            override fun run(indicator: ProgressIndicator) {
+                if (!confirmScanningAndSetWorkspaceTrustedStateIfNeeded(project)) return
+
+                ApplicationManager.getApplication().invokeAndWait {
+                    FileDocumentManager.getInstance().saveAllDocuments()
+                }
+                indicator.checkCanceled()
+                waitUntilCliDownloadedIfNeeded()
+                indicator.checkCanceled()
+
+                // We don't want a Snyk Code scan to be triggered because it gets triggered via the LS
+                if (settings.ossScanEnable) {
+                    scheduleOssScan()
+                }
+                if (isIacEnabled() && settings.iacScanEnabled) {
+                    scheduleIacScan()
+                }
+                if (isContainerEnabled() && settings.containerScanEnabled) {
+                    scheduleContainerScan()
+                }
+            }
+        })
+    }
+
     fun waitUntilCliDownloadedIfNeeded() {
         downloadLatestRelease()
         do {