changed the way WithClient works

Author: matryer

client.go

@@ -15,8 +15,7 @@ import (
 
 // Client accesses a GraphQL API.
 type client struct {
-	endpoint   string
-	httpclient *http.Client
+	endpoint string
 }
 
 // Do executes a query request and returns the response.
@@ -67,8 +66,8 @@ func (c *client) Do(ctx context.Context, request *Request, response interface{})
 	}
 	req.Header.Set("Content-Type", writer.FormDataContentType())
 	req.Header.Set("Accept", "application/json")
-	client := c.httpclient
-	if client == nil {
+	client, ok := ctx.Value(httpclientContextKey).(*http.Client)
+	if !ok {
 		client = http.DefaultClient
 	}
 	res, err := ctxhttp.Do(ctx, client, req)
@@ -92,13 +91,7 @@ func (c *client) Do(ctx context.Context, request *Request, response interface{})
 
 // WithClient specifies the http.Client that requests will use.
 func WithClient(ctx context.Context, client *http.Client) context.Context {
-	c, err := fromContext(ctx)
-	if err != nil {
-		// can't set it, fail silently
-		return ctx
-	}
-	c.httpclient = client
-	return ctx
+	return context.WithValue(ctx, httpclientContextKey, client)
 }
 
 type graphErr struct {

client_test.go

@@ -52,9 +52,6 @@ func TestDo(t *testing.T) {
 	defer srv.Close()
 	c := &client{
 		endpoint: srv.URL,
-		httpclient: &http.Client{
-			Timeout: 1 * time.Second,
-		},
 	}
 	ctx := context.Background()
 	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
@@ -83,9 +80,6 @@ func TestDoErr(t *testing.T) {
 	defer srv.Close()
 	c := &client{
 		endpoint: srv.URL,
-		httpclient: &http.Client{
-			Timeout: 1 * time.Second,
-		},
 	}
 	ctx := context.Background()
 	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
@@ -113,9 +107,6 @@ func TestDoNoResponse(t *testing.T) {
 	defer srv.Close()
 	c := &client{
 		endpoint: srv.URL,
-		httpclient: &http.Client{
-			Timeout: 1 * time.Second,
-		},
 	}
 	ctx := context.Background()
 	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)

context.go

@@ -13,8 +13,13 @@ var errInappropriateContext = errors.New("inappropriate context")
 // contextKey provides unique keys for context values.
 type contextKey string
 
-// clientContextKey is the context value key for the Client.
-var clientContextKey = contextKey("graphql client context")
+var (
+	// clientContextKey is the context value key for the Client.
+	clientContextKey = contextKey("graphql client context key")
+	// httpclientContextKey is the context value key for the HTTP client to
+	// use.
+	httpclientContextKey = contextKey("graphql http client context key")
+)
 
 // fromContext gets the client from the specified
 // Context.