CM-32305 - Add new SCA flow which decreases execution time (#45)

Author: MarshalX

.github/workflows/build.yml

@@ -155,6 +155,21 @@ jobs:
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf /usr/local/lib/android
           sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/.ghcup
+
+          sudo apt-get remove -y '^aspnetcore-.*' || echo "::warning::The command [sudo apt-get remove -y '^aspnetcore-.*'] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y '^dotnet-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^dotnet-.*' --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y '^llvm-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^llvm-.*' --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y 'php.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y 'php.*' --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y '^mongodb-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mongodb-.*' --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing || echo "::warning::The command [sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y google-cloud-sdk --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-sdk --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get remove -y google-cloud-cli --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-cli --fix-missing] failed to complete successfully. Proceeding..."
+          sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed to complete successfully. Proceeding..."
+          sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
+ 
+          sudo docker image prune --all --force || true
 
       - name: Fetch Sources
         uses: actions/checkout@v4

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+## [1.3.0] - 2024-02-12
+
+- Add new SCA flow which decreases execution time
+
 ## [1.2.0] - 2024-02-01
 
 - Add Open-source Threats (SCA) support
@@ -43,6 +47,8 @@
 
 The first public release of the plugin.
 
+[1.3.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.3.0
+
 [1.2.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.2.0
 
 [1.1.5]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.1.5

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

gradle/libs.versions.toml

@@ -5,9 +5,9 @@ jackson = "2.15.2"
 
 # plugins
 dokka = "1.9.10"
-kotlin = "1.8.21"
+kotlin = "1.9.20"
 changelog = "2.2.0"
-gradleIntelliJPlugin = "1.16.0"
+gradleIntelliJPlugin = "1.17.1"
 kover = "0.7.3"
 
 [libraries]

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

@@ -23,7 +23,7 @@ class Consts {
         val DEFAULT_CLI_PATH = getDefaultCliPath()
         const val CLI_GITHUB_ORG = "cycodehq"
         const val CLI_GITHUB_REPO = "cycode-cli"
-        const val CLI_GITHUB_TAG = "v1.7.1"
+        const val CLI_GITHUB_TAG = "v1.9.0"
         const val CLI_CHECK_NEW_VERSION_EVERY_SEC = 24 * 60 * 60 // 24 hours
         const val PLUGIN_AUTO_SAVE_FLUSH_INITIAL_DELAY_SEC = 0L
         const val PLUGIN_AUTO_SAVE_FLUSH_DELAY_SEC = 5L

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

@@ -20,6 +20,8 @@ class SettingsWindow {
 
     private var scanOnSaveCheckbox = JBCheckBox(null, pluginSettings.scanOnSave)
 
+    private var scaSyncFlowCheckbox = JBCheckBox(null, pluginSettings.scaSyncFlow)
+
     fun getComponent(): DialogPanel {
         val contentPanel = panel {
             titledRow(CycodeBundle.message("settingsCliSectionTitle")) {
@@ -58,6 +60,13 @@ class SettingsWindow {
                     }
                 }
             }
+            titledRow(CycodeBundle.message("settingsExperimentalSectionTitle")) {
+                row(label = CycodeBundle.message("settingsScaSyncFlowCheckbox")) {
+                    cell {
+                        scaSyncFlowCheckbox()
+                    }
+                }
+            }
         }
 
         return contentPanel
@@ -71,10 +80,11 @@ class SettingsWindow {
             cliAppUrlTextField.text,
             cliAdditionalParamsTextField.text,
             scanOnSaveCheckbox.isSelected,
+            scaSyncFlowCheckbox.isSelected,
         )
     }
 
     companion object {
-        const val FIELD_COLUMNS_COUNT = 40  // max on the smallest settings window
+        const val FIELD_COLUMNS_COUNT = 35  // max on the smallest settings window
     }
 }

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

@@ -1,6 +1,5 @@
 package com.cycode.plugin.components.toolWindow.components.scanContentTab
 
-import com.cycode.plugin.Consts
 import com.cycode.plugin.CycodeBundle
 import com.cycode.plugin.components.Component
 import com.cycode.plugin.components.common.BorderedPanel

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

@@ -155,6 +155,15 @@ class CliService(private val project: Project) {
         }
     }
 
+    private fun getCliScanOptions(scanType: CliScanType): Array<String> {
+        val options = mutableListOf<String>()
+        if (scanType == CliScanType.Sca && pluginSettings.scaSyncFlow) {
+            options.add("--sync")
+            options.add("--no-restore")
+        }
+        return options.toTypedArray()
+    }
+
     private inline fun <reified T> scanPaths(
         paths: List<String>,
         scanType: CliScanType,
@@ -166,6 +175,7 @@ class CliService(private val project: Project) {
                 "scan",
                 "-t",
                 scanTypeString,
+                *getCliScanOptions(scanType),
                 "path",
                 *getPathsAsArguments(paths),
                 cancelledCallback = cancelledCallback

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

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

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

@@ -55,8 +55,9 @@ class ApplicationSettingsConfigurable(val project: Project) : SearchableConfigur
         val newSettings = settingsWindows.getSettings()
 
         pluginSettings.cliAutoManaged = newSettings.cliAutoManaged
-        pluginSettings.scanOnSave = newSettings.scanOnSave
         pluginSettings.cliAdditionalParams = newSettings.cliAdditionalParams
+        pluginSettings.scanOnSave = newSettings.scanOnSave
+        pluginSettings.scaSyncFlow = newSettings.scaSyncFlow
 
         if (isValidCliPath(newSettings.cliPath)) {
             pluginSettings.cliPath = newSettings.cliPath