feat: scan all products on startup if enabled (#510)

snyk · Apr 10, 2024 · b532c4c · b532c4c
1 parent 0f33277
commit b532c4c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Added
 - force download of compatible CLI on mismatched LS protocol versions
 - bumped LS protocol version to ensure built-in LS in CLI has necessary commands for global ignores
+- (LS Preview) trigger scan on startup if auto-scan is enabled in Settings
 
 ## [2.7.13]
 ### Added

diff --git a/src/main/kotlin/io/snyk/plugin/SnykPostStartupActivity.kt b/src/main/kotlin/io/snyk/plugin/SnykPostStartupActivity.kt
@@ -112,7 +112,11 @@ class SnykPostStartupActivity : ProjectActivity {
         getAmplitudeExperimentService().fetch(experimentUser)
 
         if (isContainerEnabled()) {
-            getKubernetesImageCache(project)?.scanProjectForKubernetesFiles()
+            getKubernetesImageCache(project)?.cacheKubernetesFileFromProject()
+        }
+
+        if (settings.scanOnSave && isSnykCodeLSEnabled()) {
+            getSnykTaskQueueService(project)?.scan()
         }
 
         ExtensionPointsUtil.controllerManager.extensionList.forEach {

diff --git a/src/main/kotlin/io/snyk/plugin/ui/settings/ScanTypesPanel.kt b/src/main/kotlin/io/snyk/plugin/ui/settings/ScanTypesPanel.kt
@@ -106,7 +106,7 @@ class ScanTypesPanel(
                     correctLastProductDisabled(it)
                     settings.containerScanEnabled = this.isSelected
                     val imagesCache = getKubernetesImageCache(project)
-                    if (this.isSelected) imagesCache?.scanProjectForKubernetesFiles() else imagesCache?.clear()
+                    if (this.isSelected) imagesCache?.cacheKubernetesFileFromProject() else imagesCache?.clear()
                 }
             }
         }

diff --git a/src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykToolWindowPanel.kt b/src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykToolWindowPanel.kt
@@ -449,7 +449,7 @@ class SnykToolWindowPanel(val project: Project) : JPanel(), Disposable {
         if (isContainerEnabled()) {
             getKubernetesImageCache(project)?.let {
                 it.clear()
-                it.scanProjectForKubernetesFiles()
+                it.cacheKubernetesFileFromProject()
             }
         }
 

diff --git a/src/main/kotlin/snyk/container/KubernetesImageCache.kt b/src/main/kotlin/snyk/container/KubernetesImageCache.kt
@@ -19,7 +19,7 @@ class KubernetesImageCache(val project: Project) {
         images.clear()
     }
 
-    fun scanProjectForKubernetesFiles() {
+    fun cacheKubernetesFileFromProject() {
         val callable = Callable {
             ProjectRootManager.getInstance(project).fileIndex.iterateContent { virtualFile ->
                 extractFromFileAndAddToCache(virtualFile)

diff --git a/src/test/kotlin/io/snyk/plugin/ui/toolwindow/settings/ScanTypesPanelTest.kt b/src/test/kotlin/io/snyk/plugin/ui/toolwindow/settings/ScanTypesPanelTest.kt
@@ -110,11 +110,11 @@ class ScanTypesPanelTest : LightPlatform4TestCase() {
     @Test
     fun `KubernetesImageCache rescan after container enablement`() {
         val cacheMock = setUpContainerScanTypePanelTests()
-        justRun { cacheMock.scanProjectForKubernetesFiles() }
+        justRun { cacheMock.cacheKubernetesFileFromProject() }
 
         getContainerCheckBox(initialValue = false, switchSelection = true)
 
-        verify(exactly = 1) { cacheMock.scanProjectForKubernetesFiles() }
+        verify(exactly = 1) { cacheMock.cacheKubernetesFileFromProject() }
     }
 
     @Test