vendor: update git url handling with changes to buildkit

The git ssh url parsing API changed a bit and broke how buildx utilized
the API. This updates the affected method with the new method of
identifying an SSH url.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>

vendor/github.com/moby/buildkit/util/gitutil/git_protocol.go

@@ -1,46 +0,0 @@
-package gitutil
-
-import (
-	"strings"
-
-	"github.com/moby/buildkit/util/sshutil"
-)
-
-const (
-	HTTPProtocol = iota + 1
-	HTTPSProtocol
-	SSHProtocol
-	GitProtocol
-	UnknownProtocol
-)
-
-// ParseProtocol parses a git URL and returns the remote url and protocol type
-func ParseProtocol(remote string) (string, int) {
-	prefixes := map[string]int{
-		"http://":  HTTPProtocol,
-		"https://": HTTPSProtocol,
-		"git://":   GitProtocol,
-		"ssh://":   SSHProtocol,
-	}
-	protocolType := UnknownProtocol
-	for prefix, potentialType := range prefixes {
-		if strings.HasPrefix(remote, prefix) {
-			remote = strings.TrimPrefix(remote, prefix)
-			protocolType = potentialType
-		}
-	}
-
-	if protocolType == UnknownProtocol && sshutil.IsImplicitSSHTransport(remote) {
-		protocolType = SSHProtocol
-	}
-
-	// remove name from ssh
-	if protocolType == SSHProtocol {
-		parts := strings.SplitN(remote, "@", 2)
-		if len(parts) == 2 {
-			remote = parts[1]
-		}
-	}
-
-	return remote, protocolType
-}

vendor/github.com/moby/buildkit/util/gitutil/git_ref.go

@@ -1,10 +1,11 @@
 package gitutil
 
 import (
-	"regexp"
+	"net/url"
 	"strings"
 
 	"github.com/containerd/containerd/errdefs"
+	"github.com/pkg/errors"
 )
 
 // GitRef represents a git ref.
@@ -51,35 +52,51 @@ type GitRef struct {
 func ParseGitRef(ref string) (*GitRef, error) {
 	res := &GitRef{}
 
+	var (
+		remote *url.URL
+		err    error
+	)
+
 	if strings.HasPrefix(ref, "github.com/") {
 		res.IndistinguishableFromLocal = true // Deprecated
-	} else {
-		_, proto := ParseProtocol(ref)
-		switch proto {
-		case UnknownProtocol:
-			return nil, errdefs.ErrInvalidArgument
+		remote = &url.URL{
+			Scheme: "https",
+			Host:   "github.com",
+			Path:   strings.TrimPrefix(ref, "github.com/"),
 		}
-		switch proto {
+	} else {
+		remote, err = ParseURL(ref)
+		if errors.Is(err, ErrUnknownProtocol) {
+			remote, err = ParseURL("https://" + ref)
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		switch remote.Scheme {
 		case HTTPProtocol, GitProtocol:
 			res.UnencryptedTCP = true // Discouraged, but not deprecated
 		}
-		switch proto {
+
+		switch remote.Scheme {
 		// An HTTP(S) URL is considered to be a valid git ref only when it has the ".git[...]" suffix.
 		case HTTPProtocol, HTTPSProtocol:
-			var gitURLPathWithFragmentSuffix = regexp.MustCompile(`\.git(?:#.+)?$`)
-			if !gitURLPathWithFragmentSuffix.MatchString(ref) {
+			if !strings.HasSuffix(remote.Path, ".git") {
 				return nil, errdefs.ErrInvalidArgument
 			}
 		}
 	}
 
-	var fragment string
-	res.Remote, fragment, _ = strings.Cut(ref, "#")
-	if len(res.Remote) == 0 {
-		return res, errdefs.ErrInvalidArgument
+	res.Commit, res.SubDir = SplitGitFragment(remote.Fragment)
+	remote.Fragment = ""
+
+	res.Remote = remote.String()
+	if res.IndistinguishableFromLocal {
+		_, res.Remote, _ = strings.Cut(res.Remote, "://")
 	}
-	res.Commit, res.SubDir, _ = strings.Cut(fragment, ":")
+
 	repoSplitBySlash := strings.Split(res.Remote, "/")
 	res.ShortName = strings.TrimSuffix(repoSplitBySlash[len(repoSplitBySlash)-1], ".git")
+
 	return res, nil
 }

vendor/github.com/moby/buildkit/util/gitutil/git_url.go

@@ -0,0 +1,71 @@
+package gitutil
+
+import (
+	"net/url"
+	"regexp"
+	"strings"
+
+	"github.com/moby/buildkit/util/sshutil"
+	"github.com/pkg/errors"
+)
+
+const (
+	HTTPProtocol  string = "http"
+	HTTPSProtocol string = "https"
+	SSHProtocol   string = "ssh"
+	GitProtocol   string = "git"
+)
+
+var (
+	ErrUnknownProtocol = errors.New("unknown protocol")
+	ErrInvalidProtocol = errors.New("invalid protocol")
+)
+
+var supportedProtos = map[string]struct{}{
+	HTTPProtocol:  {},
+	HTTPSProtocol: {},
+	SSHProtocol:   {},
+	GitProtocol:   {},
+}
+
+var protoRegexp = regexp.MustCompile(`^[a-zA-Z0-9]+://`)
+
+// ParseURL parses a git URL and returns a parsed URL object.
+//
+// ParseURL understands implicit ssh URLs such as "git@host:repo", and
+// returns the same response as if the URL were "ssh://git@host/repo".
+func ParseURL(remote string) (*url.URL, error) {
+	if proto := protoRegexp.FindString(remote); proto != "" {
+		proto = strings.ToLower(strings.TrimSuffix(proto, "://"))
+		if _, ok := supportedProtos[proto]; !ok {
+			return nil, errors.Wrap(ErrInvalidProtocol, proto)
+		}
+
+		return url.Parse(remote)
+	}
+
+	if sshutil.IsImplicitSSHTransport(remote) {
+		remote, fragment, _ := strings.Cut(remote, "#")
+		remote, path, _ := strings.Cut(remote, ":")
+		user, host, _ := strings.Cut(remote, "@")
+		if !strings.HasPrefix(path, "/") {
+			path = "/" + path
+		}
+		return &url.URL{
+			Scheme:   SSHProtocol,
+			User:     url.User(user),
+			Host:     host,
+			Path:     path,
+			Fragment: fragment,
+		}, nil
+	}
+
+	return nil, ErrUnknownProtocol
+}
+
+// SplitGitFragments splits a git URL fragment into its respective git
+// reference and subdirectory components.
+func SplitGitFragment(fragment string) (ref string, subdir string) {
+	ref, subdir, _ = strings.Cut(fragment, ":")
+	return ref, subdir
+}