Skip to content

Added full project path to the branch name #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orto17 merged 4 commits into from
Feb 16, 2026
Merged

Added full project path to the branch name #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ead365c
added full path to the branch hash name
orto17 Feb 10, 2026
bae3f9c
after code review
orto17 Feb 15, 2026
e9ba548
go sec ignore
orto17 Feb 16, 2026
282096d
go sec ignore
orto17 Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions scanrepository/scanrepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,9 @@ func (cfp *ScanRepositoryCmd) fixProjectVulnerabilities(repository *utils.Reposi
}

// Fix every vulnerability in a separate pull request and branch
projectPathFromRoot := projectWorkingDir
for _, vulnerability := range vulnerabilities {
if e := cfp.fixSinglePackageAndCreatePR(repository, vulnerability); e != nil {
if e := cfp.fixSinglePackageAndCreatePR(repository, projectPathFromRoot, vulnerability); e != nil {
err = errors.Join(err, cfp.handleUpdatePackageErrors(e))
}

Expand Down Expand Up @@ -386,10 +387,11 @@ func (cfp *ScanRepositoryCmd) handleUpdatePackageErrors(err error) error {

// Creates a branch for the fixed package and open pull request against the target branch.
// In case a branch already exists on remote, we skip it.
func (cfp *ScanRepositoryCmd) fixSinglePackageAndCreatePR(repository *utils.Repository, vulnDetails *utils.VulnerabilityDetails) (err error) {
// projectPathFromRoot is the relative path of the project from the repository root (used for branch name uniqueness).
func (cfp *ScanRepositoryCmd) fixSinglePackageAndCreatePR(repository *utils.Repository, projectPathFromRoot string, vulnDetails *utils.VulnerabilityDetails) (err error) {
fixVersion := vulnDetails.SuggestedFixedVersion
log.Debug("Attempting to fix", fmt.Sprintf("%s:%s", vulnDetails.ImpactedDependencyName, vulnDetails.ImpactedDependencyVersion), "with", fixVersion)
fixBranchName, err := cfp.gitManager.GenerateFixBranchName(cfp.scanDetails.BaseBranch(), vulnDetails.ImpactedDependencyName, fixVersion)
fixBranchName, err := cfp.gitManager.GenerateFixBranchName(cfp.scanDetails.BaseBranch(), vulnDetails.ImpactedDependencyName, fixVersion, projectPathFromRoot)
if err != nil {
return
}
Expand Down
17 changes: 11 additions & 6 deletions scanrepository/scanrepository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
"github.com/CycloneDX/cyclonedx-go"
"github.com/google/go-github/v45/github"
biutils "github.com/jfrog/build-info-go/utils"
"github.com/jfrog/frogbot/v2/utils"
"github.com/jfrog/frogbot/v2/utils/outputwriter"
"github.com/jfrog/froggit-go/vcsclient"
"github.com/jfrog/froggit-go/vcsutils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
Expand All @@ -31,6 +29,9 @@ import (
"github.com/jfrog/jfrog-client-go/xray/services"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/jfrog/frogbot/v2/utils"
"github.com/jfrog/frogbot/v2/utils/outputwriter"
)

const rootTestDir = "scanrepository"
Expand Down Expand Up @@ -392,16 +393,20 @@ func TestGenerateFixBranchName(t *testing.T) {
baseBranch string
impactedPackage string
fixVersion string
projectPath string
expectedName string
}{
{"dev", "gopkg.in/yaml.v3", "3.0.0", "frogbot-gopkg.in/yaml.v3-d61bde82dc594e5ccc5a042fe224bf7c"},
{"master", "gopkg.in/yaml.v3", "3.0.0", "frogbot-gopkg.in/yaml.v3-41405528994061bd108e3bbd4c039a03"},
{"dev", "replace:colons:colons", "3.0.0", "frogbot-replace_colons_colons-89e555131b4a70a32fe9d9c44d6ff0fc"},
{"dev", "gopkg.in/yaml.v3", "3.0.0", "", "frogbot-gopkg.in/yaml.v3-d61bde82dc594e5ccc5a042fe224bf7c"},
{"master", "gopkg.in/yaml.v3", "3.0.0", "", "frogbot-gopkg.in/yaml.v3-41405528994061bd108e3bbd4c039a03"},
{"dev", "replace:colons:colons", "3.0.0", "", "frogbot-replace_colons_colons-89e555131b4a70a32fe9d9c44d6ff0fc"},
{"main", "requests", "2.25.3", "", "frogbot-requests-ae6fef399c0fdd96441b0215f28147d2"},
{"main", "requests", "2.25.3", "subfolder", "frogbot-requests-28662794aa63a6250dd9a80f7618f841"},
{"main", "requests", "2.25.3", "other/project", "frogbot-requests-61eeddf6eda4b867a2b75fa5630875e8"},
}
gitManager := utils.GitManager{}
for _, test := range tests {
t.Run(test.expectedName, func(t *testing.T) {
branchName, err := gitManager.GenerateFixBranchName(test.baseBranch, test.impactedPackage, test.fixVersion)
branchName, err := gitManager.GenerateFixBranchName(test.baseBranch, test.impactedPackage, test.fixVersion, test.projectPath)
assert.NoError(t, err)
assert.Equal(t, test.expectedName, branchName)
})
Expand Down
9 changes: 6 additions & 3 deletions utils/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"errors"
"fmt"
"net/http"

"regexp"
"strings"
"time"
Expand Down Expand Up @@ -486,8 +485,12 @@ func formatStringWithPlaceHolders(str, impactedPackage, fixVersion, hash, baseBr
return str
}

func (gm *GitManager) GenerateFixBranchName(branch string, impactedPackage string, fixVersion string) (string, error) {
hash, err := Md5Hash("frogbot", branch, impactedPackage, fixVersion)
func (gm *GitManager) GenerateFixBranchName(branch string, impactedPackage string, fixVersion string, projectPath string) (string, error) {
hashInputs := []string{"frogbot", branch, impactedPackage, fixVersion}
if projectPath != "" {
hashInputs = append(hashInputs, projectPath)
Copy link
Contributor

@attiasas attiasas Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
hashInputs = append(hashInputs, projectPath)
hashInputs = append(hashInputs, filepath.ToSlash(projectPath))

make sure to add this so runs from windows and diff os will show the same results.

}
hash, err := Md5Hash(hashInputs...)
if err != nil {
return "", err
}
Expand Down
2 changes: 1 addition & 1 deletion utils/git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestGitManager_GenerateFixBranchName(t *testing.T) {
}
for _, test := range testCases {
t.Run(test.expected, func(t *testing.T) {
commitMessage, err := test.gitManager.GenerateFixBranchName("md5Branch", test.impactedPackage, test.fixVersion.SuggestedFixedVersion)
commitMessage, err := test.gitManager.GenerateFixBranchName("md5Branch", test.impactedPackage, test.fixVersion.SuggestedFixedVersion, "")
assert.NoError(t, err)
assert.Equal(t, test.expected, commitMessage)
})
Expand Down
1 change: 1 addition & 0 deletions utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ func isUrlAccessible(url string) bool {
return false
}
log.Debug(fmt.Sprintf("Sending HTTP %s request to: '%s'", req.Method, req.URL))
// #nosec G704 -- URL is from Frogbot config (FrogbotRepoUrl), not user input
resp, err := client.GetClient().Do(req)
if errorutils.CheckError(err) != nil {
log.Debug(fmt.Sprintf("Can't check access to '%s', error while sending request:\n%s", url, err.Error()))
Expand Down
Loading