controllers: use new git contract

The minimal changes required to make the new `git` contract work. Signed-off-by: Hidde Beydals <[email protected]>
fluxcd · Oct 26, 2021 · f03cb7b · f03cb7b
1 parent afdad24
commit f03cb7b
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 37 deletions.
diff --git a/controllers/git_test.go b/controllers/git_test.go
@@ -159,7 +159,7 @@ func TestPushRejected(t *testing.T) {
 	// This is here to guard against push in general being broken
 	err = push(context.TODO(), tmp, "main", repoAccess{
 		url:  repoURL,
-		auth: &git.Auth{},
+		auth: &git.AuthOptions{},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -174,7 +174,7 @@ func TestPushRejected(t *testing.T) {
 	// pushed to.
 	err = push(context.TODO(), tmp, branch, repoAccess{
 		url:  repoURL,
-		auth: &git.Auth{},
+		auth: &git.AuthOptions{},
 	})
 	if err == nil {
 		t.Error("push to a forbidden branch is expected to fail, but succeeded")

diff --git a/controllers/imageupdateautomation_controller.go b/controllers/imageupdateautomation_controller.go
@@ -63,6 +63,7 @@ import (
 	"github.com/fluxcd/pkg/runtime/predicates"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/fluxcd/source-controller/pkg/git"
+	gitlibgit2 "github.com/fluxcd/source-controller/pkg/git/libgit2"
 	gitstrat "github.com/fluxcd/source-controller/pkg/git/strategy"
 
 	imagev1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
@@ -444,35 +445,28 @@ func (r *ImageUpdateAutomationReconciler) automationsForImagePolicy(obj client.O
 // matter what is used.
 
 type repoAccess struct {
-	auth *git.Auth
+	auth *git.AuthOptions
 	url  string
 }
 
 func (r *ImageUpdateAutomationReconciler) getRepoAccess(ctx context.Context, repository *sourcev1.GitRepository) (repoAccess, error) {
 	var access repoAccess
-	access.auth = &git.Auth{}
 	access.url = repository.Spec.URL
 
-	authStrat, err := gitstrat.AuthSecretStrategyForURL(access.url, git.CheckoutOptions{GitImplementation: sourcev1.LibGit2Implementation})
-	if err != nil {
-		return access, err
-	}
-
-	if repository.Spec.SecretRef != nil && authStrat != nil {
-
+	if repository.Spec.SecretRef != nil {
 		name := types.NamespacedName{
 			Namespace: repository.GetNamespace(),
 			Name:      repository.Spec.SecretRef.Name,
 		}
 
-		var secret corev1.Secret
-		err = r.Client.Get(ctx, name, &secret)
+		secret := &corev1.Secret{}
+		err := r.Client.Get(ctx, name, secret)
 		if err != nil {
 			err = fmt.Errorf("auth secret error: %w", err)
 			return access, err
 		}
 
-		access.auth, err = authStrat.Method(secret)
+		access.auth, err = git.AuthOptionsFromSecret(access.url, secret)
 		if err != nil {
 			err = fmt.Errorf("auth error: %w", err)
 			return access, err
@@ -482,19 +476,23 @@ func (r *ImageUpdateAutomationReconciler) getRepoAccess(ctx context.Context, rep
 }
 
 func (r repoAccess) remoteCallbacks() libgit2.RemoteCallbacks {
-	return libgit2.RemoteCallbacks{
-		CertificateCheckCallback: r.auth.CertCallback,
-		CredentialsCallback:      r.auth.CredCallback,
-	}
+	return gitlibgit2.RemoteCallbacks(r.auth)
 }
 
 // cloneInto clones the upstream repository at the `ref` given (which
 // can be `nil`). It returns a `*gogit.Repository` since that is used
 // for committing changes.
 func cloneInto(ctx context.Context, access repoAccess, ref *sourcev1.GitRepositoryRef, path string) (*gogit.Repository, error) {
-	checkoutStrat, err := gitstrat.CheckoutStrategyForRef(ref, git.CheckoutOptions{GitImplementation: sourcev1.LibGit2Implementation})
+	opts := git.CheckoutOptions{}
+	if ref != nil {
+		opts.Tag = ref.Tag
+		opts.SemVer = ref.SemVer
+		opts.Tag = ref.Tag
+		opts.Branch = ref.Branch
+	}
+	checkoutStrat, err := gitstrat.CheckoutStrategyForImplementation(ctx, sourcev1.LibGit2Implementation, opts)
 	if err == nil {
-		_, _, err = checkoutStrat.Checkout(ctx, path, access.url, access.auth)
+		_, err = checkoutStrat.Checkout(ctx, path, access.url, access.auth)
 	}
 	if err != nil {
 		return nil, err

diff --git a/go.mod b/go.mod
@@ -12,12 +12,12 @@ require (
 	// If you bump this, change REFLECTOR_VER in the Makefile to match
 	github.com/fluxcd/image-reflector-controller/api v0.12.0
 	github.com/fluxcd/pkg/apis/meta v0.10.1
-	github.com/fluxcd/pkg/gittestserver v0.3.1
+	github.com/fluxcd/pkg/gittestserver v0.4.0
 	github.com/fluxcd/pkg/runtime v0.12.1
 	github.com/fluxcd/pkg/ssh v0.1.0
 	// If you bump this, change SOURCE_VER in the Makefile to match
-	github.com/fluxcd/source-controller v0.16.0
-	github.com/fluxcd/source-controller/api v0.16.0
+	github.com/fluxcd/source-controller v0.16.2-0.20211025195202-329073660693
+	github.com/fluxcd/source-controller/api v0.16.1
 	github.com/go-git/go-billy/v5 v5.3.1
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-logr/logr v0.4.0