Skip to content

Switch Archive Download to Git Clone in scan-pr #1361

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

Closed
eranturgeman wants to merge 3 commits into from
Closed

Switch Archive Download to Git Clone in scan-pr #1361

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
2c0a46c
switch archive download to git clone in scan pr
eranturgeman Jun 25, 2026
db5d86f
.
eranturgeman Jun 28, 2026
44014fe
.
eranturgeman Jun 28, 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
6 changes: 4 additions & 2 deletions scanpullrequest/scanpullrequest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ func downloadSourceAndTarget(repoConfig *utils.Repository, scanDetails *utils.Sc
cleanup = func() error { return errors.Join(cleanupSource(), cleanupTarget()) }

log.Info("Downloading source branch code...")
if sourceBranchWd, cleanupSource, err = utils.DownloadRepoToTempDir(scanDetails.Client(),
if sourceBranchWd, cleanupSource, err = utils.CloneRepoToTempDir(scanDetails.Client(),
scanDetails.Username,
scanDetails.Token,
scanDetails.PullRequestDetails.Source.Owner,
scanDetails.PullRequestDetails.Source.Repository,
scanDetails.PullRequestDetails.Source.Name,
Expand All @@ -125,7 +127,7 @@ func downloadSourceAndTarget(repoConfig *utils.Repository, scanDetails *utils.Sc
return
}
target := repoConfig.Params.Git.PullRequestDetails.Target
if targetBranchWd, cleanupTarget, err = utils.DownloadRepoToTempDir(scanDetails.Client(), target.Owner, target.Repository, target.Name); err != nil {
if targetBranchWd, cleanupTarget, err = utils.CloneRepoToTempDir(scanDetails.Client(), scanDetails.Username, scanDetails.Token, target.Owner, target.Repository, target.Name); err != nil {
err = fmt.Errorf("failed to download target branch code. Error: %s", err.Error())
return
}
Expand Down
5 changes: 5 additions & 0 deletions utils/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ func (gm *GitManager) SetAuth(username, token string) *GitManager {
return gm
}

func (gm *GitManager) SetUrl(remoteHttpsGitUrl string) *GitManager {
gm.remoteGitUrl = remoteHttpsGitUrl
return gm
}

func (gm *GitManager) SetRemoteGitUrl(remoteHttpsGitUrl string) (*GitManager, error) {
// Check if the .git directory exists
dotGitExists, err := fileutils.IsDirExists(git.GitDirName, false)
Expand Down
15 changes: 10 additions & 5 deletions utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,20 +257,25 @@ func GenerateFrogbotSarifReport(extendedResults *results.SecurityCommandResults)
return stringReport, hasRuns, err
}

func DownloadRepoToTempDir(client vcsclient.VcsClient, repoOwner, repoName, branch string) (wd string, cleanup func() error, err error) {
func CloneRepoToTempDir(client vcsclient.VcsClient, username, token, repoOwner, repoName, branch string) (wd string, cleanup func() error, err error) {
wd, err = fileutils.CreateTempDir()
if err != nil {
return
}
cleanup = func() error {
return fileutils.RemoveTempDir(wd)
}
log.Debug(fmt.Sprintf("Downloading <%s/%s/%s> to: '%s'", repoOwner, repoName, branch, wd))
if err = client.DownloadRepository(context.Background(), repoOwner, repoName, branch, wd); err != nil {
err = fmt.Errorf("failed to download branch: <%s/%s/%s> with error: %s", repoOwner, repoName, branch, err.Error())
repoInfo, err := client.GetRepositoryInfo(context.Background(), repoOwner, repoName)
if err != nil {
err = fmt.Errorf("failed to get repository info for <%s/%s>: %s", repoOwner, repoName, err.Error())
return
}
log.Debug(fmt.Sprintf("Cloning <%s/%s/%s> to: '%s'", repoOwner, repoName, branch, wd))
if err = NewGitManager().SetAuth(username, token).SetUrl(repoInfo.CloneInfo.HTTP).Clone(wd, branch); err != nil {
err = fmt.Errorf("failed to clone branch: <%s/%s/%s> with error: %s", repoOwner, repoName, branch, err.Error())
return
}
log.Debug("Repository download completed")
log.Debug("Repository clone completed")
return
}

Expand Down
Loading