rename http

aliyun · Dec 20, 2023 · 6ca4e3e · 6ca4e3e
1 parent 55065bc
commit 6ca4e3e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/client.go b/client.go
@@ -153,7 +153,7 @@ func convertLocked(c *Client, projName string) *LogProject {
 
 func (c *Client) SetHTTPConnConfig(config *HTTPConnConfig) {
 	c.httpConnConfig = config
-	c.HTTPClient = getHttpClientWithConfig(config)
+	c.HTTPClient = getHTTPClientWithConfig(config)
 }
 
 // Set credentialsProvider for client and returns the same client.

diff --git a/default_http_client_test.go b/default_http_client_test.go
@@ -17,7 +17,7 @@ func TestClientHttpClient(t *testing.T) {
 		if client.HTTPClient != nil {
 			transport := client.HTTPClient.Transport.(*http.Transport)
 			assert.Equal(t, transport.DisableKeepAlives, defaultDisableKeepAlives)
-			assert.Equal(t, transport.IdleConnTimeout, defaultHttpIdleTimeout)
+			assert.Equal(t, transport.IdleConnTimeout, defaultHTTPIdleTimeout)
 			assert.Equal(t, defaultHttpClient.Timeout, defaultRequestTimeout)
 		}
 	}
@@ -63,7 +63,7 @@ func TestClientHttpClient(t *testing.T) {
 		{
 			transport := defaultHttpClient.Transport.(*http.Transport)
 			assert.Equal(t, transport.DisableKeepAlives, defaultDisableKeepAlives)
-			assert.Equal(t, transport.IdleConnTimeout, defaultHttpIdleTimeout)
+			assert.Equal(t, transport.IdleConnTimeout, defaultHTTPIdleTimeout)
 			assert.Equal(t, defaultHttpClient.Timeout, defaultRequestTimeout)
 		}
 
@@ -74,7 +74,7 @@ func TestClientHttpClient(t *testing.T) {
 			transport := p.httpClient.Transport.(*http.Transport)
 			assert.Equal(t, p.httpClient.Timeout, defaultRequestTimeout)
 			assert.Equal(t, transport.DisableKeepAlives, defaultDisableKeepAlives)
-			assert.Equal(t, transport.IdleConnTimeout, defaultHttpIdleTimeout)
+			assert.Equal(t, transport.IdleConnTimeout, defaultHTTPIdleTimeout)
 			assert.NotNil(t, transport.Proxy)
 		}
 
@@ -124,7 +124,7 @@ func TestProjectHttpClient(t *testing.T) {
 		assert.Equal(t, p.httpClient, defaultHttpClient)
 		transport := p.httpClient.Transport.(*http.Transport)
 		assert.Equal(t, transport.DisableKeepAlives, defaultDisableKeepAlives)
-		assert.Equal(t, transport.IdleConnTimeout, defaultHttpIdleTimeout)
+		assert.Equal(t, transport.IdleConnTimeout, defaultHTTPIdleTimeout)
 		assert.Equal(t, defaultHttpClient.Timeout, defaultRequestTimeout)
 		p = p.WithRequestTimeout(time.Second * 19)
 		assert.Equal(t, p.httpClient.Timeout, time.Second*19)
@@ -160,7 +160,7 @@ func TestProjectHttpClient(t *testing.T) {
 		transport := p.httpClient.Transport.(*http.Transport)
 		assert.Equal(t, p.httpClient.Timeout, defaultRequestTimeout)
 		assert.Equal(t, transport.DisableKeepAlives, defaultDisableKeepAlives)
-		assert.Equal(t, transport.IdleConnTimeout, defaultHttpIdleTimeout)
+		assert.Equal(t, transport.IdleConnTimeout, defaultHTTPIdleTimeout)
 		assert.NotNil(t, transport.Proxy)
 	}
 	{

diff --git a/log_project.go b/log_project.go
@@ -97,7 +97,7 @@ func NewLogProjectV2(name, endpoint string, provider CredentialsProvider) (p *Lo
 
 func (p *LogProject) SetHTTPConnConfig(config *HTTPConnConfig) {
 	p.httpConnConfig = config
-	p.httpClient = getHttpClientWithConfig(config)
+	p.httpClient = getHTTPClientWithConfig(config)
 }
 
 // With credentials provider
@@ -115,7 +115,7 @@ func (p *LogProject) WithToken(token string) (*LogProject, error) {
 // WithRequestTimeout with custom timeout for a request
 func (p *LogProject) WithRequestTimeout(timeout time.Duration) *LogProject {
 	if p.httpClient == defaultHttpClient || p.httpClient == nil {
-		p.httpClient = getHttpClientWithConfig(&HTTPConnConfig{RequestTimeout: timeout})
+		p.httpClient = getHTTPClientWithConfig(&HTTPConnConfig{RequestTimeout: timeout})
 	} else {
 		p.httpClient.Timeout = timeout
 	}
@@ -1155,7 +1155,7 @@ func (p *LogProject) parseEndpoint() {
 		// use direct ip proxy
 		url, _ := url.Parse(fmt.Sprintf("%s%s", scheme, host))
 		if p.httpClient == nil || p.httpClient == defaultHttpClient {
-			p.httpClient = newDefaultHttpClient()
+			p.httpClient = newDefaultHTTPClient()
 		}
 		setHTTPProxy(p.httpClient, url)
 	}

diff --git a/request.go b/request.go
@@ -19,8 +19,8 @@ import (
 var (
 	defaultRequestTimeout    = 60 * time.Second
 	defaultRetryTimeout      = 90 * time.Second
-	defaultHttpClient        = newDefaultHttpClient()
-	defaultHttpIdleTimeout   = time.Second * 55
+	defaultHttpClient        = newDefaultHTTPClient()
+	defaultHTTPIdleTimeout   = time.Second * 55
 	defaultDisableKeepAlives = false
 )
 
@@ -32,13 +32,13 @@ type HTTPConnConfig struct {
 
 func newDefaultTransport() *http.Transport {
 	t := http.DefaultTransport.(*http.Transport).Clone()
-	t.IdleConnTimeout = defaultHttpIdleTimeout
+	t.IdleConnTimeout = defaultHTTPIdleTimeout
 	t.DisableKeepAlives = defaultDisableKeepAlives
 	return t
 }
 
 // returns a new http client instance with default config
-func newDefaultHttpClient() *http.Client {
+func newDefaultHTTPClient() *http.Client {
 	return &http.Client{
 		Transport: newDefaultTransport(),
 		Timeout:   defaultRequestTimeout,
@@ -49,8 +49,8 @@ func newDefaultHttpClient() *http.Client {
 // returns a new http client instance with given config
 //
 // if some field of config is not set, use default config value for that field
-func getHttpClientWithConfig(config *HTTPConnConfig) *http.Client {
-	newClient := newDefaultHttpClient()
+func getHTTPClientWithConfig(config *HTTPConnConfig) *http.Client {
+	newClient := newDefaultHTTPClient()
 	if config.RequestTimeout > 0 {
 		newClient.Timeout = config.RequestTimeout
 	}