Fix nil pointer dereference when initializing fetcher with timeout

fetcher/configuration.go

@@ -73,7 +73,7 @@ func WithInsecureTLS() Option {
 // WithTimeout overrides the default HTTP timeout.
 func WithTimeout(timeout time.Duration) Option {
 	return func(f *Fetcher) {
-		f.rosettaClient.GetConfig().HTTPClient.Timeout = timeout
+		f.httpTimeout = timeout
 	}
 }
 

fetcher/fetcher.go

@@ -74,6 +74,7 @@ type Fetcher struct {
 	retryElapsedTime time.Duration
 	insecureTLS      bool
 	forceRetry       bool
+	httpTimeout      time.Duration
 
 	// connectionSemaphore is used to limit the
 	// number of concurrent requests we make.
@@ -89,6 +90,7 @@ func New(
 		maxConnections:   DefaultMaxConnections,
 		maxRetries:       DefaultRetries,
 		retryElapsedTime: DefaultElapsedTime,
+		httpTimeout:      DefaultHTTPTimeout,
 	}
 
 	// Override defaults with any provided options
@@ -106,7 +108,7 @@ func New(
 		defaultTransport.MaxIdleConns = f.maxConnections
 		defaultTransport.MaxIdleConnsPerHost = DefaultMaxConnections
 		defaultHTTPClient := &http.Client{
-			Timeout:   DefaultHTTPTimeout,
+			Timeout:   f.httpTimeout,
 			Transport: defaultTransport,
 		}
 

fetcher/fetcher_test.go

@@ -214,3 +214,30 @@ func TestNewWithHTTPCLient(t *testing.T) {
 	var assert = assert.New(t)
 	assert.Same(httpClient, fetcher.rosettaClient.GetConfig().HTTPClient)
 }
+
+func TestNewWithTimeout(t *testing.T) {
+	var assert = assert.New(t)
+
+	fetcher := New("https://serveraddress")
+	assert.Equal(DefaultHTTPTimeout, fetcher.rosettaClient.GetConfig().HTTPClient.Timeout)
+
+	var customTimeout = 6*time.Minute
+	fetcher2 := New("https://serveraddress", WithTimeout(customTimeout))
+	assert.Equal(customTimeout, fetcher2.rosettaClient.GetConfig().HTTPClient.Timeout)
+
+	// If we pass in a http timeout value when initializing the fetcher, and also pass in an existing client,
+	// we will simply respect the timeout on the existing client and not override it.
+	var existingClientTimeout = 3*time.Minute
+	httpClient := &http.Client{
+		Timeout : existingClientTimeout,
+	}
+	apiClient := client.NewAPIClient(
+		client.NewConfiguration(
+			"https://serveraddress",
+			DefaultUserAgent,
+			httpClient,
+		),
+	)
+	fetcher3 := New("https://serveraddress", WithClient(apiClient), WithTimeout(6*time.Minute))
+	assert.Equal(existingClientTimeout, fetcher3.rosettaClient.GetConfig().HTTPClient.Timeout)
+}