mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-29 17:41:13 +00:00
Revert "Merge pull request #2169 from yujunz/loader/go-getter"
This reverts commit0b1ad031a9, reversing changes made to300dd108d5.
This commit is contained in:
@@ -5,13 +5,6 @@
|
||||
package loader
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
getter "github.com/yujunz/go-getter"
|
||||
|
||||
"sigs.k8s.io/kustomize/api/filesys"
|
||||
"sigs.k8s.io/kustomize/api/ifc"
|
||||
"sigs.k8s.io/kustomize/api/internal/git"
|
||||
@@ -26,43 +19,16 @@ import (
|
||||
func NewLoader(
|
||||
lr LoadRestrictorFunc,
|
||||
target string, fSys filesys.FileSystem) (ifc.Loader, error) {
|
||||
|
||||
root, errD := demandDirectoryRoot(fSys, target)
|
||||
if errD == nil {
|
||||
return newLoaderAtConfirmedDir(lr, root, fSys, nil, getRepo), nil
|
||||
repoSpec, err := git.NewRepoSpecFromUrl(target)
|
||||
if err == nil {
|
||||
// The target qualifies as a remote git target.
|
||||
return newLoaderAtGitClone(
|
||||
repoSpec, fSys, nil, git.ClonerUsingGitExec)
|
||||
}
|
||||
|
||||
ldr, errL := newLoaderAtGitClone(
|
||||
(&git.RepoSpec{}).WithRaw(target), fSys, nil, getRepo)
|
||||
|
||||
if errL != nil {
|
||||
return nil, fmt.Errorf("Error demand directory %q and create loader %q", errD, errL)
|
||||
}
|
||||
|
||||
return ldr, nil
|
||||
}
|
||||
|
||||
func getRepo(repoSpec *git.RepoSpec) error {
|
||||
var err error
|
||||
repoSpec.Dir, err = filesys.NewTmpConfirmedDir()
|
||||
root, err := demandDirectoryRoot(fSys, target)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Get the pwd
|
||||
pwd, err := os.Getwd()
|
||||
if err != nil {
|
||||
log.Fatalf("Error getting wd: %s", err)
|
||||
}
|
||||
|
||||
opts := []getter.ClientOption{}
|
||||
client := &getter.Client{
|
||||
Ctx: context.TODO(),
|
||||
Src: repoSpec.Raw(),
|
||||
Dst: repoSpec.Dir.String(),
|
||||
Pwd: pwd,
|
||||
Mode: getter.ClientModeAny,
|
||||
Options: opts,
|
||||
}
|
||||
return client.Get()
|
||||
return newLoaderAtConfirmedDir(
|
||||
lr, root, fSys, nil, git.ClonerUsingGitExec), nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user