compatible with old err

dara/array.go

@@ -294,28 +294,8 @@ func ConcatArr(arr1 interface{}, arr2 interface{}) interface{} {
 }
 
 // ArrAppend inserts a new pointer at a specified index in a pointer array.
-func ArrAppend(arr interface{}, value interface{}, index int) {
-	arrV := reflect.ValueOf(arr)
-	if arrV.Kind() != reflect.Ptr || arrV.Elem().Kind() != reflect.Slice {
-		return
-	}
-
-	sliceV := arrV.Elem()
-
-	if index < 0 || index > sliceV.Len() {
-		return
-	}
-
-	valueV := reflect.ValueOf(value)
-
-	// 创建一个容纳新值的切片
-	newSlice := reflect.Append(sliceV, reflect.Zero(sliceV.Type().Elem()))
-	reflect.Copy(newSlice.Slice(index+1, newSlice.Len()), newSlice.Slice(index, newSlice.Len()-1))
-	newSlice.Index(index).Set(valueV)
-
-	// 更新原始切片
-	sliceV.Set(newSlice)
-	return
+func ArrAppend(arr interface{}, value interface{}) {
+	ArrPush(arr, value)
 }
 
 // ArrRemove removes an element from the array

dara/array_test.go

@@ -405,54 +405,6 @@ func TestConcatArr(t *testing.T) {
 	}
 }
 
-func TestArrAppend(t *testing.T) {
-	// 测试用例1：插入中间位置
-	t.Run("Append to middle of an array", func(t *testing.T) {
-		numbers := []*int{new(int), new(int), new(int)}
-		for i := range numbers {
-			*numbers[i] = i + 1
-		}
-
-		// 将 9 插入到索引 1
-		valueToInsert := new(int)
-		*valueToInsert = 9
-
-		// 期望的结果
-		expected := []*int{new(int), new(int), new(int), new(int)}
-		*expected[0], *expected[1], *expected[2], *expected[3] = 1, 9, 2, 3
-
-		defer func() {
-			if !reflect.DeepEqual(numbers, expected) {
-				t.Errorf("Expected %+v, but got %+v", expected, numbers)
-			}
-		}()
-
-		ArrAppend(&numbers, valueToInsert, 1)
-	})
-
-	// 测试用例2: 尝试在越界处插入
-	t.Run("Index out of bounds", func(t *testing.T) {
-		numbers := []*int{new(int), new(int), new(int)}
-		for i := range numbers {
-			*numbers[i] = i + 1
-		}
-
-		defer func() {
-			// Defer 检查：越界情况下，数组应保持不变
-			expected := []*int{new(int), new(int), new(int)}
-			*expected[0], *expected[1], *expected[2] = 1, 2, 3
-			if !reflect.DeepEqual(numbers, expected) {
-				t.Errorf("Index out of bounds should not modify array, but got %+v", numbers)
-			}
-		}()
-
-		valueToInsert := new(int)
-		*valueToInsert = 9
-		ArrAppend(&numbers, valueToInsert, 10) // 超出范围
-	})
-}
-
-
 func TestArrRemove(t *testing.T) {
 	// Create test data for string pointer array
 	str1 := "A"

dara/core.go

@@ -34,28 +34,8 @@ type RuntimeOptions = util.RuntimeOptions
 type ExtendsParameters = util.ExtendsParameters
 
 var debugLog = debug.Init("dara")
-type HttpRequest interface {
-}
 
-type HttpResponse interface {
-}
-
-type HttpClient interface {
-	Call(request *http.Request, transport *http.Transport) (response *http.Response, err error)
-}
-
-type daraClient struct {
-	sync.Mutex
-	httpClient *http.Client
-	ifInit     bool
-}
-
-func (client *daraClient) Call(request *http.Request, transport *http.Transport) (response *http.Response, err error) {
-	response, err = client.httpClient.Do(request)
-	return
-}
-
-var hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+var hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
 	return fn
 }
 
@@ -108,7 +88,12 @@ type RuntimeObject struct {
 	Logger            *utils.Logger          `json:"logger" xml:"logger"`
 	RetryOptions      *RetryOptions          `json:"retryOptions" xml:"retryOptions"`
 	ExtendsParameters *ExtendsParameters     `json:"extendsParameters,omitempty" xml:"extendsParameters,omitempty"`
-	HttpClient
+}
+
+type daraClient struct {
+	sync.Mutex
+	httpClient *http.Client
+	ifInit     bool
 }
 
 func (r *RuntimeObject) getClientTag(domain string) string {
@@ -147,12 +132,6 @@ func NewRuntimeObject(runtime map[string]interface{}) *RuntimeObject {
 	if runtime["logger"] != nil {
 		runtimeObject.Logger = runtime["logger"].(*utils.Logger)
 	}
-	if runtime["httpClient"] != nil {
-		runtimeObject.HttpClient = runtime["httpClient"].(HttpClient)
-	}
-	if runtime["retryOptions"] != nil {
-		runtimeObject.RetryOptions = runtime["retryOptions"].(*RetryOptions)
-	}
 	return runtimeObject
 }
 
@@ -271,27 +250,18 @@ func DoRequest(request *Request, runtimeObject *RuntimeObject) (response *Respon
 	}
 	httpRequest.Host = StringValue(request.Domain)
 
-	var client HttpClient
-	if runtimeObject.HttpClient == nil {
-		client = getDaraClient(runtimeObject.getClientTag(StringValue(request.Domain)))
-	} else {
-		client = runtimeObject.HttpClient
-	}
-
-	trans, err := getHttpTransport(request, runtimeObject)
-	if err != nil {
-		return
-	}
-	if defaultClient, ok := client.(*daraClient); ok {
-		defaultClient.Lock()
-		if !defaultClient.ifInit || defaultClient.httpClient.Transport == nil {
-			defaultClient.httpClient.Transport = trans
+	client := getDaraClient(runtimeObject.getClientTag(StringValue(request.Domain)))
+	client.Lock()
+	if !client.ifInit {
+		trans, err := getHttpTransport(request, runtimeObject)
+		if err != nil {
+			return nil, err
 		}
-		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
-		defaultClient.ifInit = true
-		defaultClient.Unlock()
+		client.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
+		client.httpClient.Transport = trans
+		client.ifInit = true
 	}
-
+	client.Unlock()
 	for key, value := range request.Headers {
 		if value == nil || key == "content-length" {
 			continue
@@ -313,7 +283,7 @@ func DoRequest(request *Request, runtimeObject *RuntimeObject) (response *Respon
 	putMsgToMap(fieldMap, httpRequest)
 	startTime := time.Now()
 	fieldMap["{start_time}"] = startTime.Format("2006-01-02 15:04:05")
-	res, err := hookDo(client.Call)(httpRequest, trans)
+	res, err := hookDo(client.httpClient.Do)(httpRequest)
 	fieldMap["{cost}"] = time.Since(startTime).String()
 	completedBytes := int64(0)
 	if runtimeObject.Tracker != nil {
@@ -642,23 +612,8 @@ func isNil(a interface{}) bool {
 	return vi.IsNil()
 }
 
-func isNilOrZero(value interface{}) bool {
-	if value == nil {
-		return true
-	}
-
-	v := reflect.ValueOf(value)
-	switch v.Kind() {
-	case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Interface, reflect.Slice:
-		return v.IsNil()
-	default:
-		// Check for zero value
-		return reflect.DeepEqual(value, reflect.Zero(v.Type()).Interface())
-	}
-}
-
 func Default(inputValue interface{}, defaultValue interface{}) (_result interface{}) {
-	if isNilOrZero(inputValue) {
+	if IsNil(inputValue) {
 		_result = defaultValue
 		return _result
 	}
@@ -729,17 +684,10 @@ func ToMap(args ...interface{}) map[string]interface{} {
 			}
 		default:
 			val := reflect.ValueOf(obj)
-			if val.Kind().String() == "map" {
-				tmp := val.MapKeys()
-				for _, key := range tmp {
-					finalArg[key.String()] = val.MapIndex(key).Interface()
-				}
-			} else {
-				res := structToMap(val)
-				for key, value := range res {
-					if value != nil {
-						finalArg[key] = value
-					}
+			res := structToMap(val)
+			for key, value := range res {
+				if value != nil {
+					finalArg[key] = value
 				}
 			}
 		}

dara/core_test.go

@@ -30,12 +30,6 @@ var runtimeObj = map[string]interface{}{
 	"listener":      &Progresstest{},
 	"tracker":       &utils.ReaderTracker{CompletedBytes: int64(10)},
 	"logger":        utils.NewLogger("info", "", &bytes.Buffer{}, "{time}"),
-	"retryOptions": &RetryOptions{
-		Retryable: true,
-		RetryCondition: []*RetryCondition{
-			{MaxAttempts: 3, Exception: []string{"AErr"}, ErrorCode: []string{"A1Err"}},
-		},
-	},
 }
 
 var key = `-----BEGIN RSA PRIVATE KEY-----
@@ -199,10 +193,6 @@ func TestRuntimeObject(t *testing.T) {
 
 	runtimeobject = NewRuntimeObject(runtimeObj)
 	utils.AssertEqual(t, false, BoolValue(runtimeobject.IgnoreSSL))
-
-	utils.AssertEqual(t, true, runtimeobject.RetryOptions.Retryable)
-
-	utils.AssertEqual(t, 1, len(runtimeobject.RetryOptions.RetryCondition))
 }
 
 func TestSDKError(t *testing.T) {
@@ -361,27 +351,11 @@ type Test struct {
 }
 
 func TestToMap(t *testing.T) {
-	inStr := map[string]string{
-		"tea": "test",
-		"test": "test2",
-	}
-	result := ToMap(inStr)
-	utils.AssertEqual(t, "test", result["tea"])
-	utils.AssertEqual(t, "test2", result["test"])
-
-	inInt := map[string]int{
-		"tea": 12,
-		"test": 13,
-	}
-	result = ToMap(inInt)
-	utils.AssertEqual(t, 12, result["tea"])
-	utils.AssertEqual(t, 13, result["test"])
-
 	in := map[string]*string{
 		"tea": String("test"),
 		"nil": nil,
 	}
-	result = ToMap(in)
+	result := ToMap(in)
 	utils.AssertEqual(t, "test", result["tea"])
 	utils.AssertNil(t, result["nil"])
 
@@ -514,36 +488,12 @@ func Test_GetBackoffTime(t *testing.T) {
 	ms = GetBackoffTime(backoff, Int(1))
 	utils.AssertEqual(t, true, IntValue(ms) <= 3)
 }
-type httpClient struct {
-	HttpClient
-	httpClient *http.Client
-}
-
-func newHttpClient() (*httpClient, error) {
-	client := new(httpClient)
-	err := client.Init()
-	return client, err
-}
-
-func (client *httpClient) Init() (_err error) {
-	return nil
-}
-
-func (client *httpClient) Call(request *http.Request, transport *http.Transport) (_result *http.Response, _err error) {
-	if transport != nil {
-		trans := transport.Clone()
-		client.httpClient.Transport = trans
-	} else {
-		client.httpClient.Transport = http.DefaultTransport.(*http.Transport).Clone()
-	}
-	return client.httpClient.Do(request)
-}
 
 func Test_DoRequest(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
 	}
@@ -582,8 +532,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, resp)
 	utils.AssertContains(t, err.Error(), ` invalid URL escape "%gf"`)
 
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -631,8 +581,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, err)
 	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
 
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			utils.AssertEqual(t, "tea-cn-hangzhou.aliyuncs.com:1080", req.Host)
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
@@ -644,20 +594,13 @@ func Test_DoRequest(t *testing.T) {
 	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, `Internal error`, err.Error())
-
-	httpClient, err := newHttpClient()
-	utils.AssertNil(t, err)
-	runtimeObj["httpClient"] = httpClient
-	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
-	utils.AssertNil(t, resp)
-	utils.AssertEqual(t, `Internal error`, err.Error())
 }
 
 func Test_DoRequestWithConcurrent(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -753,11 +696,11 @@ func Test_SetDialContext(t *testing.T) {
 }
 
 func Test_hookdo(t *testing.T) {
-	fn := func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	fn := func(req *http.Request) (*http.Response, error) {
 		return nil, errors.New("hookdo")
 	}
 	result := hookDo(fn)
-	resp, err := result(nil, nil)
+	resp, err := result(nil)
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, "hookdo", err.Error())
 }
@@ -1011,33 +954,6 @@ func Test_Default(t *testing.T) {
 
 	b := ToInt32(a)
 	utils.AssertEqual(t, Int32Value(b), int32(10))
-
-	// Testing Default with nil values
-	if result := Default(nil, "default"); result != "default" {
-		t.Errorf("expected 'default', got '%v'", result)
-	}
-
-	// Testing Default with zero values
-	if result := Default("", "default"); result != "default" {
-		t.Errorf("expected 'default', got '%v'", result)
-	}
-
-	if result := Default(0, 42); result != 42 {
-		t.Errorf("expected 42, got %v", result)
-	}
-
-	if result := Default(false, true); result != true {
-		t.Errorf("expected true, got %v", result)
-	}
-
-	// Testing Default with non-zero values
-	if result := Default("value", "default"); result != "value" {
-		t.Errorf("expected 'value', got '%v'", result)
-	}
-
-	if result := Default([]int{1, 2, 3}, []int{}); !reflect.DeepEqual(result, []int{1, 2, 3}) {
-		t.Errorf("expected [1 2 3], got '%v'", result)
-	}
 }
 
 func TestToBytes(t *testing.T) {

dara/error.go

@@ -20,9 +20,6 @@ type ResponseError interface {
 	BaseError
 	GetRetryAfter() *int64
 	GetStatusCode() *int
-	GetAccessDeniedDetail() map[string]interface{}
-	GetDescription() *string
-	GetData() map[string]interface{}
 }
 
 // SDKError struct is used save error code and message
@@ -65,9 +62,6 @@ func TeaSDKError(err error) error {
 			"code": StringValue(respErr.GetCode()),
 			"statusCode": IntValue(respErr.GetStatusCode()),
 			"message": respErr.Error(),
-			"description": StringValue(respErr.GetDescription()),
-			"data": respErr.GetData(),
-			"accessDeniedDetail": respErr.GetAccessDeniedDetail(),
 		})
 	}
 
@@ -90,7 +84,7 @@ func NewSDKError(obj map[string]interface{}) *SDKError {
 	} else if val, ok := obj["code"].(string); ok {
 		err.Code = String(val)
 	}
- 
+
 	if obj["message"] != nil {
 		err.Message = String(obj["message"].(string))
 	}

internal/darafile/Darafile

@@ -1,35 +0,0 @@
-{
-  "scope": "darabonba",
-  "name": "HttpClient",
-  "version": "0.0.1",
-  "main": "./main.dara",
-  "maintainers": [
-    {
-      "name": "Alibaba Cloud SDK",
-      "email": "sdk-team@alibabacloud.com"
-    }
-  ],
-  "libraries": {
-  },
-  "releases": {
-    "go": "github.com/alibabacloud-go/tea/tea:v1.2.3-0.20240605082020-e6e537a31150"
-  },
-  "go": {
-    "interface": true,
-    "clientName": "HttpClient",
-    "typedef": {
-      "HttpRequest": {
-        "import": "net/http",
-        "type": "http.Request"
-      },
-      "HttpResponse": {
-        "import": "net/http",
-        "type": "http.Response"
-      },
-      "HttpTransport": {
-        "import": "net/http",
-        "type": "http.Transport"
-      }
-    }
-  }
-}

internal/darafile/main.dara

@@ -1,8 +0,0 @@
-typedef HttpRequest;
-typedef HttpResponse;
-typedef HttpTransport;
-
-init(){
-}
-
-async function call(request: HttpRequest, transport: HttpTransport): HttpResponse;

internal/darafilev2/Darafile

@@ -1,35 +0,0 @@
-{
-  "scope": "darabonba",
-  "name": "HttpClientV2",
-  "version": "0.0.1",
-  "main": "./main.dara",
-  "maintainers": [
-    {
-      "name": "Alibaba Cloud SDK",
-      "email": "sdk-team@alibabacloud.com"
-    }
-  ],
-  "libraries": {
-  },
-  "releases": {
-    "go": "github.com/alibabacloud-go/tea/dara:v1.3.5"
-  },
-  "go": {
-    "interface": true,
-    "clientName": "HttpClient",
-    "typedef": {
-      "HttpRequest": {
-        "import": "net/http",
-        "type": "http.Request"
-      },
-      "HttpResponse": {
-        "import": "net/http",
-        "type": "http.Response"
-      },
-      "HttpTransport": {
-        "import": "net/http",
-        "type": "http.Transport"
-      }
-    }
-  }
-}

internal/darafilev2/main.dara

@@ -1,8 +0,0 @@
-typedef HttpRequest;
-typedef HttpResponse;
-typedef HttpTransport;
-
-init(){
-}
-
-async function call(request: HttpRequest, transport: HttpTransport): HttpResponse;

tea/tea.go

@@ -31,28 +31,7 @@ import (
 
 var debugLog = debug.Init("tea")
 
-type HttpRequest interface {
-}
-
-type HttpResponse interface {
-}
-
-type HttpClient interface {
-	Call(request *http.Request, transport *http.Transport) (response *http.Response, err error)
-}
-
-type teaClient struct {
-	sync.Mutex
-	httpClient *http.Client
-	ifInit     bool
-}
-
-func (client *teaClient) Call(request *http.Request, transport *http.Transport) (response *http.Response, err error) {
-	response, err = client.httpClient.Do(request)
-	return
-}
-
-var hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+var hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
 	return fn
 }
 
@@ -118,7 +97,12 @@ type RuntimeObject struct {
 	Listener       utils.ProgressListener `json:"listener" xml:"listener"`
 	Tracker        *utils.ReaderTracker   `json:"tracker" xml:"tracker"`
 	Logger         *utils.Logger          `json:"logger" xml:"logger"`
-	HttpClient
+}
+
+type teaClient struct {
+	sync.Mutex
+	httpClient *http.Client
+	ifInit     bool
 }
 
 var clientPool = &sync.Map{}
@@ -159,9 +143,6 @@ func NewRuntimeObject(runtime map[string]interface{}) *RuntimeObject {
 	if runtime["logger"] != nil {
 		runtimeObject.Logger = runtime["logger"].(*utils.Logger)
 	}
-	if runtime["httpClient"] != nil {
-		runtimeObject.HttpClient = runtime["httpClient"].(HttpClient)
-	}
 	return runtimeObject
 }
 
@@ -370,27 +351,18 @@ func DoRequest(request *Request, requestRuntime map[string]interface{}) (respons
 	}
 	httpRequest.Host = StringValue(request.Domain)
 
-	var client HttpClient
-	if runtimeObject.HttpClient == nil {
-		client = getTeaClient(runtimeObject.getClientTag(StringValue(request.Domain)))
-	} else {
-		client = runtimeObject.HttpClient
-	}
-
-	trans, err := getHttpTransport(request, runtimeObject)
-	if err != nil {
-		return
-	}
-	if defaultClient, ok := client.(*teaClient); ok {
-		defaultClient.Lock()
-		if !defaultClient.ifInit || defaultClient.httpClient.Transport == nil {
-			defaultClient.httpClient.Transport = trans
+	client := getTeaClient(runtimeObject.getClientTag(StringValue(request.Domain)))
+	client.Lock()
+	if !client.ifInit {
+		trans, err := getHttpTransport(request, runtimeObject)
+		if err != nil {
+			return nil, err
 		}
-		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
-		defaultClient.ifInit = true
-		defaultClient.Unlock()
+		client.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
+		client.httpClient.Transport = trans
+		client.ifInit = true
 	}
-
+	client.Unlock()
 	for key, value := range request.Headers {
 		if value == nil || key == "content-length" {
 			continue
@@ -412,7 +384,7 @@ func DoRequest(request *Request, requestRuntime map[string]interface{}) (respons
 	putMsgToMap(fieldMap, httpRequest)
 	startTime := time.Now()
 	fieldMap["{start_time}"] = startTime.Format("2006-01-02 15:04:05")
-	res, err := hookDo(client.Call)(httpRequest, trans)
+	res, err := hookDo(client.httpClient.Do)(httpRequest)
 	fieldMap["{cost}"] = time.Since(startTime).String()
 	completedBytes := int64(0)
 	if runtimeObject.Tracker != nil {

tea/tea_test.go

@@ -487,36 +487,11 @@ func Test_GetBackoffTime(t *testing.T) {
 	utils.AssertEqual(t, true, IntValue(ms) <= 3)
 }
 
-type httpClient struct {
-	HttpClient
-	httpClient *http.Client
-}
-
-func newHttpClient() (*httpClient, error) {
-	client := new(httpClient)
-	err := client.Init()
-	return client, err
-}
-
-func (client *httpClient) Init() (_err error) {
-	return nil
-}
-
-func (client *httpClient) Call(request *http.Request, transport *http.Transport) (_result *http.Response, _err error) {
-	if transport != nil {
-		trans := transport.Clone()
-		client.httpClient.Transport = trans
-	} else {
-		client.httpClient.Transport = http.DefaultTransport.(*http.Transport).Clone()
-	}
-	return client.httpClient.Do(request)
-}
-
 func Test_DoRequest(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
 	}
@@ -555,8 +530,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, resp)
 	utils.AssertContains(t, err.Error(), ` invalid URL escape "%gf"`)
 
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -604,8 +579,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, err)
 	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
 
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			utils.AssertEqual(t, "tea-cn-hangzhou.aliyuncs.com:1080", req.Host)
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
@@ -617,20 +592,13 @@ func Test_DoRequest(t *testing.T) {
 	resp, err = DoRequest(request, runtimeObj)
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, `Internal error`, err.Error())
-
-	httpClient, err := newHttpClient()
-	utils.AssertNil(t, err)
-	runtimeObj["httpClient"] = httpClient
-	resp, err = DoRequest(request, runtimeObj)
-	utils.AssertNil(t, resp)
-	utils.AssertEqual(t, `Internal error`, err.Error())
 }
 
 func Test_DoRequestWithConcurrent(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
-		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+		return func(req *http.Request) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -726,11 +694,11 @@ func Test_SetDialContext(t *testing.T) {
 }
 
 func Test_hookdo(t *testing.T) {
-	fn := func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+	fn := func(req *http.Request) (*http.Response, error) {
 		return nil, errors.New("hookdo")
 	}
 	result := hookDo(fn)
-	resp, err := result(nil, nil)
+	resp, err := result(nil)
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, "hookdo", err.Error())
 }