Merge branch 'main' into bug/elchanan/display-description-incorrectly

Checkmarx · Aug 13, 2024 · 3d006e2 · 3d006e2
2 parents b9ff03e + c0c7d39
commit 3d006e2
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/internal/commands/scan.go b/internal/commands/scan.go
@@ -1747,7 +1747,7 @@ func setupScanHandler(cmd *cobra.Command, uploadsWrapper wrappers.UploadsWrapper
 ) {
 	zipFilePath := ""
 	scanHandler := wrappers.ScanHandler{}
-	scanHandler.Branch = viper.GetString(commonParams.BranchKey)
+	scanHandler.Branch = strings.TrimSpace(viper.GetString(commonParams.BranchKey))
 
 	uploadType := getUploadType(cmd)
 
@@ -2634,7 +2634,7 @@ func deprecatedFlagValue(cmd *cobra.Command, deprecatedFlagKey, inUseFlagKey str
 }
 
 func validateCreateScanFlags(cmd *cobra.Command) error {
-	branch := viper.GetString(commonParams.BranchKey)
+	branch := strings.TrimSpace(viper.GetString(commonParams.BranchKey))
 	if branch == "" {
 		return errors.Errorf("%s: Please provide a branch", failedCreating)
 	}

diff --git a/test/integration/scan_test.go b/test/integration/scan_test.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/google/uuid"
 	"io"
 	"log"
 	"os"
@@ -29,7 +30,6 @@ import (
 	"github.com/checkmarx/ast-cli/internal/services"
 	"github.com/checkmarx/ast-cli/internal/wrappers"
 	"github.com/checkmarx/ast-cli/internal/wrappers/configuration"
-	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	asserts "github.com/stretchr/testify/assert"
@@ -1843,6 +1843,46 @@ func validateCheckmarxDomains(t *testing.T, usedDomainsInTests []string) {
 	}
 }
 
+func TestCreateScan_TwoScansWithSameBranchNameWithWhiteSpace_Success(t *testing.T) {
+	projectName := generateRandomProjectNameForScan()
+	args := []string{
+		scanCommand, "create",
+		flag(params.ProjectName), projectName,
+		flag(params.SourcesFlag), Zip,
+		flag(params.ScanTypes), "iac-security",
+		flag(params.BranchFlag), "dummy_branch",
+		flag(params.ScanInfoFormatFlag), printer.FormatJSON,
+	}
+	_, projectID := executeCreateScan(t, args)
+	args2 := []string{
+		scanCommand, "create",
+		flag(params.ProjectName), projectName,
+		flag(params.SourcesFlag), Zip,
+		flag(params.ScanTypes), "iac-security",
+		flag(params.BranchFlag), "   dummy_branch    ",
+	}
+	err, _ := executeCommand(t, args2...)
+	assert.NilError(t, err)
+
+	response := listScanByProjectID(t, projectID)
+	assert.Assert(t, len(response) == 2)
+	for _, scan := range response {
+		assert.Equal(t, scan.Branch, "dummy_branch", "Branch name should be dummy_branch")
+	}
+}
+func listScanByProjectID(t *testing.T, projectID string) []wrappers.ScanResponseModel {
+	scanFilter := fmt.Sprintf("project-id=%s", projectID)
+	outputBuffer := executeCmdNilAssertion(
+		t,
+		"Getting the scan should pass",
+		"scan", scanList, flag(params.FormatFlag), printer.FormatJSON, flag(params.FilterFlag), scanFilter,
+	)
+	// Read response from buffer
+	var scanList []wrappers.ScanResponseModel
+	_ = unmarshall(t, outputBuffer, &scanList, "Reading scan response JSON should pass")
+	return scanList
+}
+
 func TestCreateAsyncScan_CallExportServiceBeforeScanFinishWithRetry_Success(t *testing.T) {
 	createASTIntegrationTestCommand(t)
 	configuration.LoadConfiguration()