Skip to content

fix: Small refactor on ReadLocks #90

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
js-murph merged 1 commit into from
Feb 6, 2026
Merged

fix: Small refactor on ReadLocks #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions internal/gitclone/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,12 @@ func (r *Repository) WithReadLock(fn func()) {
fn()
}

func WithReadLockReturn[T any](repo *Repository, fn func() (T, error)) (T, error) {
repo.mu.RLock()
defer repo.mu.RUnlock()
return fn()
}

func (r *Repository) Clone(ctx context.Context, config Config) error {
r.mu.Lock()
if r.state != StateEmpty {
Expand Down
35 changes: 10 additions & 25 deletions internal/strategy/gomod/private_fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,10 @@ func (p *privateFetcher) resolveVersionQuery(ctx context.Context, repo *gitclone
}

func (p *privateFetcher) listVersions(ctx context.Context, repo *gitclone.Repository) ([]string, error) {
var output []byte
var err error

repo.WithReadLock(func() {
output, err := gitclone.WithReadLockReturn(repo, func() ([]byte, error) {
// #nosec G204 - repo.Path() is controlled by us
cmd := exec.CommandContext(ctx, "git", "-C", repo.Path(), "tag", "-l", "v*")
output, err = cmd.CombinedOutput()
return cmd.CombinedOutput()
})

if err != nil {
Expand All @@ -214,13 +211,10 @@ func (p *privateFetcher) listVersions(ctx context.Context, repo *gitclone.Reposi
}

func (p *privateFetcher) getCommitTime(ctx context.Context, repo *gitclone.Repository, ref string) (time.Time, error) {
var output []byte
var err error

repo.WithReadLock(func() {
output, err := gitclone.WithReadLockReturn(repo, func() ([]byte, error) {
// #nosec G204 - repo.Path() and ref are controlled by us
cmd := exec.CommandContext(ctx, "git", "-C", repo.Path(), "log", "-1", "--format=%cI", ref)
output, err = cmd.CombinedOutput()
return cmd.CombinedOutput()
})

if err != nil {
Expand All @@ -233,13 +227,10 @@ func (p *privateFetcher) getCommitTime(ctx context.Context, repo *gitclone.Repos
}

func (p *privateFetcher) getDefaultBranchVersion(ctx context.Context, repo *gitclone.Repository) (string, time.Time, error) {
var output []byte
var err error

repo.WithReadLock(func() {
output, err := gitclone.WithReadLockReturn(repo, func() ([]byte, error) {
// #nosec G204 - repo.Path() is controlled by us
cmd := exec.CommandContext(ctx, "git", "-C", repo.Path(), "rev-parse", "HEAD")
output, err = cmd.CombinedOutput()
return cmd.CombinedOutput()
})

if err != nil {
Expand Down Expand Up @@ -279,13 +270,10 @@ func (p *privateFetcher) generateInfo(ctx context.Context, repo *gitclone.Reposi
}

func (p *privateFetcher) generateMod(ctx context.Context, repo *gitclone.Repository, modulePath, version string) io.ReadSeekCloser {
var output []byte
var err error

repo.WithReadLock(func() {
output, err := gitclone.WithReadLockReturn(repo, func() ([]byte, error) {
// #nosec G204 - version and repo.Path() are controlled by this package, not user input
cmd := exec.CommandContext(ctx, "git", "-C", repo.Path(), "show", fmt.Sprintf("%s:go.mod", version))
output, err = cmd.CombinedOutput()
return cmd.CombinedOutput()
})

if err != nil {
Expand All @@ -298,16 +286,13 @@ func (p *privateFetcher) generateMod(ctx context.Context, repo *gitclone.Reposit

func (p *privateFetcher) generateZip(ctx context.Context, repo *gitclone.Repository, modulePath, version string) (io.ReadSeekCloser, error) {
prefix := fmt.Sprintf("%s@%s/", modulePath, version)
var output []byte
var err error

repo.WithReadLock(func() {
output, err := gitclone.WithReadLockReturn(repo, func() ([]byte, error) {
// #nosec G204 - version and repo.Path() are controlled by this package, not user input
cmd := exec.CommandContext(ctx, "git", "-C", repo.Path(), "archive",
"--format=zip",
fmt.Sprintf("--prefix=%s", prefix),
version)
output, err = cmd.CombinedOutput()
return cmd.CombinedOutput()
})

if err != nil {
Expand Down