CM-37296 - Remove SAST feature switch and enable by default (#71)

Author: MarshalX

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+## [1.9.0] - 2024-06-24
+
+- Add SAST support
+
 ## [1.8.0] - 2024-05-23
 
 - Add "Ignore this violation" for violation card of secrets
@@ -85,6 +89,8 @@
 
 The first public release of the plugin.
 
+[1.9.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.9.0
+
 [1.8.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.8.0
 
 [1.7.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.7.0

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.cycode.plugin
 pluginName = Cycode
 pluginRepositoryUrl = https://github.com/cycodehq/intellij-platform-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 1.8.0
+pluginVersion = 1.9.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 211.1

src/main/kotlin/com/cycode/plugin/Consts.kt

@@ -21,7 +21,7 @@ class Consts {
     companion object {
         val PLUGIN_PATH = PathManager.getPluginsPath() + "/cycode-intellij-platform-plugin"
         val DEFAULT_CLI_PATH = getDefaultCliPath()
-        const val REQUIRED_CLI_VERSION = "1.9.5"
+        const val REQUIRED_CLI_VERSION = "1.10.1"
 
         const val CLI_GITHUB_ORG = "cycodehq"
         const val CLI_GITHUB_REPO = "cycode-cli"

src/main/kotlin/com/cycode/plugin/components/settingsWindow/SettingsWindow.kt

@@ -21,7 +21,6 @@ class SettingsWindow {
     private var scanOnSaveCheckbox = JBCheckBox(null, pluginSettings.scanOnSave)
 
     private var scaSyncFlowCheckbox = JBCheckBox(null, pluginSettings.scaSyncFlow)
-    private var sastSupportCheckbox = JBCheckBox(null, pluginSettings.sastSupport)
 
     fun getComponent(): DialogPanel {
         val contentPanel = panel {
@@ -67,11 +66,6 @@ class SettingsWindow {
                         scaSyncFlowCheckbox()
                     }
                 }
-                row(label = CycodeBundle.message("settingsSastSupportCheckbox")) {
-                    cell {
-                        sastSupportCheckbox()
-                    }
-                }
             }
         }
 
@@ -87,7 +81,6 @@ class SettingsWindow {
             cliAdditionalParamsTextField.text,
             scanOnSaveCheckbox.isSelected,
             scaSyncFlowCheckbox.isSelected,
-            sastSupportCheckbox.isSelected,
         )
     }
 

src/main/kotlin/com/cycode/plugin/components/toolWindow/components/cycodeActionToolBar/actions/RunAllAction.kt

@@ -3,7 +3,6 @@ package com.cycode.plugin.components.toolWindow.components.cycodeActionToolBar.a
 import com.cycode.plugin.CycodeBundle
 import com.cycode.plugin.components.toolWindow.CycodeContentTab
 import com.cycode.plugin.services.cycode
-import com.cycode.plugin.services.pluginSettings
 import com.cycode.plugin.services.pluginState
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -27,10 +26,7 @@ class RunAllAction :
         service.startSecretScanForCurrentProject()
         service.startScaScanForCurrentProject()
         service.startIacScanForCurrentProject()
-
-        if (pluginSettings().sastSupport) {
-            service.startSastScanForCurrentProject()
-        }
+        service.startSastScanForCurrentProject()
     }
 
     override fun update(e: AnActionEvent) {

src/main/kotlin/com/cycode/plugin/components/toolWindow/components/scanContentTab/ScanContentTab.kt

@@ -4,7 +4,6 @@ import com.cycode.plugin.CycodeBundle
 import com.cycode.plugin.components.Component
 import com.cycode.plugin.components.common.createClickableLabel
 import com.cycode.plugin.services.CycodeService
-import com.cycode.plugin.services.pluginSettings
 import com.intellij.util.ui.JBUI
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
@@ -43,14 +42,11 @@ class ScanContentTab : Component<CycodeService>() {
                 addActionListener { service.startIacScanForCurrentProject() }
             },
         )
-
-        if (pluginSettings().sastSupport) {
-            addComponentToPanel(
-                JButton(CycodeBundle.message("scanTabSastBtn")).apply {
-                    addActionListener { service.startSastScanForCurrentProject() }
-                },
-            )
-        }
+        addComponentToPanel(
+            JButton(CycodeBundle.message("scanTabSastBtn")).apply {
+                addActionListener { service.startSastScanForCurrentProject() }
+            },
+        )
 
         addComponentToPanel(createClickableLabel(CycodeBundle.message("scanTabOnSaveTip")))
         addComponentToPanel(createClickableLabel(CycodeBundle.message("howToUseLabel")))

src/main/kotlin/com/cycode/plugin/components/toolWindow/components/treeView/components/detectionNodeContextMenu/DetectionNodeContextMenu.kt

@@ -5,7 +5,6 @@ import com.cycode.plugin.components.toolWindow.components.treeView.TreeView
 import com.cycode.plugin.components.toolWindow.components.treeView.nodes.*
 import com.cycode.plugin.components.toolWindow.components.treeView.openDetectionInFile
 import com.cycode.plugin.services.cycode
-import com.cycode.plugin.services.pluginSettings
 import com.intellij.openapi.editor.actions.ContentChooser.RETURN_SYMBOL
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopupFactory
@@ -73,9 +72,7 @@ class DetectionNodeContextMenu(
             CycodeBundle.message("secretDisplayName") -> service.startSecretScanForCurrentProject()
             CycodeBundle.message("scaDisplayName") -> service.startScaScanForCurrentProject()
             CycodeBundle.message("iacDisplayName") -> service.startIacScanForCurrentProject()
-            CycodeBundle.message("sastDisplayName") -> {
-                if (pluginSettings().sastSupport) service.startSastScanForCurrentProject()
-            }
+            CycodeBundle.message("sastDisplayName") -> service.startSastScanForCurrentProject()
         }
     }
 

src/main/kotlin/com/cycode/plugin/services/CycodePersistentSettingsService.kt

@@ -21,7 +21,6 @@ class CycodePersistentSettingsService : PersistentStateComponent<CycodePersisten
     var scanOnSave: Boolean = true
 
     var scaSyncFlow: Boolean = true
-    var sastSupport: Boolean = false
 
     override fun getState(): CycodePersistentSettingsService {
         return this
@@ -40,7 +39,6 @@ class CycodePersistentSettingsService : PersistentStateComponent<CycodePersisten
             cliAdditionalParams,
             scanOnSave,
             scaSyncFlow,
-            sastSupport,
         )
     }
 }

src/main/kotlin/com/cycode/plugin/settings/ApplicationSettingsConfigurable.kt

@@ -58,7 +58,6 @@ class ApplicationSettingsConfigurable(val project: Project) : SearchableConfigur
         pluginSettings.cliAdditionalParams = newSettings.cliAdditionalParams
         pluginSettings.scanOnSave = newSettings.scanOnSave
         pluginSettings.scaSyncFlow = newSettings.scaSyncFlow
-        pluginSettings.sastSupport = newSettings.sastSupport
 
         if (isValidCliPath(newSettings.cliPath)) {
             pluginSettings.cliPath = newSettings.cliPath

src/main/kotlin/com/cycode/plugin/settings/Settings.kt

@@ -8,5 +8,4 @@ data class Settings(
     val cliAdditionalParams: String,
     val scanOnSave: Boolean,
     val scaSyncFlow: Boolean,
-    val sastSupport: Boolean,
 )