Skip to content

Fix temp dir switching issue and naming in scan repo flow #1016

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
eranturgeman merged 3 commits into from
Jan 4, 2026
Merged

Fix temp dir switching issue and naming in scan repo flow #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05e5f75
fix naming and potential bug in temp dir switching
eranturgeman Dec 30, 2025
1a02565
remove comments
eranturgeman Jan 4, 2026
b27b96c
Merge branch 'v3_er' of https://github.com/jfrog/frogbot into fix-tem…
eranturgeman Jan 4, 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
19 changes: 13 additions & 6 deletions scanrepository/scanrepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,25 @@ func (sr *ScanRepositoryCmd) Run(repository utils.Repository, client vcsclient.V
}

func (sr *ScanRepositoryCmd) prepareEnvAndScanBranch(repository *utils.Repository) (err error) {
repoDir, restoreBaseDir, err := sr.checkoutToBranch()
repoDir, restoreBaseDir, err := sr.switchToTempWorkingDir()
if err != nil {
return
}
sr.baseWd = repoDir
defer func() {
// On dry run don't delete the folder as we want to validate results
if sr.dryRun {
// On dry run don't delete the folder as we want to validate results
return
}
err = errors.Join(err, restoreBaseDir(), fileutils.RemoveTempDir(repoDir))
if restoreErr := restoreBaseDir(); restoreErr != nil {
err = errors.Join(err, restoreErr)
}
if repoErr := sr.gitManager.SetCurrentWdAsLocalGitRepository(); repoErr != nil {
err = errors.Join(err, repoErr)
}
if removeErr := fileutils.RemoveTempDir(repoDir); removeErr != nil {
err = errors.Join(err, removeErr)
}
}()

sr.scanDetails.MultiScanId, sr.scanDetails.StartTime = xsc.SendNewScanEvent(sr.scanDetails.XrayVersion, sr.scanDetails.XscVersion,
Expand Down Expand Up @@ -427,7 +435,7 @@ func (sr *ScanRepositoryCmd) preparePullRequestDetails(aggregateFixes bool, vuln
return pullRequestTitle, prBody, extraComments, nil
}

func (sr *ScanRepositoryCmd) checkoutToBranch() (tempWd string, restoreDir func() error, err error) {
func (sr *ScanRepositoryCmd) switchToTempWorkingDir() (tempWd string, restoreDir func() error, err error) {
if sr.dryRun {
tempWd = filepath.Join(sr.dryRunRepoPath, sr.scanDetails.RepoName)
} else {
Expand All @@ -449,8 +457,7 @@ func (sr *ScanRepositoryCmd) checkoutToBranch() (tempWd string, restoreDir func(
if err != nil {
return
}
// Set the current copied local dir as the local git repository we are working with
err = sr.gitManager.SetLocalRepository()
err = sr.gitManager.SetCurrentWdAsLocalGitRepository()
return
}

Expand Down
4 changes: 2 additions & 2 deletions utils/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ func (gm *GitManager) SetLocalRepositoryAndRemoteName() (*GitManager, error) {
var err error
// Re-initialize the repository and update remoteName
gm.remoteName = vcsutils.RemoteName
err = gm.SetLocalRepository()
err = gm.SetCurrentWdAsLocalGitRepository()
return gm, err
}

func (gm *GitManager) SetLocalRepository() error {
func (gm *GitManager) SetCurrentWdAsLocalGitRepository() error {
var err error
gm.localGitRepository, err = git.PlainOpen(".")
return err
Expand Down
Loading