From f9e6013a6c55896eaf8489d3c64a33783f57c383 Mon Sep 17 00:00:00 2001
From: Kevin Wan <wanjunfeng@gmail.com>
Date: Tue, 15 Mar 2022 14:18:46 +0800
Subject: [PATCH] refactor: httpc package for easy to use (#1645)

---
 rest/httpc/requests.go      | 12 ++++++------
 rest/httpc/requests_test.go |  4 +---
 rest/httpc/service.go       | 23 ++++++++++++-----------
 rest/httpc/service_test.go  |  7 +++++--
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/rest/httpc/requests.go b/rest/httpc/requests.go
index 0f933654..8a67a177 100644
--- a/rest/httpc/requests.go
+++ b/rest/httpc/requests.go
@@ -6,16 +6,16 @@ import (
 )
 
 // Do sends an HTTP request to the service assocated with the given key.
-func Do(key string, r *http.Request, opts ...Option) (*http.Response, error) {
-	return NewService(key, opts...).Do(r)
+func Do(key string, r *http.Request) (*http.Response, error) {
+	return NewService(key).Do(r)
 }
 
 // Get sends an HTTP GET request to the service assocated with the given key.
-func Get(key, url string, opts ...Option) (*http.Response, error) {
-	return NewService(key, opts...).Get(url)
+func Get(key, url string) (*http.Response, error) {
+	return NewService(key).Get(url)
 }
 
 // Post sends an HTTP POST request to the service assocated with the given key.
-func Post(key, url, contentType string, body io.Reader, opts ...Option) (*http.Response, error) {
-	return NewService(key, opts...).Post(url, contentType, body)
+func Post(key, url, contentType string, body io.Reader) (*http.Response, error) {
+	return NewService(key).Post(url, contentType, body)
 }
diff --git a/rest/httpc/requests_test.go b/rest/httpc/requests_test.go
index 0062c492..6696d20f 100644
--- a/rest/httpc/requests_test.go
+++ b/rest/httpc/requests_test.go
@@ -13,9 +13,7 @@ func TestDo(t *testing.T) {
 	}))
 	_, err := Get("foo", "tcp://bad request")
 	assert.NotNil(t, err)
-	resp, err := Get("foo", svr.URL, func(cli *http.Client) {
-		cli.Transport = http.DefaultTransport
-	})
+	resp, err := Get("foo", svr.URL)
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 }
diff --git a/rest/httpc/service.go b/rest/httpc/service.go
index f03005e0..db17b280 100644
--- a/rest/httpc/service.go
+++ b/rest/httpc/service.go
@@ -18,7 +18,7 @@ var interceptors = []internal.Interceptor{
 
 type (
 	// Option is used to customize the *http.Client.
-	Option func(cli *http.Client)
+	Option func(r *http.Request) *http.Request
 
 	// Service represents a remote HTTP service.
 	Service interface {
@@ -33,26 +33,23 @@ type (
 	namedService struct {
 		name string
 		cli  *http.Client
+		opts []Option
 	}
 )
 
 // NewService returns a remote service with the given name.
 // opts are used to customize the *http.Client.
 func NewService(name string, opts ...Option) Service {
-	var cli *http.Client
-
-	if len(opts) == 0 {
-		cli = http.DefaultClient
-	} else {
-		cli = &http.Client{}
-		for _, opt := range opts {
-			opt(cli)
-		}
-	}
+	return NewServiceWithClient(name, http.DefaultClient, opts...)
+}
 
+// NewServiceWithClient returns a remote service with the given name.
+// opts are used to customize the *http.Client.
+func NewServiceWithClient(name string, cli *http.Client, opts ...Option) Service {
 	return namedService{
 		name: name,
 		cli:  cli,
+		opts: opts,
 	}
 }
 
@@ -100,6 +97,10 @@ func (s namedService) Post(url, contentType string, body io.Reader) (*http.Respo
 }
 
 func (s namedService) doRequest(r *http.Request) (resp *http.Response, err error) {
+	for _, opt := range s.opts {
+		r = opt(r)
+	}
+
 	brk := breaker.GetBreaker(s.name)
 	err = brk.DoWithAcceptable(func() error {
 		resp, err = s.cli.Do(r)
diff --git a/rest/httpc/service_test.go b/rest/httpc/service_test.go
index e01d4373..f619fe76 100644
--- a/rest/httpc/service_test.go
+++ b/rest/httpc/service_test.go
@@ -20,13 +20,16 @@ func TestNamedService_Do(t *testing.T) {
 
 func TestNamedService_Get(t *testing.T) {
 	svr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("foo", r.Header.Get("foo"))
 	}))
-	service := NewService("foo", func(cli *http.Client) {
-		cli.Transport = http.DefaultTransport
+	service := NewService("foo", func(r *http.Request) *http.Request {
+		r.Header.Set("foo", "bar")
+		return r
 	})
 	resp, err := service.Get(svr.URL)
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
+	assert.Equal(t, "bar", resp.Header.Get("foo"))
 }
 
 func TestNamedService_Post(t *testing.T) {