change clone opts fs

argoproj-labs · Jun 8, 2021 · 5ba8ae6 · 5ba8ae6
1 parent cd2306a
commit 5ba8ae6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cmd/commands/app.go b/cmd/commands/app.go
@@ -176,7 +176,7 @@ func setAppOptsDefaults(ctx context.Context, repofs fs.FS, opts *AppCreateOption
 		cloneOpts := &git.CloneOptions{
 			Repo: opts.AppOpts.AppSpecifier,
 			Auth: opts.CloneOpts.Auth,
-			FS:   memfs.New(),
+			FS:   fs.Create(memfs.New()),
 		}
 		cloneOpts.Parse()
 		_, fsys, err = clone(ctx, cloneOpts)

diff --git a/cmd/commands/repo.go b/cmd/commands/repo.go
@@ -259,7 +259,7 @@ func RunRepoCreate(ctx context.Context, opts *RepoCreateOptions) (*git.CloneOpti
 
 	co := &git.CloneOptions{
 		Repo: repoUrl,
-		FS:   memfs.New(),
+		FS:   fs.Create(memfs.New()),
 		Auth: git.Auth{
 			Password: opts.Token,
 		},

diff --git a/pkg/git/repository.go b/pkg/git/repository.go
@@ -39,7 +39,7 @@ type (
 		// URL clone url
 		Repo     string
 		Auth     Auth
-		FS       billy.Filesystem
+		FS       fs.FS
 		Progress io.Writer
 		url      string
 		revision string
@@ -79,9 +79,9 @@ var (
 	}
 )
 
-func AddFlags(cmd *cobra.Command, fs billy.Filesystem, prefix string) *CloneOptions {
+func AddFlags(cmd *cobra.Command, bfs billy.Filesystem, prefix string) *CloneOptions {
 	co := &CloneOptions{
-		FS: fs,
+		FS: fs.Create(bfs),
 	}
 
 	if prefix == "" {

diff --git a/pkg/git/repository_test.go b/pkg/git/repository_test.go
@@ -432,7 +432,7 @@ func TestClone(t *testing.T) {
 
 			if tt.opts != nil {
 				tt.opts.Parse()
-				tt.opts.FS = memfs.New()
+				tt.opts.FS = fs.Create(memfs.New())
 			}
 
 			gotRepo, gotFS, err := tt.opts.Clone(context.Background())