lfsapi: move SSHTransfer instantiation to lfsapi client

bk2204 · bk2204 · commit 31d3fb7ceeef · 2021-07-20T19:15:59.000Z
The lfsapi client is used to perform operations for SSH authentication
already, so we know we'll have one wherever SSH operations might be
done.  Let's move the instantiation to the client so that we can reuse
it both in the transfer queue code and in the locking code as well.
diff --git a/lfsapi/lfsapi.go b/lfsapi/lfsapi.go
@@ -6,6 +6,8 @@ import (
 	"github.com/git-lfs/git-lfs/creds"
 	"github.com/git-lfs/git-lfs/errors"
 	"github.com/git-lfs/git-lfs/lfshttp"
+	"github.com/git-lfs/git-lfs/ssh"
+	"github.com/rubyist/tracerx"
 )
 
 type Client struct {
@@ -44,3 +46,21 @@ func NewClient(ctx lfshttp.Context) (*Client, error) {
 func (c *Client) Context() lfshttp.Context {
 	return c.context
 }
+
+// SSHTransfer returns either an suitable transfer object or nil if the
+// server is not using an SSH remote or the git-lfs-transfer style of SSH
+// remote.
+func (c *Client) SSHTransfer(operation, remote string) *ssh.SSHTransfer {
+	endpoint := c.Endpoints.Endpoint(operation, remote)
+	if len(endpoint.SSHMetadata.UserAndHost) > 0 {
+		ctx := c.Context()
+		tracerx.Printf("attempting pure SSH protocol connection")
+		sshTransfer, err := ssh.NewSSHTransfer(ctx.OSEnv(), ctx.GitEnv(), &endpoint.SSHMetadata, operation)
+		if err != nil {
+			tracerx.Printf("pure SSH protocol connection failed: %s", err)
+			return nil
+		}
+		return sshTransfer
+	}
+	return nil
+}
diff --git a/tq/manifest.go b/tq/manifest.go
@@ -73,17 +73,7 @@ func NewManifest(f *fs.Filesystem, apiClient *lfsapi.Client, operation, remote s
 		apiClient = cli
 	}
 
-	var sshTransfer *ssh.SSHTransfer
-	var err error
-	endpoint := apiClient.Endpoints.RemoteEndpoint(operation, remote)
-	if len(endpoint.SSHMetadata.UserAndHost) > 0 {
-		ctx := apiClient.Context()
-		tracerx.Printf("attempting pure SSH protocol connection")
-		sshTransfer, err = ssh.NewSSHTransfer(ctx.OSEnv(), ctx.GitEnv(), &endpoint.SSHMetadata, operation)
-		if err != nil {
-			tracerx.Printf("pure SSH protocol connection failed: %s", err)
-		}
-	}
+	sshTransfer := apiClient.SSHTransfer(operation, remote)
 
 	m := &Manifest{
 		fs:                   f,
