Merge pull request #430 from checkmarx-ltd/develop

Master Merge

Author: satyamchaurasiapersistent

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.6.18</version>
+	<version>0.6.19</version>
 
 
 	<name>cx-spring-boot-sdk</name>

src/main/java/com/checkmarx/sdk/service/scanner/AbstractScanner.java

@@ -168,6 +168,19 @@ public String initiateSbom(String scanId,ScanParams scanParams,String fileFormat
             client.close();
         }
     }
+    public void deleteProject(ScanParams scanParams){
+        try{
+            RestClientConfig scanConfig = getScanConfig(scanParams);
+            this.client = allocateClient(scanConfig);
+            client.init();
+            client.deleteProject(scanParams);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            client.close();
+        }
+
+    }
 
     protected abstract RestClientConfig getScanConfig(ScanParams scaParams);
 

src/main/java/com/checkmarx/sdk/utils/scanner/client/IScanClientHelper.java

@@ -3,6 +3,7 @@
 import com.checkmarx.sdk.config.PDFPropertiesSCA;
 import com.checkmarx.sdk.dto.ResultsBase;
 import com.checkmarx.sdk.dto.ScanResults;
+import com.checkmarx.sdk.dto.ast.ScanParams;
 import com.checkmarx.sdk.dto.filtering.FilterConfiguration;
 import com.checkmarx.sdk.exception.CheckmarxException;
 import com.checkmarx.sdk.utils.State;
@@ -33,4 +34,7 @@ default State getState() {
     ScanResults getReportContent(File file, FilterConfiguration filter) throws CheckmarxException;
 
     String initiateSbom(String scanId, String fileFormat,boolean hideDev,boolean showLicenses) throws IOException;
+    default void deleteProject(ScanParams scanParams) throws IOException {
+
+    }
 }

src/main/java/com/checkmarx/sdk/utils/scanner/client/ScaClientHelper.java

@@ -3,6 +3,7 @@
 import com.checkmarx.sdk.config.*;
 import com.checkmarx.sdk.dto.*;
 import com.checkmarx.sdk.dto.ast.ASTResults;
+import com.checkmarx.sdk.dto.ast.ScanParams;
 import com.checkmarx.sdk.dto.filtering.FilterConfiguration;
 import com.checkmarx.sdk.dto.sast.Filter;
 import com.checkmarx.sdk.dto.sca.*;
@@ -1690,6 +1691,21 @@ private List<Package> getPackages(String scanId) throws IOException {
                 true);
     }
 
+    @Override
+    public void deleteProject(ScanParams scanParams)  {
+        try{
+            String projectName = scanParams.getProjectName();
+            log.info("Getting project by name for deleting project: '{}'", projectName);
+            String resolvedProjectId = getRiskManagementProjectId(projectName);
+            log.info("deleting CxSCA project according to project id {}",resolvedProjectId);
+            httpClient.deleteRequest(String.format(PROJECTS_BY_ID, resolvedProjectId), HttpStatus.SC_NO_CONTENT, "delete a project");
+        }catch (IOException e){
+            log.error("Error while deleting project");
+            throw new RuntimeException(e);
+        }
+
+    }
+
     private String createSbomReport(String scanId, String fileFormat,boolean hideDev,boolean showLicenses)throws IOException
     {
         log.debug("Getting Sbom Report");