Merge branch 'main' into fix/benalvo/vorpal-for-arm

internal/commands/.scripts/integration_up.sh

@@ -47,7 +47,6 @@ if [ ! -s "$FAILED_TESTS_FILE" ]; then
     # If the file is empty, all tests passed
     echo "All tests passed."
     rm -f "$FAILED_TESTS_FILE" test_output.log
-    exit 0
 else
     # If the file is not empty, rerun the failed tests
     echo "Rerunning failed tests..."
@@ -56,7 +55,7 @@ else
         go test \
             -tags integration \
             -v \
-            -timeout 210m \
+            -timeout 30m \
             -coverpkg github.com/checkmarx/ast-cli/internal/commands,github.com/checkmarx/ast-cli/internal/services,github.com/checkmarx/ast-cli/internal/wrappers \
             -coverprofile cover_rerun.out \
             -run "^$testName$" \
@@ -75,11 +74,20 @@ else
     # Step 6: Check if any tests failed again
     if [ $rerun_status -eq 1 ]; then
         echo "Some tests are still failing."
-        rm -f "$FAILED_TESTS_FILE" test_output.log
-        exit 1
     else
         echo "All failed tests passed on rerun."
-        rm -f "$FAILED_TESTS_FILE" test_output.log
-        exit 0
     fi
 fi
+
+# Step 7: Run the cleandata package to delete projects
+echo "Running cleandata to clean up projects..."
+go test -v github.com/checkmarx/ast-cli/test/cleandata
+
+# Step 8: Final cleanup and exit
+rm -f "$FAILED_TESTS_FILE" test_output.log
+
+if [ $status -ne 0 ] || [ $rerun_status -eq 1 ]; then
+    exit 1
+else
+    exit 0
+fi

test/cleandata/clean-data_test.go

@@ -0,0 +1,51 @@
+package cleandata
+
+import (
+	"bufio"
+	"fmt"
+	"log"
+	"os"
+	"testing"
+
+	"github.com/checkmarx/ast-cli/internal/params"
+	"github.com/checkmarx/ast-cli/internal/wrappers"
+	"github.com/checkmarx/ast-cli/internal/wrappers/configuration"
+	"github.com/spf13/viper"
+)
+
+const ProjectNameFile = "projectName.txt"
+
+func DeleteProjectByName(projectName string) {
+	projectsWrapper := wrappers.NewHTTPProjectsWrapper(viper.GetString(params.ProjectsPathKey))
+	projectModel, _, err := projectsWrapper.GetByName(projectName)
+	if err == nil && projectModel != nil {
+		_, _ = projectsWrapper.Delete(projectModel.ID)
+	}
+}
+
+func TestDeleteProjectsFromFile(t *testing.T) {
+	configuration.LoadConfiguration()
+	projectNameFile := fmt.Sprint("../integration/", ProjectNameFile) // Replace with your actual file path
+
+	file, err := os.Open(projectNameFile)
+	if err != nil {
+		log.Printf("Failed to open project name file: %v", err)
+	}
+	defer func(file *os.File) {
+		if err := file.Close(); err != nil {
+			log.Printf("Failed to close file: %v", err)
+		}
+	}(file)
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		projectName := scanner.Text()
+		log.Printf("Attempting to delete project: %s", projectName)
+		DeleteProjectByName(projectName)
+		log.Printf("Project deleted: %s", projectName)
+	}
+
+	if err := scanner.Err(); err != nil {
+		log.Printf("Error reading project name file: %v", err)
+	}
+}

test/integration/pr_test.go

@@ -3,12 +3,13 @@
 package integration
 
 import (
-	"github.com/checkmarx/ast-cli/internal/commands/util"
-	"github.com/checkmarx/ast-cli/internal/logger"
 	"os"
 	"strings"
 	"testing"
 
+	"github.com/checkmarx/ast-cli/internal/commands/util"
+	"github.com/checkmarx/ast-cli/internal/logger"
+
 	"github.com/checkmarx/ast-cli/internal/params"
 	"gotest.tools/assert"
 )
@@ -118,7 +119,7 @@ func TestPRGitlabDecorationFailure(t *testing.T) {
 }
 
 func TestPRGithubDecoration_WhenScanIsRunning_ShouldAvoidPRDecorationCommand(t *testing.T) {
-	scanID, _ := createScanNoWait(t, Zip, Tags, GenerateRandomProjectNameForScan())
+	scanID, _ := createScanNoWait(t, Zip, Tags, getProjectNameForScanTests())
 	args := []string{
 		"utils",
 		"pr",
@@ -149,7 +150,7 @@ func TestPRGithubDecoration_WhenScanIsRunning_ShouldAvoidPRDecorationCommand(t *
 }
 
 func TestPRGitlabDecoration_WhenScanIsRunning_ShouldAvoidPRDecorationCommand(t *testing.T) {
-	scanID, _ := createScanNoWait(t, Zip, Tags, GenerateRandomProjectNameForScan())
+	scanID, _ := createScanNoWait(t, Zip, Tags, getProjectNameForScanTests())
 	args := []string{
 		"utils",
 		"pr",

test/integration/result_test.go

@@ -105,8 +105,6 @@ func TestResultListJson(t *testing.T) {
 	assert.Assert(t, uint(len(result.Results)) == result.TotalCount, "Should have results")
 
 	assertResultFilesCreated(t)
-
-	deleteScanAndProject()
 }
 
 // assert all files were created
@@ -152,8 +150,6 @@ func TestResultListForGlReports(t *testing.T) {
 	assert.Assert(t, uint(len(result.Results)) == result.TotalCount, "Should have results")
 
 	assertGlResultFilesCreated(t)
-
-	deleteScanAndProject()
 }
 
 func assertGlResultFilesCreated(t *testing.T) {

test/integration/root_test.go

@@ -105,6 +105,11 @@ func getRootProject(t *testing.T) (string, string) {
 
 	rootProjectId, rootProjectName = createProject(t, Tags, Groups)
 
+	//--------------------Write project name to file to delete it later--------------------
+	_ = WriteProjectNameToFile(fmt.Sprint(getProjectNameForTest(), "_for_scan"))
+	_ = WriteProjectNameToFile(rootProjectName)
+	//-------------------------------------------------------------------------------------
+
 	return rootProjectId, rootProjectName
 }