Add project option to ScanBuild (#517)

jfrog · Jun 27, 2021 · 834d2b3 · 834d2b3
1 parent 67fc22d
commit 834d2b3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/org/jfrog/hudson/pipeline/common/Utils.java b/src/main/java/org/jfrog/hudson/pipeline/common/Utils.java
@@ -46,8 +46,7 @@
 import java.io.StringWriter;
 import java.util.*;
 
-import static org.jfrog.hudson.pipeline.common.types.ArtifactoryServer.BUILD_NAME;
-import static org.jfrog.hudson.pipeline.common.types.ArtifactoryServer.BUILD_NUMBER;
+import static org.jfrog.hudson.pipeline.common.types.ArtifactoryServer.*;
 import static org.jfrog.hudson.util.SerializationUtils.createMapper;
 
 /**
@@ -511,13 +510,13 @@ public static XrayScanConfig createXrayScanConfig(Map<String, Object> xrayScanPa
         }
 
         Set<String> xrayScanParamsSet = xrayScanParams.keySet();
-        List<String> keysAsList = Arrays.asList(BUILD_NAME, BUILD_NUMBER, failBuild, printTable);
+        List<String> keysAsList = Arrays.asList(BUILD_NAME, BUILD_NUMBER, PROJECT, failBuild, printTable);
         if (!keysAsList.containsAll(xrayScanParamsSet)) {
             throw new IllegalArgumentException("Only the following arguments are allowed: " + keysAsList.toString());
         }
 
         return new XrayScanConfig((String) xrayScanParams.get(BUILD_NAME),
-                (String) xrayScanParams.get(BUILD_NUMBER), (Boolean) xrayScanParams.get(failBuild),
+                (String) xrayScanParams.get(BUILD_NUMBER), (String) xrayScanParams.get(PROJECT), (Boolean) xrayScanParams.get(failBuild),
                 (Boolean) xrayScanParams.get(printTable));
     }
 

diff --git a/src/main/java/org/jfrog/hudson/pipeline/common/executors/XrayExecutor.java b/src/main/java/org/jfrog/hudson/pipeline/common/executors/XrayExecutor.java
@@ -46,7 +46,7 @@ public void execute() throws Exception {
         if (proxyConfiguration != null) {
             artifactoryManager.setProxyConfiguration(proxyConfiguration);
         }
-        ArtifactoryXrayResponse buildScanResult = artifactoryManager.scanBuild(xrayScanConfig.getBuildName(), xrayScanConfig.getBuildNumber(), "jenkins");
+        ArtifactoryXrayResponse buildScanResult = artifactoryManager.scanBuild(xrayScanConfig.getBuildName(), xrayScanConfig.getBuildNumber(), xrayScanConfig.getProject(), "jenkins");
         xrayScanResult = new XrayScanResult(buildScanResult);
 
         if (xrayScanResult.isFoundVulnerable()) {

diff --git a/src/main/java/org/jfrog/hudson/pipeline/common/types/ArtifactoryServer.java b/src/main/java/org/jfrog/hudson/pipeline/common/types/ArtifactoryServer.java
@@ -32,6 +32,7 @@ public class ArtifactoryServer implements Serializable {
     public static final String SERVER = "server";
     public static final String BUILD_NAME = "buildName";
     public static final String BUILD_NUMBER = "buildNumber";
+    public static final String PROJECT = "project";
     public static final String FAIL_NO_OP = "failNoOp";
     public static final String MODULE = "module";
     public static final String PROPERTIES = "props";

diff --git a/src/main/java/org/jfrog/hudson/pipeline/common/types/XrayScanConfig.java b/src/main/java/org/jfrog/hudson/pipeline/common/types/XrayScanConfig.java
@@ -9,15 +9,17 @@ public class XrayScanConfig implements Serializable {
 
     private String buildName;
     private String buildNumber;
+    private String project;
     private Boolean failBuild;
     private Boolean printTable;
 
     public XrayScanConfig() {
     }
 
-    public XrayScanConfig(String buildName, String buildNumber, Boolean failBuild, Boolean printTable) {
+    public XrayScanConfig(String buildName, String buildNumber, String project, Boolean failBuild, Boolean printTable) {
         this.buildName = buildName;
         this.buildNumber = buildNumber;
+        this.project = project;
         this.failBuild = failBuild;
         this.printTable = printTable;
     }
@@ -53,4 +55,12 @@ public void setFailBuild(Boolean failBuild) {
     public void setPrintTable(Boolean printTable) {
         this.printTable = printTable;
     }
+
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
 }
diff --git a/src/main/java/org/jfrog/hudson/pipeline/declarative/steps/xray/XrayScanStep.java b/src/main/java/org/jfrog/hudson/pipeline/declarative/steps/xray/XrayScanStep.java
@@ -45,6 +45,11 @@ public void setBuildNumber(String buildNumber) {
         xrayScanConfig.setBuildNumber(buildNumber);
     }
 
+    @DataBoundSetter
+    public void setProject(String project) {
+        xrayScanConfig.setProject(project);
+    }
+
     @DataBoundSetter
     public void setFailBuild(boolean failBuild) {
         xrayScanConfig.setFailBuild(failBuild);