Fix QualityGate failing (#160)

blackduck-inc · Aug 21, 2024 · a8093f5 · a8093f5
1 parent af2d621
commit a8093f5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/...nkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java b/...nkins/plugins/synopsys/security/scan/service/scan/coverity/CoverityParametersService.java
@@ -81,7 +81,7 @@ private List<String> getCoverityMissingMandatoryParams(Map<String, Object> cover
             if (missingMandatoryParams.size() == 1) {
                 message = missingMandatoryParams.get(0) + " is mandatory parameter for " + jobTypeName + " job type";
             } else {
-                message = String.join(", ", missingMandatoryParams) + " is mandatory parameter for " + jobTypeName
+                message = String.join(", ", missingMandatoryParams) + " are mandatory parameter for " + jobTypeName
                         + " job type";
             }
 

diff --git a/...jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java b/...jenkins/plugins/synopsys/security/scan/service/scan/polaris/PolarisParametersService.java
@@ -86,7 +86,7 @@ private List<String> getPolarisMissingMandatoryParams(Map<String, Object> polari
             if (missingMandatoryParams.size() == 1) {
                 message = missingMandatoryParams.get(0) + " is mandatory parameter for " + jobTypeName + " job type";
             } else {
-                message = String.join(", ", missingMandatoryParams) + " is mandatory parameter for " + jobTypeName
+                message = String.join(", ", missingMandatoryParams) + " are mandatory parameter for " + jobTypeName
                         + " job type";
             }
 

diff --git a/...java/io/jenkins/plugins/synopsys/security/scan/service/scan/srm/SRMParametersService.java b/...java/io/jenkins/plugins/synopsys/security/scan/service/scan/srm/SRMParametersService.java
@@ -64,27 +64,7 @@ private List<String> getSrmMissingMandatoryParams(Map<String, Object> srmParamet
                 });
 
         String jobType = Utility.jenkinsJobType(envVars);
-        if (!jobType.equalsIgnoreCase(ApplicationConstants.MULTIBRANCH_JOB_TYPE_NAME)) {
-            boolean isProjectNameValid = srmParameters.containsKey(ApplicationConstants.SRM_PROJECT_NAME_KEY)
-                    && srmParameters.get(ApplicationConstants.SRM_PROJECT_NAME_KEY) != null
-                    && !srmParameters
-                            .get(ApplicationConstants.SRM_PROJECT_NAME_KEY)
-                            .toString()
-                            .isEmpty();
-
-            boolean isProjectIdValid = srmParameters.containsKey(ApplicationConstants.SRM_PROJECT_ID_KEY)
-                    && srmParameters.get(ApplicationConstants.SRM_PROJECT_ID_KEY) != null
-                    && !srmParameters
-                            .get(ApplicationConstants.SRM_PROJECT_ID_KEY)
-                            .toString()
-                            .isEmpty();
-
-            if (!isProjectNameValid && !isProjectIdValid) {
-                logger.error("One of " + ApplicationConstants.SRM_PROJECT_NAME_KEY + " or "
-                        + ApplicationConstants.SRM_PROJECT_ID_KEY + " must be present.");
-                missingMandatoryParams.add(ApplicationConstants.SRM_PROJECT_ID_KEY);
-            }
-        }
+        validateProjectParams(srmParameters, missingMandatoryParams, jobType);
 
         if (!missingMandatoryParams.isEmpty()) {
             String jobTypeName;
@@ -99,7 +79,7 @@ private List<String> getSrmMissingMandatoryParams(Map<String, Object> srmParamet
             if (missingMandatoryParams.size() == 1) {
                 message = missingMandatoryParams.get(0) + " is mandatory parameter for " + jobTypeName + " job type";
             } else {
-                message = String.join(", ", missingMandatoryParams) + " is mandatory parameter for " + jobTypeName
+                message = String.join(", ", missingMandatoryParams) + " are mandatory parameter for " + jobTypeName
                         + " job type";
             }
 
@@ -109,6 +89,31 @@ private List<String> getSrmMissingMandatoryParams(Map<String, Object> srmParamet
         return missingMandatoryParams;
     }
 
+    private void validateProjectParams(
+            Map<String, Object> srmParameters, List<String> missingMandatoryParams, String jobType) {
+        if (!jobType.equalsIgnoreCase(ApplicationConstants.MULTIBRANCH_JOB_TYPE_NAME)) {
+            boolean isProjectNameValid = srmParameters.containsKey(ApplicationConstants.SRM_PROJECT_NAME_KEY)
+                    && srmParameters.get(ApplicationConstants.SRM_PROJECT_NAME_KEY) != null
+                    && !srmParameters
+                            .get(ApplicationConstants.SRM_PROJECT_NAME_KEY)
+                            .toString()
+                            .isEmpty();
+
+            boolean isProjectIdValid = srmParameters.containsKey(ApplicationConstants.SRM_PROJECT_ID_KEY)
+                    && srmParameters.get(ApplicationConstants.SRM_PROJECT_ID_KEY) != null
+                    && !srmParameters
+                            .get(ApplicationConstants.SRM_PROJECT_ID_KEY)
+                            .toString()
+                            .isEmpty();
+
+            if (!isProjectNameValid && !isProjectIdValid) {
+                logger.error("One of " + ApplicationConstants.SRM_PROJECT_NAME_KEY + " or "
+                        + ApplicationConstants.SRM_PROJECT_ID_KEY + " must be present.");
+                missingMandatoryParams.add(ApplicationConstants.SRM_PROJECT_ID_KEY);
+            }
+        }
+    }
+
     public SRM prepareSrmObjectForBridge(Map<String, Object> srmParameters) {
         SRM srm = new SRM();
         Branch branch = new Branch();