CR-7821 (#212)

* CreateIfNotExist public
argoproj-labs · Nov 29, 2021 · 54c869f · 54c869f
1 parent 1daa78c
commit 54c869f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pkg/git/repository.go b/pkg/git/repository.go
@@ -53,10 +53,10 @@ type (
 		Auth             Auth
 		FS               fs.FS
 		Progress         io.Writer
+		CreateIfNotExist bool
 		url              string
 		revision         string
 		path             string
-		createIfNotExist bool
 	}
 
 	PushOptions struct {
@@ -121,7 +121,7 @@ var (
 func AddFlags(cmd *cobra.Command, opts *AddFlagsOptions) *CloneOptions {
 	co := &CloneOptions{
 		FS:               fs.Create(opts.FS),
-		createIfNotExist: opts.CreateIfNotExist,
+		CreateIfNotExist: opts.CreateIfNotExist,
 	}
 
 	if opts.Prefix != "" && !strings.HasSuffix(opts.Prefix, "-") {
@@ -182,7 +182,7 @@ func (o *CloneOptions) GetRepo(ctx context.Context) (Repository, fs.FS, error) {
 	if err != nil {
 		switch err {
 		case transport.ErrRepositoryNotFound:
-			if !o.createIfNotExist {
+			if !o.CreateIfNotExist {
 				return nil, nil, err
 			}
 
@@ -330,7 +330,7 @@ var clone = func(ctx context.Context, opts *CloneOptions) (*repo, error) {
 
 	log.G(ctx).WithField("url", opts.url).Debug("cloning git repo")
 
-	if opts.createIfNotExist {
+	if opts.CreateIfNotExist {
 		curPushRetries = 1 // no retries
 	}
 

diff --git a/pkg/git/repository_test.go b/pkg/git/repository_test.go
@@ -369,10 +369,10 @@ func Test_clone(t *testing.T) {
 			retErr:  transport.ErrRepositoryNotFound,
 			wantErr: true,
 		},
-		"Should not retry if createIfNotExist is true": {
+		"Should not retry if CreateIfNotExist is true": {
 			opts: &CloneOptions{
 				Repo:             "https://github.com/owner/name",
-				createIfNotExist: true,
+				CreateIfNotExist: true,
 			},
 			expectedOpts: &gg.CloneOptions{
 				URL:      "https://github.com/owner/name.git",
@@ -491,10 +491,10 @@ func TestGetRepo(t *testing.T) {
 				assert.Error(t, transport.ErrRepositoryNotFound, e)
 			},
 		},
-		"Should fail when createIfNotExist is true and create fails": {
+		"Should fail when CreateIfNotExist is true and create fails": {
 			opts: &CloneOptions{
 				Repo:             "https://github.com/owner/name",
-				createIfNotExist: true,
+				CreateIfNotExist: true,
 			},
 			wantErr: "some error",
 			cloneFn: func(_ context.Context, opts *CloneOptions) (*repo, error) {
@@ -526,10 +526,10 @@ func TestGetRepo(t *testing.T) {
 				assert.EqualError(t, e, "failed to initialize repository: some error")
 			},
 		},
-		"Should create and init repo when createIfNotExist is true": {
+		"Should create and init repo when CreateIfNotExist is true": {
 			opts: &CloneOptions{
 				Repo:             "https://github.com/owner/name",
-				createIfNotExist: true,
+				CreateIfNotExist: true,
 				FS:               fs.Create(memfs.New()),
 			},
 			wantErr: "some error",