Skip to content

feat: auto-reclone git dependencies when pull fails #3104

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

Open
JordanGoasdoue wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: auto-reclone git dependencies when pull fails #3104

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
57 changes: 50 additions & 7 deletions pkg/devspace/dependency/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import (
"strings"
"sync"

"github.com/loft-sh/devspace/pkg/util/encoding"

"github.com/loft-sh/devspace/pkg/devspace/config/constants"
"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
"github.com/loft-sh/devspace/pkg/util/encoding"
"github.com/loft-sh/devspace/pkg/util/git"
"github.com/loft-sh/devspace/pkg/util/log"
"github.com/mitchellh/go-homedir"
Expand Down Expand Up @@ -146,12 +145,18 @@ func DownloadDependency(ctx context.Context, workingDirectory string, source *la

// Git pull
if !source.DisablePull && source.Revision == "" {
err = repo.Pull(ctx)
if err != nil {
log.Warn(err)
}
if err := repo.Pull(ctx); err != nil {
log.Infof("Git pull failed for dependency '%s': %v", gitPath, err)
log.Infof("Attempting automatic recovery by re-cloning")

if err := recloneDependency(ctx, localPath, gitCloneOptions, gitPath, log); err != nil {
return "", errors.Wrap(err, "git pull failed and automatic recovery failed")
}

log.Debugf("Pulled %s", gitPath)
log.Donef("Successfully recovered dependency '%s'", gitPath)
} else {
log.Debugf("Pulled %s", gitPath)
}
}

// Resolve local source
Expand Down Expand Up @@ -257,3 +262,41 @@ func GetDependencyID(source *latest.SourceConfig) (string, error) {
func isURL(path string) bool {
return strings.HasPrefix(path, "http://") || strings.HasPrefix(path, "https://")
}

func recloneDependency(ctx context.Context, localPath string, gitCloneOptions git.CloneOptions, gitPath string, log log.Logger) error {
// Clone to temporary location to avoid losing old version if clone fails
tmpPath := localPath + ".tmp-reclone"

// Clean up any leftover tmp directory from previous failed attempts
_ = os.RemoveAll(tmpPath)

// Create new repository in tmp location
repo, err := git.NewGitCLIRepository(ctx, tmpPath)
if err != nil {
return errors.Wrap(err, "create temporary git repository")
}

// Try to clone
err = repo.Clone(ctx, gitCloneOptions)
if err != nil {
gitCloneOptions.URL = switchURLType(gitPath)
err = repo.Clone(ctx, gitCloneOptions)
if err != nil {
_ = os.RemoveAll(tmpPath)
return errors.Wrap(err, "clone repository")
}
}

// Clone succeeded - now replace old version atomically
if err := os.RemoveAll(localPath); err != nil {
_ = os.RemoveAll(tmpPath)
return errors.Wrap(err, "remove old dependency cache")
}

// Atomic rename (both paths in same directory, so same filesystem)
if err := os.Rename(tmpPath, localPath); err != nil {
return errors.Wrap(err, "move new dependency into place")
}

return nil
}