Set the timeout values from the given gitEnv

Author: technoweenie

lfsapi/client_test.go

@@ -0,0 +1,23 @@
+package lfsapi
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewClient(t *testing.T) {
+	c, err := NewClient(testEnv(map[string]string{}), testEnv(map[string]string{
+		"lfs.dialtimeout":         "151",
+		"lfs.keepalive":           "152",
+		"lfs.tlstimeout":          "153",
+		"lfs.concurrenttransfers": "154",
+	}))
+
+	require.Nil(t, err)
+	assert.Equal(t, 151, c.DialTimeout)
+	assert.Equal(t, 152, c.KeepaliveTimeout)
+	assert.Equal(t, 153, c.TLSTimeout)
+	assert.Equal(t, 154, c.ConcurrentTransfers)
+}

lfsapi/endpoint_finder.go

@@ -264,9 +264,3 @@ func initAliases(e *endpointGitFinder, git env) {
 		e.aliases[gitval] = gitkey[len(prefix) : len(gitkey)-len(suffix)]
 	}
 }
-
-type env interface {
-	Get(string) (string, bool)
-	Bool(key string, def bool) (val bool)
-	All() map[string]string
-}

lfsapi/lfsapi.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"net/http"
 	"regexp"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -22,14 +23,13 @@ type Client struct {
 	Credentials CredentialHelper
 	Netrc       NetrcFinder
 
-	DialTimeout         int `git:"lfs.dialtimeout"`
-	KeepaliveTimeout    int `git:"lfs.keepalive"`
-	TLSTimeout          int `git:"lfs.tlstimeout"`
-	ConcurrentTransfers int `git:"lfs.concurrenttransfers"`
-
-	HTTPSProxy string
-	HTTPProxy  string
-	NoProxy    string
+	DialTimeout         int
+	KeepaliveTimeout    int
+	TLSTimeout          int
+	ConcurrentTransfers int
+	HTTPSProxy          string
+	HTTPProxy           string
+	NoProxy             string
 
 	hostClients map[string]*http.Client
 	clientMu    sync.Mutex
@@ -51,16 +51,22 @@ func NewClient(osEnv env, gitEnv env) (*Client, error) {
 
 	httpsProxy, httpProxy, noProxy := getProxyServers(osEnv, gitEnv)
 
-	return &Client{
+	c := &Client{
 		Endpoints: NewEndpointFinder(gitEnv),
 		Credentials: &CommandCredentialHelper{
 			SkipPrompt: !osEnv.Bool("GIT_TERMINAL_PROMPT", true),
 		},
-		Netrc:      netrc,
-		HTTPSProxy: httpsProxy,
-		HTTPProxy:  httpProxy,
-		NoProxy:    noProxy,
-	}, nil
+		Netrc:               netrc,
+		DialTimeout:         gitEnv.Int("lfs.dialtimeout", 0),
+		KeepaliveTimeout:    gitEnv.Int("lfs.keepalive", 0),
+		TLSTimeout:          gitEnv.Int("lfs.tlstimeout", 0),
+		ConcurrentTransfers: gitEnv.Int("lfs.concurrenttransfers", 0),
+		HTTPSProxy:          httpsProxy,
+		HTTPProxy:           httpProxy,
+		NoProxy:             noProxy,
+	}
+
+	return c, nil
 }
 
 func (c *Client) Do(req *http.Request) (*http.Response, error) {
@@ -170,6 +176,13 @@ func decodeResponse(res *http.Response, obj interface{}) error {
 	return nil
 }
 
+type env interface {
+	Get(string) (string, bool)
+	Int(string, int) int
+	Bool(string, bool) bool
+	All() map[string]string
+}
+
 // basic config.Environment implementation. Only used in tests, or as a zero
 // value to NewClient().
 type testEnv map[string]string
@@ -179,6 +192,20 @@ func (e testEnv) Get(key string) (string, bool) {
 	return v, ok
 }
 
+func (e testEnv) Int(key string, def int) (val int) {
+	s, _ := e.Get(key)
+	if len(s) == 0 {
+		return def
+	}
+
+	i, err := strconv.Atoi(s)
+	if err != nil {
+		return def
+	}
+
+	return i
+}
+
 func (e testEnv) Bool(key string, def bool) (val bool) {
 	s, _ := e.Get(key)
 	if len(s) == 0 {