Changed the primary flag to boolean

Author: cx-anjali-deore

internal/commands/scan.go

@@ -116,6 +116,7 @@ const (
 	ScsRepoWarningMsg = "SCS scan warning: Unable to start Scorecard scan due to missing required flags, please include in the ast-cli arguments: " +
 		"--scs-repo-url your_repo_url --scs-repo-token your_repo_token"
 	ScsScorecardUnsupportedHostWarningMsg = "SCS scan warning: Unable to run Scorecard scanner due to unsupported repo host. Currently, Scorecard can only run on GitHub Cloud repos."
+	BranchPrimaryPrefix                   = "--branch-primary="
 )
 
 var (
@@ -2956,6 +2957,15 @@ func validateCreateScanFlags(cmd *cobra.Command) error {
 			return fmt.Errorf("Invalid value for --%s flag. Must be a valid UUID.", commonParams.IacsPresetIDFlag)
 		}
 	}
+	// check if flag was passed as arg
+	isBranchChanged := cmd.Flags().Changed(commonParams.BranchPrimaryFlag)
+	if isBranchChanged {
+		for _, a := range os.Args[1:] {
+			if strings.HasPrefix(a, BranchPrimaryPrefix) {
+				return fmt.Errorf("invalid value for --branch-primary flag. This flag must be sent with no value")
+			}
+		}
+	}
 
 	return nil
 }

internal/commands/scan_test.go

@@ -612,11 +612,23 @@ func TestCreateScanWithPrimaryBranchFlag_Passed(t *testing.T) {
 }
 
 func TestCreateScanWithPrimaryBranchFlagBooleanValueTrue_Passed(t *testing.T) {
-	execCmdNilAssertion(t, "scan", "create", "--project-name", "MOCK", "-s", dummyRepo, "-b", "dummy_branch", "--debug", "--branch-primary=true")
+	original := os.Args
+	defer func() { os.Args = original }()
+	os.Args = []string{
+		"scan", "create", "--project-name", "MOCK", "-s", dummyRepo, "-b", "dummy_branch", "--debug", "--branch-primary=true",
+	}
+	err := execCmdNotNilAssertion(t, "scan", "create", "--project-name", "MOCK", "-s", dummyRepo, "-b", "dummy_branch", "--debug", "--branch-primary=true")
+	assert.ErrorContains(t, err, "invalid value for --branch-primary flag", err.Error())
 }
 
 func TestCreateScanWithPrimaryBranchFlagBooleanValueFalse_Passed(t *testing.T) {
-	execCmdNilAssertion(t, "scan", "create", "--project-name", "MOCK", "-s", dummyRepo, "-b", "dummy_branch", "--debug", "--branch-primary=false")
+	original := os.Args
+	defer func() { os.Args = original }()
+	os.Args = []string{
+		"scan", "create", "--project-name", "MOCK", "-s", dummyRepo, "-b", "dummy_branch", "--debug", "--branch-primary=false",
+	}
+	err := execCmdNotNilAssertion(t, "scan", "create", "--project-name", "MOCK", "-s", dummyRepo, "-b", "dummy_branch", "--debug", "--branch-primary=false")
+	assert.ErrorContains(t, err, "invalid value for --branch-primary flag", err.Error())
 }
 
 func TestCreateScanWithPrimaryBranchFlagStringValue_Should_Fail(t *testing.T) {

internal/services/projects.go

@@ -40,10 +40,7 @@ func FindProject(
 		return "", err
 	}
 	branchName := strings.TrimSpace(viper.GetString(commonParams.BranchKey))
-	branchPrimaryChanged := cmd.Flags().Changed(commonParams.BranchPrimaryFlag)
-	if branchPrimaryChanged {
-		isBranchPrimary, _ = cmd.Flags().GetBool(commonParams.BranchPrimaryFlag)
-	}
+	isBranchPrimary, _ = cmd.Flags().GetBool(commonParams.BranchPrimaryFlag)
 	for i := 0; i < len(resp.Projects); i++ {
 		project := resp.Projects[i]
 		if project.Name == projectName {