jfrog · EyalDelarea · Aug 13, 2023 · Aug 13, 2023 · Aug 13, 2023
diff --git a/commands/utils/params.go b/commands/utils/params.go
@@ -208,14 +208,28 @@ func (g *Git) setDefaultsIfNeeded(gitParamsFromEnv *Git) (err error) {
 		}
 		g.RepoName = gitParamsFromEnv.RepoName
 	}
-	if len(g.Branches) == 0 && len(gitParamsFromEnv.Branches) == 0 {
-		var branch string
-		if branch, err = GetBranchFromDotGit(); err != nil {
-			return
+	if g.EmailAuthor == "" {
+		if g.EmailAuthor = getTrimmedEnv(GitEmailAuthorEnv); g.EmailAuthor == "" {
+			g.EmailAuthor = frogbotAuthorEmail
+		}
+	}
+	// When pull request ID is provided, no need to continue and extract unrelated env params.
+	isPullRequestContext := gitParamsFromEnv.PullRequestDetails.ID != 0
+	if isPullRequestContext {
+		return
+	}
+	// Continue to extract ScanRepository related env params
+	noBranchesProvidedViaConfig := len(g.Branches) == 0
+	noBranchesProvidedViaEnv := len(gitParamsFromEnv.Branches) == 0
+	if noBranchesProvidedViaConfig {
+		g.Branches = gitParamsFromEnv.Branches
+		if noBranchesProvidedViaEnv {
+			var branch string
+			if branch, err = GetBranchFromDotGit(); err != nil {
+				return
+			}
+			g.Branches = []string{branch}
 		}
-		g.Branches = append(g.Branches, branch)
-	} else if len(g.Branches) == 0 {
-		g.Branches = append(g.Branches, gitParamsFromEnv.Branches...)
 	}
 	if g.BranchNameTemplate == "" {
 		branchTemplate := getTrimmedEnv(BranchNameTemplateEnv)
@@ -235,11 +249,6 @@ func (g *Git) setDefaultsIfNeeded(gitParamsFromEnv *Git) (err error) {
 			return
 		}
 	}
-	if g.EmailAuthor == "" {
-		if g.EmailAuthor = getTrimmedEnv(GitEmailAuthorEnv); g.EmailAuthor == "" {
-			g.EmailAuthor = frogbotAuthorEmail
-		}
-	}
 	return
 }
 

diff --git a/commands/utils/params_test.go b/commands/utils/params_test.go
@@ -31,7 +31,9 @@ func TestExtractParamsFromEnvError(t *testing.T) {
 	assert.EqualError(t, err, "JF_USER and JF_PASSWORD or JF_ACCESS_TOKEN environment variables are missing")
 }
 
-func TestExtractParamsFromEnvPlatform(t *testing.T) {
+// Test extraction of env params in ScanPullRequest command
+// Pull request ID is not default, which mean we don't have branches related variables defined.
+func TestExtractParamsFromEnvPlatformScanPullRequest(t *testing.T) {
 	SetEnvAndAssert(t, map[string]string{
 		JFrogUrlEnv:         "http://127.0.0.1:8081",
 		JFrogUserEnv:        "admin",
@@ -40,12 +42,29 @@ func TestExtractParamsFromEnvPlatform(t *testing.T) {
 		GitRepoOwnerEnv:     "jfrog",
 		GitRepoEnv:          "frogbot",
 		GitTokenEnv:         "123456789",
-		GitBaseBranchEnv:    "dev",
 		GitPullRequestIDEnv: "1",
 	})
 	extractAndAssertParamsFromEnv(t, true, true)
 }
 
+// Test extraction in ScanRepository command
+// Pull request ID is default 0, which mean we will have branches related variables.
+func TestExtractParamsFromEnvPlatformScanRepository(t *testing.T) {
+	SetEnvAndAssert(t, map[string]string{
+		JFrogUrlEnv:              "http://127.0.0.1:8081",
+		JFrogUserEnv:             "admin",
+		JFrogPasswordEnv:         "password",
+		GitProvider:              string(BitbucketServer),
+		GitRepoOwnerEnv:          "jfrog",
+		GitRepoEnv:               "frogbot",
+		GitTokenEnv:              "123456789",
+		CommitMessageTemplateEnv: "my-custom-commit-template",
+		GitBaseBranchEnv:         "dev",
+		GitPullRequestIDEnv:      "0",
+	})
+	extractAndAssertParamsFromEnv(t, true, true)
+}
+
 func TestExtractParamsFromEnvArtifactoryXray(t *testing.T) {
 	SetEnvAndAssert(t, map[string]string{
 		JFrogUrlEnv:            "",
@@ -250,8 +269,15 @@ func extractAndAssertParamsFromEnv(t *testing.T, platformUrl, basicAuth bool) {
 		assert.Equal(t, "jfrog", configParams.RepoOwner)
 		assert.Equal(t, "frogbot", configParams.RepoName)
 		assert.Equal(t, "123456789", configParams.Token)
-		assert.Equal(t, "dev", configParams.Branches[0])
-		assert.Equal(t, int64(1), configParams.PullRequestDetails.ID)
+		// ScanRepository command context
+		if len(configParams.Branches) != 0 {
+			assert.Equal(t, "dev", configParams.Branches[0])
+			assert.Equal(t, int64(0), configParams.PullRequestDetails.ID)
+			assert.Equal(t, "my-custom-commit-template", configParams.Git.CommitMessageTemplate)
+		} else {
+			// ScanPullRequest context
+			assert.Equal(t, int64(1), configParams.PullRequestDetails.ID)
+		}
 	}
 }
 
@@ -309,6 +335,7 @@ func TestGenerateConfigAggregatorFromEnv(t *testing.T) {
 		FailOnSecurityIssuesEnv:      "false",
 		MinSeverityEnv:               "medium",
 		FixableOnlyEnv:               "true",
+		GitPullRequestIDEnv:          "0",
 	})
 	defer func() {
 		assert.NoError(t, SanitizeEnv())
@@ -459,6 +486,7 @@ func TestBuildMergedRepoAggregator(t *testing.T) {
 		CommitMessageTemplateEnv:     "commit-msg",
 		FailOnSecurityIssuesEnv:      "true",
 		jfrogWatchesEnv:              "watch-1,watch-2",
+		GitPullRequestIDEnv:          "0",
 	})
 	testFilePath := filepath.Join("..", "testdata", "config", "frogbot-config-test-params-merge.yml")
 	fileContent, err := os.ReadFile(testFilePath)

diff --git a/go.sum b/go.sum
@@ -1222,7 +1222,6 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
 golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
 golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=