Fix: change default HTTP timeout to 60s (#1301)

## What changes are proposed in this pull request?
This PR fixes the default configuration for HTTP timeout. A couple of
months ago we increased the timeout to 60s, but that was a no-op because
of this line that sets it to 30 seconds.

I caught it after noticing a couple of `request timed out after 30s of
inactivity` during testing.

## How is this tested?
Existing unit test.

NO_CHANGELOG=true

Author: shreyas-goenka

httpclient/api_client.go

@@ -106,7 +106,6 @@ func (cfg ClientConfig) httpTransport() http.RoundTripper {
 
 func NewApiClient(cfg ClientConfig) *ApiClient {
 	// Set defaults for config values that are not set.
-	cfg.HTTPTimeout = time.Duration(orDefault(int(cfg.HTTPTimeout), int(30*time.Second)))
 	cfg.DebugTruncateBytes = orDefault(cfg.DebugTruncateBytes, 96)
 	cfg.RetryTimeout = time.Duration(orDefault(int(cfg.RetryTimeout), int(5*time.Minute)))
 	cfg.HTTPTimeout = time.Duration(orDefault(int(cfg.HTTPTimeout), int(60*time.Second)))

httpclient/api_client_test.go

@@ -530,8 +530,8 @@ func TestLogCancelledRequest(t *testing.T) {
 	err := c.Do(context.Background(), "GET", "/a")
 	assert.Error(t, err)
 	assert.Equal(t, `[DEBUG] GET /a
-< Error: Get "/a": request timed out after 30s of inactivity
-[DEBUG] non-retriable error: Get "/a": request timed out after 30s of inactivity
+< Error: Get "/a": request timed out after 1m0s of inactivity
+[DEBUG] non-retriable error: Get "/a": request timed out after 1m0s of inactivity
 `, bufLogger.String())
 }