CM-40753 - Add sync flow for Secrets and IaC (#80)

Author: MarshalX

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+## [2.1.0] - 2024-10-07
+
+- Add sync flow for Secrets and IaC
+
 ## [2.0.1] - 2024-09-25
 
 - Fix empty IaC scan results on Windows
@@ -121,6 +125,8 @@
 
 The first public release of the plugin.
 
+[2.1.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v2.1.0
+
 [2.0.1]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v2.0.1 
 
 [2.0.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v2.0.0
@@ -169,4 +175,4 @@ The first public release of the plugin.
 
 [1.0.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.0.0
 
-[Unreleased]: https://github.com/cycodehq/intellij-platform-plugin/compare/v2.0.1...HEAD
+[Unreleased]: https://github.com/cycodehq/intellij-platform-plugin/compare/v2.1.0...HEAD

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 = 2.0.1
+pluginVersion = 2.1.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 231

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

@@ -27,7 +27,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.10.7"
+        const val REQUIRED_CLI_VERSION = "1.11.0"
 
         const val CYCODE_DOMAIN = "cycode.com"
 

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

@@ -20,8 +20,6 @@ class SettingsWindow {
 
     private var scanOnSaveCheckbox = JBCheckBox(null, pluginSettings.scanOnSave)
 
-    private var scaSyncFlowCheckbox = JBCheckBox(null, pluginSettings.scaSyncFlow)
-
     fun getComponent(): DialogPanel {
         val contentPanel = panel {
             group(CycodeBundle.message("settingsCliSectionTitle")) {
@@ -48,11 +46,6 @@ class SettingsWindow {
                     cell(scanOnSaveCheckbox)
                 }
             }
-            group(CycodeBundle.message("settingsExperimentalSectionTitle")) {
-                row(CycodeBundle.message("settingsScaSyncFlowCheckbox")) {
-                    cell(scaSyncFlowCheckbox)
-                }
-            }
         }
 
         return contentPanel
@@ -66,7 +59,6 @@ class SettingsWindow {
             cliAppUrlTextField.text,
             cliAdditionalParamsTextField.text,
             scanOnSaveCheckbox.isSelected,
-            scaSyncFlowCheckbox.isSelected,
         )
     }
 

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

@@ -190,10 +190,15 @@ class CliService(private val project: Project) {
 
     private fun getCliScanOptions(scanType: CliScanType): Array<String> {
         val options = mutableListOf<String>()
-        if (scanType == CliScanType.Sca && pluginSettings.scaSyncFlow) {
+
+        if (scanType != CliScanType.Sast) {
             options.add("--sync")
+        }
+
+        if (scanType == CliScanType.Sca) {
             options.add("--no-restore")
         }
+
         return options.toTypedArray()
     }
 

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

@@ -20,8 +20,6 @@ class CycodePersistentSettingsService : PersistentStateComponent<CycodePersisten
 
     var scanOnSave: Boolean = true
 
-    var scaSyncFlow: Boolean = true
-
     override fun getState(): CycodePersistentSettingsService {
         return this
     }
@@ -38,7 +36,6 @@ class CycodePersistentSettingsService : PersistentStateComponent<CycodePersisten
             cliAppUrl,
             cliAdditionalParams,
             scanOnSave,
-            scaSyncFlow,
         )
     }
 }

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

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

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

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

src/main/resources/messages/CycodeBundle.properties

@@ -75,10 +75,8 @@ sentryReporting=Cycode is reporting the problem...
 settingsCliSectionTitle=Cycode CLI settings
 settingsOnPremiseSectionTitle=On-premise settings
 settingsIdeSectionTitle=IDE settings
-settingsExperimentalSectionTitle=Experimental settings
 settingsCliAutoManagedCheckbox=Enable executable auto-management
 settingsScanOnSaveCheckbox=Enable Scan on Save
-settingsScaSyncFlowCheckbox=Enable SCA sync flow
 settingsCliPathLabel=Path to executable:
 settingsCliApiUrlLabel=API URL:
 settingsCliAppUrlLabel=APP URL: