grpc: Replace `grpc.WithTimeout()` with contexts

The `grpc.WithTimeout()` function has been deprecated upstream in favor
of using the `context` package. This commit converts all uses of the
derpecated function with using a context created via
`context.WithTimeout()`. As we have abstracted away dialing Gitaly via
`client.Dial()`, this commit also introduces a new function
`client.DialContext()` and makes `client.Dial()` a thin wrapper around
the latter.

1 files changed, 6 insertions, 3 deletions

diff --git a/client/dial.go b/client/dial.go
index 12ada0acb..4a1072c52 100644
--- a/client/dial.go
+++ b/client/dial.go
@@ -25,8 +25,7 @@ const (
 	unixConnection
 )
 
-// Dial gitaly
-func Dial(rawAddress string, connOpts []grpc.DialOption) (*grpc.ClientConn, error) {
+func DialContext(ctx context.Context, rawAddress string, connOpts []grpc.DialOption) (*grpc.ClientConn, error) {
 	var canonicalAddress string
 	var err error
 
@@ -80,7 +79,7 @@ func Dial(rawAddress string, connOpts []grpc.DialOption) (*grpc.ClientConn, erro
 		PermitWithoutStream: true,
 	}))
 
-	conn, err := grpc.Dial(canonicalAddress, connOpts...)
+	conn, err := grpc.DialContext(ctx, canonicalAddress, connOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -88,6 +87,10 @@ func Dial(rawAddress string, connOpts []grpc.DialOption) (*grpc.ClientConn, erro
 	return conn, nil
 }
 
+func Dial(rawAddress string, connOpts []grpc.DialOption) (*grpc.ClientConn, error) {
+	return DialContext(context.Background(), rawAddress, connOpts)
+}
+
 func getConnectionType(rawAddress string) connectionType {
 	u, err := url.Parse(rawAddress)
 	if err != nil {