Skip to content

Commit ee413ba

Browse files
authored
Merge pull request #532 from snyk/feat/IDE-141_flip-feature-flag-for-snyk-code-via-ls
feat: flip feature flag for Snyk Code via LS to true [IDE-141]
2 parents 2eb8c47 + b9bab67 commit ee413ba

File tree

6 files changed

+7
-198
lines changed

6 files changed

+7
-198
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Snyk Security Changelog
22

3+
## [2.8.0]
4+
5+
### Added
6+
- Serve Snyk Code functionality via language server. This enables auto-scanning on startup / save, code actions for Snyk Learn and, if enabled, Snyk Auto-Fix. The number of uploaded files is not shown anymore.
7+
38
## [2.7.21]
49

510
### Fixed

src/main/kotlin/io/snyk/plugin/Utils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ fun isContainerEnabled(): Boolean = true
278278

279279
fun isFileListenerEnabled(): Boolean = pluginSettings().fileListenerEnabled
280280

281-
fun isSnykCodeLSEnabled(): Boolean = Registry.`is`("snyk.preview.snyk.code.ls.enabled", true)
281+
fun isSnykCodeLSEnabled() = true
282282

283283
fun isSnykOSSLSEnabled(): Boolean = Registry.`is`("snyk.preview.snyk.oss.ls.enabled", false)
284284

src/main/kotlin/io/snyk/plugin/ui/settings/ScanTypesPanel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class ScanTypesPanel(
269269

270270
private fun getUploadingFilesMessage(): String {
271271
// FIXME: implement count of files
272-
if (isSnykCodeLSEnabled()) return "Snyk Code Language Server is enabled. Count of files is not implemented yet."
272+
if (isSnykCodeLSEnabled()) return ""
273273
val allSupportedFilesInProject =
274274
SnykCodeUtils.instance.getAllSupportedFilesInProject(project, true, null)
275275
val allSupportedFilesCount = allSupportedFilesInProject.size

src/test/kotlin/io/snyk/plugin/core/IgnoreInfoHolderPlatformTestCase.kt

-132
This file was deleted.

src/test/kotlin/io/snyk/plugin/services/SnykTaskQueueServiceTest.kt

-53
Original file line numberDiff line numberDiff line change
@@ -162,20 +162,6 @@ class SnykTaskQueueServiceTest : LightPlatformTestCase() {
162162
snykTaskQueueService.downloadLatestRelease()
163163
}
164164

165-
fun testSastEnablementCheckInScan() {
166-
val snykTaskQueueService = project.service<SnykTaskQueueService>()
167-
val settings = pluginSettings()
168-
settings.ossScanEnable = false
169-
settings.snykCodeSecurityIssuesScanEnable = true
170-
settings.snykCodeQualityIssuesScanEnable = true
171-
settings.token = "testToken"
172-
173-
snykTaskQueueService.scan(false)
174-
PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
175-
176-
verify { snykApiServiceMock.getSastSettings() }
177-
}
178-
179165
fun `test LCE should be unknown in initial settings state`() {
180166
val settings = pluginSettings()
181167

@@ -234,45 +220,6 @@ class SnykTaskQueueServiceTest : LightPlatformTestCase() {
234220
}
235221
}
236222

237-
fun testSnykTaskQueueServiceScanCodeOnStartupAndFailsWhenLS() {
238-
val registryValue = Registry.get("snyk.preview.snyk.code.ls.enabled")
239-
registryValue.setValue(false)
240-
241-
val snykTaskQueueService = project.service<SnykTaskQueueService>()
242-
val settings = pluginSettings()
243-
settings.ossScanEnable = true
244-
settings.snykCodeSecurityIssuesScanEnable = true
245-
settings.snykCodeQualityIssuesScanEnable = true
246-
settings.token = "testToken"
247-
settings.iacScanEnabled = true
248-
settings.containerScanEnabled = true
249-
getSnykCachedResults(project)?.currentOssResults = null
250-
getSnykCachedResults(project)?.currentIacResult = null
251-
getSnykCachedResults(project)?.currentContainerResult = null
252-
getSnykCachedResults(project)?.currentSnykCodeResults = null
253-
254-
val fakeOSSResult = OssResult(emptyList())
255-
val fakeIacResult = IacResult(emptyList())
256-
val fakeContainerResult = ContainerResult(emptyList())
257-
258-
mockkStatic("io.snyk.plugin.UtilsKt")
259-
every { isIacEnabled() } returns true
260-
every { isCliInstalled() } returns true
261-
every { getSnykCode(project)?.scan() } returns null
262-
every { getOssService(project)?.scan() } returns fakeOSSResult
263-
every { getIacService(project)?.scan() } returns fakeIacResult
264-
every { getContainerService(project)?.scan() } returns fakeContainerResult
265-
266-
snykTaskQueueService.scan(true)
267-
PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
268-
269-
assertEquals(fakeOSSResult, getSnykCachedResults(project)?.currentOssResults)
270-
assertEquals(fakeIacResult, getSnykCachedResults(project)?.currentIacResult)
271-
await().atMost(2, TimeUnit.SECONDS).until {
272-
getSnykCachedResults(project)?.currentContainerResult != null
273-
}
274-
verify(exactly = 1) { getSnykCode(project)?.scan() }
275-
}
276223
fun testSnykTaskQueueServiceDoesNotScanCodeOnStartupWhenLS() {
277224
val registryValue = Registry.get("snyk.preview.snyk.code.ls.enabled")
278225
registryValue.setValue(true)

src/test/kotlin/snyk/code/annotator/SnykCodeAnnotatorTest.kt

-11
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,6 @@ class SnykCodeAnnotatorTest : BasePlatformTestCase() {
103103
assertTrue(actual.contains(issue.title) || actual.contains(issue.message))
104104
}
105105

106-
@Test
107-
fun `test apply should trigger newAnnotation call`() {
108-
mockkObject(AnalysisData)
109-
every { AnalysisData.instance.getAnalysis(SnykFile(psiFile.project, psiFile.virtualFile)) } returns
110-
createSnykCodeResultWithIssues()
111-
112-
cut.apply(psiFile, Unit, annotationHolderMock)
113-
114-
verify { annotationHolderMock.newAnnotation(any(), any()) }
115-
}
116-
117106
@Test
118107
fun `test apply for disabled Severity should not trigger newAnnotation call`() {
119108
mockkObject(AnalysisData)

0 commit comments

Comments
 (0)