pr-CXFLW-1177-comment-pr (#1349)

* Added configuration to remove comments in ADO * EKS Cluster * EKS Cluster * EKS Cluster * EKS Cluster * EKS Cluster * Hi --------- Co-authored-by: Satyam Chaurasia <[email protected]>
checkmarx-ltd · May 13, 2024 · d73652a · d73652a
1 parent eadf637
commit d73652a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -160,7 +160,8 @@ jobs:
           command: |
             aws eks update-kubeconfig --name eks-cxflow-ci
   deploy-cxflow:
-    executor: aws-eks/python3
+    docker:
+      - image: cimg/python:3.10
     parameters:
       cluster-name:
         description: |
@@ -471,7 +472,8 @@ jobs:
           path: ~/test-results/junit
 
   cleanup:
-    executor: aws-eks/python3
+    docker:
+      - image: cimg/python:3.10
     parameters:
       cluster-name:
         type: string
@@ -537,7 +539,8 @@ jobs:
           ghr-option: "-prerelease "
 
   clean-eks:
-    executor: aws-eks/python3
+    docker:
+      - image: cimg/python:3.10
     steps:
       - kubernetes/install:
           kubectl-version: v1.23.6
@@ -558,7 +561,7 @@ jobs:
             fi
 orbs:
   aws-cli: circleci/[email protected]
-  aws-eks: circleci/aws-eks@1.0.0
+  aws-eks: circleci/aws-eks@2.2.0
   kubernetes: circleci/[email protected]
   helm: circleci/[email protected]
   checkmarx: checkmarx/[email protected]

diff --git a/README.md b/README.md
@@ -1,11 +1,3 @@
-> **Notice :** This is to inform you that the cxFlow will not be compatible to the old Java versions (version 8 and 11) beginning April 1, 2024.
-The latest version compatible with the old Java versions (version 8 and 11) is CxFlow 1.6.46.
-After version 1.7.0, the customers need to upgrade the Java version in the CxFlow server to a version greater than or equal to Java 17 (less than 20).
-After the upgrade, the customers need to use the CxFlow Java.jar file 
-
-
-
-
 ![CircleCI](https://img.shields.io/circleci/build/github/checkmarx-ltd/cx-flow)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=checkmarx-ltd_cx-flow&metric=security_rating)](https://sonarcloud.io/dashboard?id=checkmarx-ltd_cx-flow)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=checkmarx-ltd_cx-flow&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=checkmarx-ltd_cx-flow)

diff --git a/Release.txt b/Release.txt
@@ -1,3 +1,4 @@
+asdasdasdsa
 Release 1.6.35
 ---------------------------------------------------------------------
 Release 1.5.4

diff --git a/src/main/java/com/checkmarx/flow/service/BugTrackerEventTrigger.java b/src/main/java/com/checkmarx/flow/service/BugTrackerEventTrigger.java
@@ -145,9 +145,9 @@ public void triggerOffScanStartedEvent(ScanRequest scanRequest) {
             case ADOPULL:
                 if (adoService.isScanSubmittedComment()) {
                     adoService.sendMergeComment(scanRequest, SCAN_FAILED_MESSAGE);
+                    adoService.startBlockMerge(scanRequest);
+                    adoService.endBlockMergeFailed(scanRequest);
                 }
-                adoService.startBlockMerge(scanRequest);
-                adoService.endBlockMergeFailed(scanRequest);
                 break;
 
             case JIRA:

diff --git a/src/main/java/com/checkmarx/flow/service/ResultsService.java b/src/main/java/com/checkmarx/flow/service/ResultsService.java
@@ -147,29 +147,43 @@ public void processResults(ScanRequest request, ScanResults results, ScanDetails
                     log.info("Results Service case JIRA : request =:  {}  results = {}  scanDetails= {}", request.toString(), results.toString(), scanDetails.toString());
                     break;
                 case GITHUBPULL:
-                    gitService.processPull(request, results);
-                    gitService.endBlockMerge(request, results, scanDetails);
+                    if (gitService.isScanSubmittedComment()) {
+                        gitService.processPull(request, results);
+                        gitService.endBlockMerge(request, results, scanDetails);
+                    }
                     break;
                 case GITLABCOMMIT:
-                    gitLabService.processCommit(request, results);
+                    if (gitLabService.isScanSubmittedComment()) {
+                        gitLabService.processCommit(request, results);
+                    }
                     break;
                 case GITLABMERGE:
-                    gitLabService.processMerge(request, results);
-                    gitLabService.endBlockMerge(request);
+                    if (gitLabService.isScanSubmittedComment()) {
+                        gitLabService.processMerge(request, results);
+                        gitLabService.endBlockMerge(request);
+                    }
                     break;
                 case BITBUCKETCOMMIT:
-                    bbService.processCommit(request, results);
+                    if (bbService.isScanSubmittedComment()) {
+                        bbService.processCommit(request, results);
+                    }
                     break;
                 case BITBUCKETPULL:
-                    bbService.processMerge(request, results);
+                    if (bbService.isScanSubmittedComment()) {
+                        bbService.processMerge(request, results);
+                    }
                     break;
                 case BITBUCKETSERVERPULL:
-                    bbService.processServerMerge(request, results, scanDetails);
-                    bbService.setBuildEndStatus(request, results, scanDetails);
+                    if (bbService.isScanSubmittedComment()) {
+                        bbService.processServerMerge(request, results, scanDetails);
+                        bbService.setBuildEndStatus(request, results, scanDetails);
+                    }
                     break;
                 case ADOPULL:
-                    adoService.processPull(request, results);
-                    adoService.endBlockMerge(request, results, scanDetails);
+                    if (adoService.isScanSubmittedComment()) {
+                        adoService.processPull(request, results);
+                        adoService.endBlockMerge(request, results, scanDetails);
+                    }
                     break;
                 case EMAIL:
                     emailService.handleEmailBugTracker(request, results);