chore(deps): Pull in Git client changes from Argo CD v2.11.2

Signed-off-by: jannfis <jann@mistrust.net>

3 files changed, 26 insertions, 27 deletions

diff --git a/pkg/argocd/git.go b/pkg/argocd/git.go
index 76af391..71a610a 100644
--- a/pkg/argocd/git.go
+++ b/pkg/argocd/git.go
@@ -206,7 +206,7 @@ func commitChangesGit(app *v1alpha1.Application, wbc *WriteBackConfig, changeLis
 		}
 	}
 
-	err = gitC.Checkout(pushBranch)
+	err = gitC.Checkout(pushBranch, false)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/argocd/gitcreds.go b/pkg/argocd/gitcreds.go
index 2716659..a9bc130 100644
--- a/pkg/argocd/gitcreds.go
+++ b/pkg/argocd/gitcreds.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/util/db"
-	argoGit "github.com/argoproj/argo-cd/v2/util/git"
 	"github.com/argoproj/argo-cd/v2/util/settings"
 
 	"github.com/argoproj-labs/argocd-image-updater/ext/git"
@@ -44,7 +43,7 @@ func getCredsFromArgoCD(wbc *WriteBackConfig, kubeClient *kube.KubernetesClient)
 	if !repo.HasCredentials() {
 		return nil, fmt.Errorf("credentials for '%s' are not configured in Argo CD settings", wbc.GitRepo)
 	}
-	return repo.GetGitCreds(argoGit.NoopCredsStore{}), nil
+	return repo.GetGitCreds(git.NoopCredsStore{}), nil
 }
 
 // getCredsFromSecret loads repository credentials from secret
@@ -66,7 +65,7 @@ func getCredsFromSecret(wbc *WriteBackConfig, credentialsSecret string, kubeClie
 		if sshPrivateKey, ok = credentials["sshPrivateKey"]; !ok {
 			return nil, fmt.Errorf("invalid secret %s: does not contain field sshPrivateKey", credentialsSecret)
 		}
-		return git.NewSSHCreds(string(sshPrivateKey), "", true), nil
+		return git.NewSSHCreds(string(sshPrivateKey), "", true, git.NoopCredsStore{}, ""), nil
 	} else if git.IsHTTPSURL(wbc.GitRepo) {
 		var username, password, githubAppID, githubAppInstallationID, githubAppPrivateKey []byte
 		if githubAppID, ok = credentials["githubAppID"]; ok {
@@ -85,12 +84,12 @@ func getCredsFromSecret(wbc *WriteBackConfig, credentialsSecret string, kubeClie
 			if err != nil {
 				return nil, fmt.Errorf("invalid value in field githubAppInstallationID: %w", err)
 			}
-			return git.NewGitHubAppCreds(intGithubAppID, intGithubAppInstallationID, string(githubAppPrivateKey), "", "", "", "", true), nil
+			return git.NewGitHubAppCreds(intGithubAppID, intGithubAppInstallationID, string(githubAppPrivateKey), "", "", "", "", true, "", git.NoopCredsStore{}), nil
 		} else if username, ok = credentials["username"]; ok {
 			if password, ok = credentials["password"]; !ok {
 				return nil, fmt.Errorf("invalid secret %s: does not contain field password", credentialsSecret)
 			}
-			return git.NewHTTPSCreds(string(username), string(password), "", "", true, ""), nil
+			return git.NewHTTPSCreds(string(username), string(password), "", "", true, "", git.NoopCredsStore{}, false), nil
 		}
 		return nil, fmt.Errorf("invalid repository credentials in secret %s: does not contain githubAppID or username", credentialsSecret)
 	}
diff --git a/pkg/argocd/update_test.go b/pkg/argocd/update_test.go
index 1d1246f..fd427b4 100644
--- a/pkg/argocd/update_test.go
+++ b/pkg/argocd/update_test.go
@@ -2407,8 +2407,8 @@ func Test_CommitUpdates(t *testing.T) {
 	t.Run("Good commit to target revision", func(t *testing.T) {
 		gitMock, _, cleanup := mockGit(t)
 		defer cleanup()
-		gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) {
-			args.Assert(t, "main")
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+			args.Assert(t, "main", false)
 		}).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2425,8 +2425,8 @@ func Test_CommitUpdates(t *testing.T) {
 	t.Run("Good commit to configured branch", func(t *testing.T) {
 		gitMock, _, cleanup := mockGit(t)
 		defer cleanup()
-		gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) {
-			args.Assert(t, "mybranch")
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+			args.Assert(t, "mybranch", false)
 		}).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2446,8 +2446,8 @@ func Test_CommitUpdates(t *testing.T) {
 		app := app.DeepCopy()
 		gitMock, _, cleanup := mockGit(t)
 		defer cleanup()
-		gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) {
-			args.Assert(t, "mydefaultbranch")
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+			args.Assert(t, "mydefaultbranch", false)
 		}).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2485,7 +2485,7 @@ func Test_CommitUpdates(t *testing.T) {
 				NewTag: tag.NewImageTag("1.1", time.Now(), ""),
 			},
 		}
-		gitMock.On("Checkout", TemplateBranchName(wbc.GitWriteBranch, cl)).Return(nil)
+		gitMock.On("Checkout", TemplateBranchName(wbc.GitWriteBranch, cl), mock.Anything).Return(nil)
 
 		err = commitChanges(&app, wbc, cl)
 		assert.NoError(t, err)
@@ -2509,8 +2509,8 @@ helm:
     forcestring: true
 `), os.ModePerm))
 
-		gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) {
-			args.Assert(t, "mydefaultbranch")
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+			args.Assert(t, "mydefaultbranch", false)
 		}).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2555,8 +2555,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 replacements: []
 `), os.ModePerm))
 
-		gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) {
-			args.Assert(t, "mydefaultbranch")
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+			args.Assert(t, "mydefaultbranch", false)
 		}).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2608,8 +2608,8 @@ replacements: []
 		app := app.DeepCopy()
 		gitMock, _, cleanup := mockGit(t)
 		defer cleanup()
-		gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) {
-			args.Assert(t, "mydefaultbranch")
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+			args.Assert(t, "mydefaultbranch", false)
 		}).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2635,8 +2635,8 @@ replacements: []
 		gitMock := &gitmock.Client{}
 		gitMock.On("Init").Return(nil)
 		gitMock.On("Fetch", mock.Anything).Return(nil)
-		gitMock.On("Checkout", mock.Anything).Run(func(args mock.Arguments) {
-			args.Assert(t, "mydefaultbranch")
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
+			args.Assert(t, "mydefaultbranch", false)
 		}).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2661,7 +2661,7 @@ replacements: []
 		gitMock := &gitmock.Client{}
 		gitMock.On("Init").Return(fmt.Errorf("cannot init"))
 		gitMock.On("Fetch", mock.Anything).Return(nil)
-		gitMock.On("Checkout", mock.Anything).Return(nil)
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Push", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		wbc, err := getWriteBackConfig(&app, &kubeClient, &argoClient)
@@ -2676,7 +2676,7 @@ replacements: []
 		gitMock := &gitmock.Client{}
 		gitMock.On("Init").Return(nil)
 		gitMock.On("Fetch", mock.Anything).Return(fmt.Errorf("cannot fetch"))
-		gitMock.On("Checkout", mock.Anything).Return(nil)
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Push", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		wbc, err := getWriteBackConfig(&app, &kubeClient, &argoClient)
@@ -2690,7 +2690,7 @@ replacements: []
 		gitMock := &gitmock.Client{}
 		gitMock.On("Init").Return(nil)
 		gitMock.On("Fetch", mock.Anything).Return(nil)
-		gitMock.On("Checkout", mock.Anything).Return(fmt.Errorf("cannot checkout"))
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Return(fmt.Errorf("cannot checkout"))
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Push", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		wbc, err := getWriteBackConfig(&app, &kubeClient, &argoClient)
@@ -2704,7 +2704,7 @@ replacements: []
 	t.Run("Cannot commit", func(t *testing.T) {
 		gitMock, _, cleanup := mockGit(t)
 		defer cleanup()
-		gitMock.On("Checkout", mock.Anything).Return(nil)
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(fmt.Errorf("cannot commit"))
 		gitMock.On("Push", mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -2719,7 +2719,7 @@ replacements: []
 	t.Run("Cannot push", func(t *testing.T) {
 		gitMock, _, cleanup := mockGit(t)
 		defer cleanup()
-		gitMock.On("Checkout", mock.Anything).Return(nil)
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Push", mock.Anything, mock.Anything, mock.Anything).Return(fmt.Errorf("cannot push"))
@@ -2735,7 +2735,7 @@ replacements: []
 		app := app.DeepCopy()
 		gitMock, _, cleanup := mockGit(t)
 		defer cleanup()
-		gitMock.On("Checkout", mock.Anything).Return(nil)
+		gitMock.On("Checkout", mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Add", mock.Anything).Return(nil)
 		gitMock.On("Commit", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 		gitMock.On("Push", mock.Anything, mock.Anything, mock.Anything).Return(nil)