Fixed upgrade issues

jenkinsci · Oct 24, 2020 · c2c8a18 · c2c8a18
1 parent 46f22bf
commit c2c8a18
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 description = Provides automatic scan of code by Checkmarx server and shows results summary and trend in Jenkins interface.
 group = com.checkmarx.jenkins
-version = 2020.4.2
+version = 2020.4.3
 
 repositoryVersion=
 

diff --git a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
@@ -433,6 +433,11 @@ public boolean isOsaEnabled() {
         return osaEnabled;
     }
 
+    @DataBoundSetter
+    public void setOsaEnabled(boolean osaEnabled) {
+        this.osaEnabled = osaEnabled;
+    }
+
     @Nullable
     public Integer getOsaHighThreshold() {
         return osaHighThreshold;
@@ -468,21 +473,41 @@ public String getExcludeOpenSourceFolders() {
         return excludeOpenSourceFolders;
     }
 
+    @DataBoundSetter
+    public void setExcludeOpenSourceFolders(@Nullable String excludeOpenSourceFolders) {
+        this.excludeOpenSourceFolders = excludeOpenSourceFolders;
+    }
+
     @Nullable
     public String getIncludeOpenSourceFolders() {
         return includeOpenSourceFolders;
     }
 
+    @DataBoundSetter
+    public void setIncludeOpenSourceFolders(@Nullable String includeOpenSourceFolders) {
+        this.includeOpenSourceFolders = includeOpenSourceFolders;
+    }
+
     @Nullable
     public String getOsaArchiveIncludePatterns() {
         return osaArchiveIncludePatterns;
     }
 
+    @DataBoundSetter
+    public void setOsaArchiveIncludePatterns(@Nullable String osaArchiveIncludePatterns) {
+        this.osaArchiveIncludePatterns = osaArchiveIncludePatterns;
+    }
+
     @Nullable
     public boolean isOsaInstallBeforeScan() {
         return osaInstallBeforeScan;
     }
 
+    @DataBoundSetter
+    public void setOsaInstallBeforeScan(boolean osaInstallBeforeScan) {
+        this.osaInstallBeforeScan = osaInstallBeforeScan;
+    }
+
     public boolean isGeneratePdfReport() {
         return generatePdfReport;
     }
@@ -855,6 +880,17 @@ private CxScanConfig resolveConfiguration(Run<?, ?> run, DescriptorImpl descript
             }
         }
 
+        if (isOsaEnabled() && getDependencyScanConfig() == null) {
+            DependencyScanConfig config = new DependencyScanConfig();
+            config.overrideGlobalConfig = true;
+            config.dependencyScannerType = DependencyScannerType.OSA;
+            config.dependencyScanPatterns = getIncludeOpenSourceFolders();
+            config.dependencyScanExcludeFolders = getExcludeOpenSourceFolders();
+            config.osaArchiveIncludePatterns = getOsaArchiveIncludePatterns();
+            config.osaInstallBeforeScan = isOsaInstallBeforeScan();
+            setDependencyScanConfig(config);
+        }
+
         configureDependencyScan(run, descriptor, env, ret);
 
         if (!ret.getSynchronous()) {
@@ -884,7 +920,16 @@ private void configureDependencyScan(Run<?, ?> run, DescriptorImpl descriptor, E
             return;
         }
 
-        config.addScannerType(effectiveConfig.dependencyScannerType);
+        ScannerType scannerType = null;
+        if (effectiveConfig.dependencyScannerType == DependencyScannerType.OSA) {
+            scannerType = ScannerType.OSA;
+        } else if (effectiveConfig.dependencyScannerType == DependencyScannerType.SCA) {
+            scannerType = ScannerType.AST_SCA;
+        }
+
+        if (scannerType != null) {
+            config.addScannerType(scannerType);
+        }
 
         config.setOsaFilterPattern(env.expand(effectiveConfig.dependencyScanPatterns));
         config.setOsaFolderExclusions(env.expand(effectiveConfig.dependencyScanExcludeFolders));

diff --git a/src/main/java/com/checkmarx/jenkins/DependencyScanConfig.java b/src/main/java/com/checkmarx/jenkins/DependencyScanConfig.java
@@ -1,6 +1,5 @@
 package com.checkmarx.jenkins;
 
-import com.cx.restclient.dto.ScannerType;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
@@ -22,7 +21,7 @@ public class DependencyScanConfig {
     public String dependencyScanExcludeFolders;
 
     @DataBoundSetter
-    public ScannerType dependencyScannerType;
+    public DependencyScannerType dependencyScannerType;
 
     @DataBoundSetter
     public String osaArchiveIncludePatterns;

diff --git a/src/main/java/com/checkmarx/jenkins/DependencyScannerType.java b/src/main/java/com/checkmarx/jenkins/DependencyScannerType.java
@@ -0,0 +1,6 @@
+package com.checkmarx.jenkins;
+
+public enum DependencyScannerType {
+    OSA,
+    SCA
+}
diff --git a/src/main/java/com/checkmarx/jenkins/PluginDataMigration.java b/src/main/java/com/checkmarx/jenkins/PluginDataMigration.java
@@ -1,6 +1,5 @@
 package com.checkmarx.jenkins;
 
-import com.cx.restclient.dto.ScannerType;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.jetbrains.annotations.NotNull;
@@ -43,7 +42,7 @@ private boolean needToMigrate(CxScanBuilder builder) {
     private DependencyScanConfig extractDependencyScanConfig(CxScanBuilder builder) {
         DependencyScanConfig config = new DependencyScanConfig();
         config.overrideGlobalConfig = true;
-        config.dependencyScannerType = ScannerType.OSA;
+        config.dependencyScannerType = DependencyScannerType.OSA;
         config.dependencyScanPatterns = builder.getIncludeOpenSourceFolders();
         config.dependencyScanExcludeFolders = builder.getExcludeOpenSourceFolders();
         config.osaArchiveIncludePatterns = builder.getOsaArchiveIncludePatterns();

diff --git a/src/main/resources/com/checkmarx/jenkins/CxScanBuilder/config.jelly b/src/main/resources/com/checkmarx/jenkins/CxScanBuilder/config.jelly
@@ -131,8 +131,8 @@
                 </f:nested>
             </f:radioBlock>
 
-            <f:radioBlock checked="${instance.dependencyScanConfig.dependencyScannerType == 'AST_SCA'}"
-                          inline="true" name="dependencyScannerType" title="Use CxSCA dependency scanner" value="AST_SCA">
+            <f:radioBlock checked="${instance.dependencyScanConfig.dependencyScannerType == 'SCA'}"
+                          inline="true" name="dependencyScannerType" title="Use CxSCA dependency scanner" value="SCA">
                 <f:nested>
                     <f:entry title="CxSCA API URL" field="scaServerUrl">
                         <f:textbox default="${descriptor.DEFAULT_SCA_SERVER_URL}"

diff --git a/src/main/resources/com/checkmarx/jenkins/CxScanBuilder/global.jelly b/src/main/resources/com/checkmarx/jenkins/CxScanBuilder/global.jelly
@@ -126,8 +126,8 @@
                 </f:nested>
             </f:radioBlock>
 
-            <f:radioBlock checked="${descriptor.dependencyScanConfig.dependencyScannerType == 'AST_SCA'}"
-                          inline="true" name="dependencyScannerType" title="Use CxSCA dependency scanner" value="AST_SCA">
+            <f:radioBlock checked="${descriptor.dependencyScanConfig.dependencyScannerType == 'SCA'}"
+                          inline="true" name="dependencyScannerType" title="Use CxSCA dependency scanner" value="SCA">
                 <f:nested>
                     <f:entry title="CxSCA API URL" field="scaServerUrl">
                         <f:textbox default="${descriptor.DEFAULT_SCA_SERVER_URL}"