Bump libgit2 to 1.3.0 and git2go to V33.

Paulo Gomes · Paulo Gomes · commit f44302eed08a · 2022-02-16T10:17:31.000Z
Downstream breaking changes introduced since git2go@V31:
- git2go.ErrorCode was deprecated in favour of the native error type.
- FetchOptions no longer expects a pointer, but rather the actual value of git2go.FetchOptions.

Signed-off-by: Paulo Gomes &lt;paulo.gomes@weave.works&gt;
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	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 v1.2.2
-	github.com/libgit2/git2go/v31 v31.7.6
+	github.com/libgit2/git2go/v33 v33.0.6
 	github.com/minio/minio-go/v7 v7.0.15
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.17.0
diff --git a/go.sum b/go.sum
@@ -622,8 +622,8 @@ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6Fm
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
 github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libgit2/git2go/v31 v31.7.6 h1:jg/pNomrQULnafmfF6XTkozPX5ypyELoWErWkJuYPcI=
-github.com/libgit2/git2go/v31 v31.7.6/go.mod h1:c/rkJcBcUFx6wHaT++UwNpKvIsmPNqCeQ/vzO4DrEec=
+github.com/libgit2/git2go/v33 v33.0.6 h1:F//bA3/pgSTVq2hLNahhnof9NxyCzFF/c3MB6lb93Qo=
+github.com/libgit2/git2go/v33 v33.0.6/go.mod h1:KdpqkU+6+++4oHna/MIOgx4GCQ92IPCdpVRMRI80J+4=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
diff --git a/pkg/git/libgit2/checkout.go b/pkg/git/libgit2/checkout.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/go-logr/logr"
-	git2go "github.com/libgit2/git2go/v31"
+	git2go "github.com/libgit2/git2go/v33"
 
 	"github.com/fluxcd/pkg/gitutil"
 	"github.com/fluxcd/pkg/version"
@@ -61,7 +61,7 @@ type CheckoutBranch struct {
 
 func (c *CheckoutBranch) Checkout(ctx context.Context, path, url string, opts *git.AuthOptions) (*git.Commit, error) {
 	repo, err := git2go.Clone(url, path, &git2go.CloneOptions{
-		FetchOptions: &git2go.FetchOptions{
+		FetchOptions: git2go.FetchOptions{
 			DownloadTags:    git2go.DownloadTagsNone,
 			RemoteCallbacks: RemoteCallbacks(ctx, opts),
 			ProxyOptions:    git2go.ProxyOptions{Type: git2go.ProxyTypeAuto},
@@ -91,7 +91,7 @@ type CheckoutTag struct {
 
 func (c *CheckoutTag) Checkout(ctx context.Context, path, url string, opts *git.AuthOptions) (*git.Commit, error) {
 	repo, err := git2go.Clone(url, path, &git2go.CloneOptions{
-		FetchOptions: &git2go.FetchOptions{
+		FetchOptions: git2go.FetchOptions{
 			DownloadTags:    git2go.DownloadTagsAll,
 			RemoteCallbacks: RemoteCallbacks(ctx, opts),
 			ProxyOptions:    git2go.ProxyOptions{Type: git2go.ProxyTypeAuto},
@@ -115,7 +115,7 @@ type CheckoutCommit struct {
 
 func (c *CheckoutCommit) Checkout(ctx context.Context, path, url string, opts *git.AuthOptions) (*git.Commit, error) {
 	repo, err := git2go.Clone(url, path, &git2go.CloneOptions{
-		FetchOptions: &git2go.FetchOptions{
+		FetchOptions: git2go.FetchOptions{
 			DownloadTags:    git2go.DownloadTagsNone,
 			RemoteCallbacks: RemoteCallbacks(ctx, opts),
 			ProxyOptions:    git2go.ProxyOptions{Type: git2go.ProxyTypeAuto},
@@ -147,7 +147,7 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, opts *g
 	}
 
 	repo, err := git2go.Clone(url, path, &git2go.CloneOptions{
-		FetchOptions: &git2go.FetchOptions{
+		FetchOptions: git2go.FetchOptions{
 			DownloadTags:    git2go.DownloadTagsAll,
 			RemoteCallbacks: RemoteCallbacks(ctx, opts),
 			ProxyOptions:    git2go.ProxyOptions{Type: git2go.ProxyTypeAuto},
diff --git a/pkg/git/libgit2/checkout_test.go b/pkg/git/libgit2/checkout_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	git2go "github.com/libgit2/git2go/v31"
+	git2go "github.com/libgit2/git2go/v33"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/git/libgit2/transport.go b/pkg/git/libgit2/transport.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	git2go "github.com/libgit2/git2go/v31"
+	git2go "github.com/libgit2/git2go/v33"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/knownhosts"
 
@@ -61,16 +61,16 @@ func RemoteCallbacks(ctx context.Context, opts *git.AuthOptions) git2go.RemoteCa
 // libgit2 it should stop the transfer when the given context is closed (due to
 // e.g. a timeout).
 func transferProgressCallback(ctx context.Context) git2go.TransferProgressCallback {
-	return func(p git2go.TransferProgress) git2go.ErrorCode {
+	return func(p git2go.TransferProgress) error {
 		// Early return if all the objects have been received.
 		if p.ReceivedObjects == p.TotalObjects {
-			return git2go.ErrorCodeOK
+			return nil
 		}
 		select {
 		case <-ctx.Done():
-			return git2go.ErrorCodeUser
+			return fmt.Errorf("transport close - potentially due to a timeout")
 		default:
-			return git2go.ErrorCodeOK
+			return nil
 		}
 	}
 }
@@ -79,12 +79,12 @@ func transferProgressCallback(ctx context.Context) git2go.TransferProgressCallba
 // libgit2 it should cancel the network operation when the given context is
 // closed.
 func transportMessageCallback(ctx context.Context) git2go.TransportMessageCallback {
-	return func(_ string) git2go.ErrorCode {
+	return func(_ string) error {
 		select {
 		case <-ctx.Done():
-			return git2go.ErrorCodeUser
+			return fmt.Errorf("transport closed")
 		default:
-			return git2go.ErrorCodeOK
+			return nil
 		}
 	}
 }
@@ -93,16 +93,16 @@ func transportMessageCallback(ctx context.Context) git2go.TransportMessageCallba
 // signals libgit2 it should stop the push transfer when the given context is
 // closed (due to e.g. a timeout).
 func pushTransferProgressCallback(ctx context.Context) git2go.PushTransferProgressCallback {
-	return func(current, total uint32, _ uint) git2go.ErrorCode {
+	return func(current, total uint32, _ uint) error {
 		// Early return if current equals total.
 		if current == total {
-			return git2go.ErrorCodeOK
+			return nil
 		}
 		select {
 		case <-ctx.Done():
-			return git2go.ErrorCodeUser
+			return fmt.Errorf("transport close - potentially due to a timeout")
 		default:
-			return git2go.ErrorCodeOK
+			return nil
 		}
 	}
 }
@@ -155,10 +155,10 @@ func certificateCallback(opts *git.AuthOptions) git2go.CertificateCheckCallback
 // x509Callback returns a CertificateCheckCallback that verifies the
 // certificate against the given caBundle for git.HTTPS Transports.
 func x509Callback(caBundle []byte) git2go.CertificateCheckCallback {
-	return func(cert *git2go.Certificate, valid bool, hostname string) git2go.ErrorCode {
+	return func(cert *git2go.Certificate, valid bool, hostname string) error {
 		roots := x509.NewCertPool()
 		if ok := roots.AppendCertsFromPEM(caBundle); !ok {
-			return git2go.ErrorCodeCertificate
+			return fmt.Errorf("x509 cert could not be appended")
 		}
 
 		opts := x509.VerifyOptions{
@@ -167,20 +167,20 @@ func x509Callback(caBundle []byte) git2go.CertificateCheckCallback {
 			CurrentTime: now(),
 		}
 		if _, err := cert.X509.Verify(opts); err != nil {
-			return git2go.ErrorCodeCertificate
+			return fmt.Errorf("x509 cert could not be verified")
 		}
-		return git2go.ErrorCodeOK
+		return nil
 	}
 }
 
 // knownHostCallback returns a CertificateCheckCallback that verifies
 // the key of Git server against the given host and known_hosts for
 // git.SSH Transports.
 func knownHostsCallback(host string, knownHosts []byte) git2go.CertificateCheckCallback {
-	return func(cert *git2go.Certificate, valid bool, hostname string) git2go.ErrorCode {
+	return func(cert *git2go.Certificate, valid bool, hostname string) error {
 		kh, err := parseKnownHosts(string(knownHosts))
 		if err != nil {
-			return git2go.ErrorCodeCertificate
+			return fmt.Errorf("failed to parse known_hosts: %w", err)
 		}
 
 		// First, attempt to split the configured host and port to validate
@@ -200,7 +200,7 @@ func knownHostsCallback(host string, knownHosts []byte) git2go.CertificateCheckC
 		}
 
 		if hostnameWithoutPort != hostWithoutPort {
-			return git2go.ErrorCodeUser
+			return fmt.Errorf("host mismatch: %q %q\n", hostWithoutPort, hostnameWithoutPort)
 		}
 
 		// We are now certain that the configured host and the hostname
@@ -210,10 +210,10 @@ func knownHostsCallback(host string, knownHosts []byte) git2go.CertificateCheckC
 		h := knownhosts.Normalize(host)
 		for _, k := range kh {
 			if k.matches(h, cert.Hostkey) {
-				return git2go.ErrorCodeOK
+				return nil
 			}
 		}
-		return git2go.ErrorCodeCertificate
+		return fmt.Errorf("hostkey could not be verified")
 	}
 }
 
diff --git a/pkg/git/libgit2/transport_test.go b/pkg/git/libgit2/transport_test.go

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"testing"`
`26`	`26`	`"time"`
`27`	`27`
`28`		`- git2go "github.com/libgit2/git2go/v31"`
	`28`	`+ git2go "github.com/libgit2/git2go/v33"`
`29`	`29`	`. "github.com/onsi/gomega"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`"strings"`
`32`	`32`	`"time"`
`33`	`33`
`34`		`- git2go "github.com/libgit2/git2go/v31"`
	`34`	`+ git2go "github.com/libgit2/git2go/v33"`
`35`	`35`	`"golang.org/x/crypto/ssh"`
`36`	`36`	`"golang.org/x/crypto/ssh/knownhosts"`
`37`	`37`
`@@ -61,16 +61,16 @@ func RemoteCallbacks(ctx context.Context, opts *git.AuthOptions) git2go.RemoteCa`
`61`	`61`	`// libgit2 it should stop the transfer when the given context is closed (due to`
`62`	`62`	`// e.g. a timeout).`
`63`	`63`	`func transferProgressCallback(ctx context.Context) git2go.TransferProgressCallback {`
`64`		`- return func(p git2go.TransferProgress) git2go.ErrorCode {`
	`64`	`+ return func(p git2go.TransferProgress) error {`
`65`	`65`	`// Early return if all the objects have been received.`
`66`	`66`	`if p.ReceivedObjects == p.TotalObjects {`
`67`		`- return git2go.ErrorCodeOK`
	`67`	`+ return nil`
`68`	`68`	`}`
`69`	`69`	`select {`
`70`	`70`	`case <-ctx.Done():`
`71`		`- return git2go.ErrorCodeUser`
	`71`	`+ return fmt.Errorf("transport close - potentially due to a timeout")`
`72`	`72`	`default:`
`73`		`- return git2go.ErrorCodeOK`
	`73`	`+ return nil`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`
`@@ -79,12 +79,12 @@ func transferProgressCallback(ctx context.Context) git2go.TransferProgressCallba`
`79`	`79`	`// libgit2 it should cancel the network operation when the given context is`
`80`	`80`	`// closed.`
`81`	`81`	`func transportMessageCallback(ctx context.Context) git2go.TransportMessageCallback {`
`82`		`- return func(_ string) git2go.ErrorCode {`
	`82`	`+ return func(_ string) error {`
`83`	`83`	`select {`
`84`	`84`	`case <-ctx.Done():`
`85`		`- return git2go.ErrorCodeUser`
	`85`	`+ return fmt.Errorf("transport closed")`
`86`	`86`	`default:`
`87`		`- return git2go.ErrorCodeOK`
	`87`	`+ return nil`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -93,16 +93,16 @@ func transportMessageCallback(ctx context.Context) git2go.TransportMessageCallba`
`93`	`93`	`// signals libgit2 it should stop the push transfer when the given context is`
`94`	`94`	`// closed (due to e.g. a timeout).`
`95`	`95`	`func pushTransferProgressCallback(ctx context.Context) git2go.PushTransferProgressCallback {`
`96`		`- return func(current, total uint32, _ uint) git2go.ErrorCode {`
	`96`	`+ return func(current, total uint32, _ uint) error {`
`97`	`97`	`// Early return if current equals total.`
`98`	`98`	`if current == total {`
`99`		`- return git2go.ErrorCodeOK`
	`99`	`+ return nil`
`100`	`100`	`}`
`101`	`101`	`select {`
`102`	`102`	`case <-ctx.Done():`
`103`		`- return git2go.ErrorCodeUser`
	`103`	`+ return fmt.Errorf("transport close - potentially due to a timeout")`
`104`	`104`	`default:`
`105`		`- return git2go.ErrorCodeOK`
	`105`	`+ return nil`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`
`@@ -155,10 +155,10 @@ func certificateCallback(opts *git.AuthOptions) git2go.CertificateCheckCallback`
`155`	`155`	`// x509Callback returns a CertificateCheckCallback that verifies the`
`156`	`156`	`// certificate against the given caBundle for git.HTTPS Transports.`
`157`	`157`	`func x509Callback(caBundle []byte) git2go.CertificateCheckCallback {`
`158`		`- return func(cert *git2go.Certificate, valid bool, hostname string) git2go.ErrorCode {`
	`158`	`+ return func(cert *git2go.Certificate, valid bool, hostname string) error {`
`159`	`159`	`roots := x509.NewCertPool()`
`160`	`160`	`if ok := roots.AppendCertsFromPEM(caBundle); !ok {`
`161`		`- return git2go.ErrorCodeCertificate`
	`161`	`+ return fmt.Errorf("x509 cert could not be appended")`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`opts := x509.VerifyOptions{`
`@@ -167,20 +167,20 @@ func x509Callback(caBundle []byte) git2go.CertificateCheckCallback {`
`167`	`167`	`CurrentTime: now(),`
`168`	`168`	`}`
`169`	`169`	`if _, err := cert.X509.Verify(opts); err != nil {`
`170`		`- return git2go.ErrorCodeCertificate`
	`170`	`+ return fmt.Errorf("x509 cert could not be verified")`
`171`	`171`	`}`
`172`		`- return git2go.ErrorCodeOK`
	`172`	`+ return nil`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// knownHostCallback returns a CertificateCheckCallback that verifies`
`177`	`177`	`// the key of Git server against the given host and known_hosts for`
`178`	`178`	`// git.SSH Transports.`
`179`	`179`	`func knownHostsCallback(host string, knownHosts []byte) git2go.CertificateCheckCallback {`
`180`		`- return func(cert *git2go.Certificate, valid bool, hostname string) git2go.ErrorCode {`
	`180`	`+ return func(cert *git2go.Certificate, valid bool, hostname string) error {`
`181`	`181`	`kh, err := parseKnownHosts(string(knownHosts))`
`182`	`182`	`if err != nil {`
`183`		`- return git2go.ErrorCodeCertificate`
	`183`	`+ return fmt.Errorf("failed to parse known_hosts: %w", err)`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`// First, attempt to split the configured host and port to validate`
`@@ -200,7 +200,7 @@ func knownHostsCallback(host string, knownHosts []byte) git2go.CertificateCheckC`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`if hostnameWithoutPort != hostWithoutPort {`
`203`		`- return git2go.ErrorCodeUser`
	`203`	`+ return fmt.Errorf("host mismatch: %q %q\n", hostWithoutPort, hostnameWithoutPort)`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`// We are now certain that the configured host and the hostname`
`@@ -210,10 +210,10 @@ func knownHostsCallback(host string, knownHosts []byte) git2go.CertificateCheckC`
`210`	`210`	`h := knownhosts.Normalize(host)`
`211`	`211`	`for _, k := range kh {`
`212`	`212`	`if k.matches(h, cert.Hostkey) {`
`213`		`- return git2go.ErrorCodeOK`
	`213`	`+ return nil`
`214`	`214`	`}`
`215`	`215`	`}`
`216`		`- return git2go.ErrorCodeCertificate`
	`216`	`+ return fmt.Errorf("hostkey could not be verified")`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`