Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ data class SaveConfigRequest(
@SerializedName("activateSnykOpenSource") val activateSnykOpenSource: Boolean? = null,
@SerializedName("activateSnykCode") val activateSnykCode: Boolean? = null,
@SerializedName("activateSnykIac") val activateSnykIac: Boolean? = null,
@SerializedName("activateSnykSecrets") val activateSnykSecrets: Boolean? = null,
@SerializedName("scanningMode") val scanningMode: String? = null,

// Connection Settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ class SaveConfigHandler(
settings.ossScanEnable = config.activateSnykOpenSource ?: false
settings.snykCodeSecurityIssuesScanEnable = config.activateSnykCode ?: false
settings.iacScanEnabled = config.activateSnykIac ?: false
settings.secretsEnabled = config.activateSnykSecrets ?: false

// Scanning mode
config.scanningMode?.let { settings.scanOnSave = (it == "auto") }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,7 @@ class SnykToolWindowPanel(val project: Project) : JPanel(), Disposable {
ScanIssue.CODE_SECURITY -> cache?.currentSnykCodeResultsLS
ScanIssue.OPEN_SOURCE -> cache?.currentOSSResultsLS
ScanIssue.INFRASTRUCTURE_AS_CODE -> cache?.currentIacResultsLS
else -> {
null
}
else -> null
}
productIssues?.values?.any { issues -> issues.any { issue.id == it.id } } == true
} else {
Expand Down Expand Up @@ -538,7 +536,7 @@ class SnykToolWindowPanel(val project: Project) : JPanel(), Disposable {
scanListenerLS.displayIacResults(results)
}
}
LsProduct.Secrets -> Unit // we use the HTML tree for secrets
LsProduct.Secrets -> Unit
LsProduct.Unknown -> Unit
}
}
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/snyk/common/lsp/LanguageServerWrapper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ class LanguageServerWrapper(private val project: Project) : Disposable {
activateSnykOpenSource = ps.ossScanEnable.toString(),
activateSnykCodeSecurity = ps.snykCodeSecurityIssuesScanEnable.toString(),
activateSnykIac = ps.iacScanEnabled.toString(),
activateSnykSecrets = ps.secretsEnabled.toString(),
organization = ps.organization ?: "",
insecure = ps.ignoreUnknownCA.toString(),
endpoint = getEndpointUrl(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ data class LanguageServerSettings(
@SerializedName("activateSnykOpenSource") val activateSnykOpenSource: String? = "false",
@SerializedName("activateSnykCode") val activateSnykCode: String? = "false",
@SerializedName("activateSnykIac") val activateSnykIac: String? = "false",
@SerializedName("activateSnykSecrets") val activateSnykSecrets: String? = "false",
@SerializedName("insecure") val insecure: String?,
@SerializedName("endpoint") val endpoint: String?,
@SerializedName("additionalParams") val additionalParams: String? = null,
Expand Down
Loading