client-go/rest: move content type wiring from client to request

Signed-off-by: Monis Khan <mok@microsoft.com>

staging/src/k8s.io/client-go/rest/client.go

@@ -105,10 +105,6 @@ type RESTClient struct {
 // NewRESTClient creates a new RESTClient. This client performs generic REST functions
 // such as Get, Put, Post, and Delete on specified paths.
 func NewRESTClient(baseURL *url.URL, versionedAPIPath string, config ClientContentConfig, rateLimiter flowcontrol.RateLimiter, client *http.Client) (*RESTClient, error) {
-	if len(config.ContentType) == 0 {
-		config.ContentType = "application/json"
-	}
-
 	base := *baseURL
 	if !strings.HasSuffix(base.Path, "/") {
 		base.Path += "/"

staging/src/k8s.io/client-go/rest/request.go

@@ -100,6 +100,9 @@ func defaultRequestRetryFn(maxRetries int) WithRetry {
 type Request struct {
 	c *RESTClient
 
+	contentConfig     ClientContentConfig
+	contentTypeNotSet bool
+
 	warningHandler WarningHandler
 
 	rateLimiter flowcontrol.RateLimiter
@@ -153,6 +156,12 @@ func NewRequest(c *RESTClient) *Request {
 		timeout = c.Client.Timeout
 	}
 
+	contentConfig := c.content
+	contentTypeNotSet := len(contentConfig.ContentType) == 0
+	if contentTypeNotSet {
+		contentConfig.ContentType = "application/json"
+	}
+
 	r := &Request{
 		c:              c,
 		rateLimiter:    c.rateLimiter,
@@ -162,6 +171,9 @@ func NewRequest(c *RESTClient) *Request {
 		maxRetries:     10,
 		retryFn:        defaultRequestRetryFn,
 		warningHandler: c.warningHandler,
+
+		contentConfig:     contentConfig,
+		contentTypeNotSet: contentTypeNotSet,
 	}
 
 	switch {
@@ -371,7 +383,7 @@ func (r *Request) Param(paramName, s string) *Request {
 // VersionedParams will not write query parameters that have omitempty set and are empty. If a
 // parameter has already been set it is appended to (Params and VersionedParams are additive).
 func (r *Request) VersionedParams(obj runtime.Object, codec runtime.ParameterCodec) *Request {
-	return r.SpecificallyVersionedParams(obj, codec, r.c.content.GroupVersion)
+	return r.SpecificallyVersionedParams(obj, codec, r.contentConfig.GroupVersion)
 }
 
 func (r *Request) SpecificallyVersionedParams(obj runtime.Object, codec runtime.ParameterCodec, version schema.GroupVersion) *Request {
@@ -464,7 +476,7 @@ func (r *Request) Body(obj interface{}) *Request {
 		if reflect.ValueOf(t).IsNil() {
 			return r
 		}
-		encoder, err := r.c.content.Negotiator.Encoder(r.c.content.ContentType, nil)
+		encoder, err := r.contentConfig.Negotiator.Encoder(r.contentConfig.ContentType, nil)
 		if err != nil {
 			r.err = err
 			return r
@@ -476,7 +488,7 @@ func (r *Request) Body(obj interface{}) *Request {
 		}
 		r.body = nil
 		r.bodyBytes = data
-		r.SetHeader("Content-Type", r.c.content.ContentType)
+		r.SetHeader("Content-Type", r.contentConfig.ContentType)
 	default:
 		r.err = fmt.Errorf("unknown type used for body: %+v", obj)
 	}
@@ -944,7 +956,7 @@ func (r *Request) newStreamWatcher(resp *http.Response) (watch.Interface, runtim
 	if err != nil {
 		klog.V(4).Infof("Unexpected content type from the server: %q: %v", contentType, err)
 	}
-	objectDecoder, streamingSerializer, framer, err := r.c.content.Negotiator.StreamDecoder(mediaType, params)
+	objectDecoder, streamingSerializer, framer, err := r.contentConfig.Negotiator.StreamDecoder(mediaType, params)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -1310,7 +1322,7 @@ func (r *Request) transformResponse(ctx context.Context, resp *http.Response, re
 	var decoder runtime.Decoder
 	contentType := resp.Header.Get("Content-Type")
 	if len(contentType) == 0 {
-		contentType = r.c.content.ContentType
+		contentType = r.contentConfig.ContentType
 	}
 	if len(contentType) > 0 {
 		var err error
@@ -1318,7 +1330,7 @@ func (r *Request) transformResponse(ctx context.Context, resp *http.Response, re
 		if err != nil {
 			return Result{err: errors.NewInternalError(err)}
 		}
-		decoder, err = r.c.content.Negotiator.Decoder(mediaType, params)
+		decoder, err = r.contentConfig.Negotiator.Decoder(mediaType, params)
 		if err != nil {
 			// if we fail to negotiate a decoder, treat this as an unstructured error
 			switch {
@@ -1445,7 +1457,7 @@ func (r *Request) newUnstructuredResponseError(body []byte, isTextResponse bool,
 	}
 	var groupResource schema.GroupResource
 	if len(r.resource) > 0 {
-		groupResource.Group = r.c.content.GroupVersion.Group
+		groupResource.Group = r.contentConfig.GroupVersion.Group
 		groupResource.Resource = r.resource
 	}
 	return errors.NewGenericServerResponse(

staging/src/k8s.io/client-go/rest/request_test.go

@@ -43,6 +43,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/google/go-cmp/cmp"
+
 	v1 "k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -66,7 +67,7 @@ import (
 
 func TestNewRequestSetsAccept(t *testing.T) {
 	r := NewRequestWithClient(&url.URL{Path: "/path/"}, "", ClientContentConfig{}, nil).Verb("get")
-	if r.headers.Get("Accept") != "" {
+	if r.headers.Get("Accept") != "application/json, */*" {
 		t.Errorf("unexpected headers: %#v", r.headers)
 	}
 	r = NewRequestWithClient(&url.URL{Path: "/path/"}, "", ClientContentConfig{ContentType: "application/other"}, nil).Verb("get")
@@ -112,9 +113,9 @@ func TestRequestWithErrorWontChange(t *testing.T) {
 	gvCopy := v1.SchemeGroupVersion
 	original := Request{
 		err: errors.New("test"),
-		c: &RESTClient{
+		c:   &RESTClient{},
-			content: ClientContentConfig{GroupVersion: gvCopy},
+
-		},
+		contentConfig: ClientContentConfig{GroupVersion: gvCopy},
 	}
 	r := original
 	changed := r.Param("foo", "bar").
@@ -236,7 +237,7 @@ func TestRequestParam(t *testing.T) {
 }
 
 func TestRequestVersionedParams(t *testing.T) {
-	r := (&Request{c: &RESTClient{content: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}}).Param("foo", "a")
+	r := (&Request{c: &RESTClient{}, contentConfig: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}).Param("foo", "a")
 	if !reflect.DeepEqual(r.params, url.Values{"foo": []string{"a"}}) {
 		t.Errorf("should have set a param: %#v", r)
 	}
@@ -252,7 +253,7 @@ func TestRequestVersionedParams(t *testing.T) {
 }
 
 func TestRequestVersionedParamsFromListOptions(t *testing.T) {
-	r := &Request{c: &RESTClient{content: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}}
+	r := &Request{c: &RESTClient{}, contentConfig: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}
 	r.VersionedParams(&metav1.ListOptions{ResourceVersion: "1"}, scheme.ParameterCodec)
 	if !reflect.DeepEqual(r.params, url.Values{
 		"resourceVersion": []string{"1"},
@@ -272,7 +273,7 @@ func TestRequestVersionedParamsFromListOptions(t *testing.T) {
 
 func TestRequestVersionedParamsWithInvalidScheme(t *testing.T) {
 	parameterCodec := runtime.NewParameterCodec(runtime.NewScheme())
-	r := (&Request{c: &RESTClient{content: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}})
+	r := &Request{c: &RESTClient{}, contentConfig: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}
 	r.VersionedParams(&v1.PodExecOptions{Stdin: false, Stdout: true},
 		parameterCodec)
 
@@ -336,7 +337,7 @@ func TestRequestBody(t *testing.T) {
 	}
 
 	// test unencodable api object
-	r = (&Request{c: &RESTClient{content: defaultContentConfig()}}).Body(&NotAnAPIObject{})
+	r = (&Request{c: &RESTClient{}, contentConfig: defaultContentConfig()}).Body(&NotAnAPIObject{})
 	if r.err == nil || r.body != nil {
 		t.Errorf("should have set err and left body nil: %#v", r)
 	}
@@ -901,11 +902,10 @@ func TestTransformUnstructuredError(t *testing.T) {
 		t.Run("", func(t *testing.T) {
 			_, ctx := ktesting.NewTestContext(t)
 			r := &Request{
-				c: &RESTClient{
+				contentConfig: defaultContentConfig(),
-					content: defaultContentConfig(),
+				c:             &RESTClient{},
-				},
+				resourceName:  testCase.Name,
-				resourceName: testCase.Name,
+				resource:      testCase.Resource,
-				resource:     testCase.Resource,
 			}
 			result := r.transformResponse(ctx, testCase.Res, testCase.Req)
 			err := result.err
@@ -989,9 +989,9 @@ func TestRequestWatch(t *testing.T) {
 		{
 			name: "server returns forbidden with json content",
 			Request: &Request{
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					content: defaultContentConfig(),
+					base: &url.URL{},
-					base:    &url.URL{},
 				},
 			},
 			serverReturns: []responseErr{
@@ -1018,9 +1018,9 @@ func TestRequestWatch(t *testing.T) {
 		{
 			name: "server returns forbidden without content",
 			Request: &Request{
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					content: defaultContentConfig(),
+					base: &url.URL{},
-					base:    &url.URL{},
 				},
 			},
 			serverReturns: []responseErr{
@@ -1038,9 +1038,9 @@ func TestRequestWatch(t *testing.T) {
 		{
 			name: "server returns unauthorized",
 			Request: &Request{
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					content: defaultContentConfig(),
+					base: &url.URL{},
-					base:    &url.URL{},
 				},
 			},
 			serverReturns: []responseErr{
@@ -1058,9 +1058,9 @@ func TestRequestWatch(t *testing.T) {
 		{
 			name: "server returns unauthorized",
 			Request: &Request{
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					content: defaultContentConfig(),
+					base: &url.URL{},
-					base:    &url.URL{},
 				},
 			},
 			serverReturns: []responseErr{
@@ -1254,9 +1254,9 @@ func TestRequestStream(t *testing.T) {
 		},
 		{
 			Request: &Request{
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					content: defaultContentConfig(),
+					base: &url.URL{},
-					base:    &url.URL{},
 				},
 			},
 			serverReturns: []responseErr{
@@ -1273,9 +1273,9 @@ func TestRequestStream(t *testing.T) {
 		},
 		{
 			Request: &Request{
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					content: defaultContentConfig(),
+					base: &url.URL{},
-					base:    &url.URL{},
 				},
 			},
 			serverReturns: []responseErr{
@@ -2957,12 +2957,12 @@ func testRequestWithRetry(t *testing.T, key string, doFunc func(ctx context.Cont
 			})
 
 			req := &Request{
-				verb:      test.verb,
+				verb:          test.verb,
-				body:      test.body,
+				body:          test.body,
-				bodyBytes: test.bodyBytes,
+				bodyBytes:     test.bodyBytes,
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					content: defaultContentConfig(),
+					Client: client,
-					Client:  client,
 				},
 				backoff:    &noSleepBackOff{},
 				maxRetries: test.maxRetries,
@@ -3251,11 +3251,11 @@ func testRetryWithRateLimiterBackoffAndMetrics(t *testing.T, key string, doFunc
 				t.Fatalf("Wrong test setup - did not find expected for: %s", key)
 			}
 			req := &Request{
-				verb:      "GET",
+				verb:          "GET",
-				bodyBytes: []byte{},
+				bodyBytes:     []byte{},
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
 					base:        base,
-					content:     defaultContentConfig(),
 					Client:      client,
 					rateLimiter: interceptor,
 				},
@@ -3387,12 +3387,12 @@ func testWithRetryInvokeOrder(t *testing.T, key string, doFunc func(ctx context.
 				t.Fatalf("Wrong test setup - did not find expected for: %s", key)
 			}
 			req := &Request{
-				verb:      "GET",
+				verb:          "GET",
-				bodyBytes: []byte{},
+				bodyBytes:     []byte{},
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					base:    base,
+					base:   base,
-					content: defaultContentConfig(),
+					Client: client,
-					Client:  client,
 				},
 				pathPrefix:  "/api/v1",
 				rateLimiter: flowcontrol.NewFakeAlwaysRateLimiter(),
@@ -3562,12 +3562,12 @@ func testWithWrapPreviousError(t *testing.T, doFunc func(ctx context.Context, r
 				t.Fatalf("Failed to create new HTTP request - %v", err)
 			}
 			req := &Request{
-				verb:      "GET",
+				verb:          "GET",
-				bodyBytes: []byte{},
+				bodyBytes:     []byte{},
+				contentConfig: defaultContentConfig(),
 				c: &RESTClient{
-					base:    base,
+					base:   base,
-					content: defaultContentConfig(),
+					Client: client,
-					Client:  client,
 				},
 				pathPrefix:  "/api/v1",
 				rateLimiter: flowcontrol.NewFakeAlwaysRateLimiter(),
@@ -3986,11 +3986,11 @@ func TestRetryableConditions(t *testing.T) {
 
 					u, _ := url.Parse("http://localhost:123" + "/apis")
 					req := &Request{
-						verb: verb,
+						verb:          verb,
+						contentConfig: defaultContentConfig(),
 						c: &RESTClient{
-							base:    u,
+							base:   u,
-							content: defaultContentConfig(),
+							Client: client,
-							Client:  client,
 						},
 						backoff:    &noSleepBackOff{},
 						maxRetries: 2,
@@ -4030,10 +4030,10 @@ func TestRequestConcurrencyWithRetry(t *testing.T) {
 	})
 
 	req := &Request{
-		verb: "POST",
+		verb:          "POST",
+		contentConfig: defaultContentConfig(),
 		c: &RESTClient{
-			content: defaultContentConfig(),
+			Client: client,
-			Client:  client,
 		},
 		backoff:    &noSleepBackOff{},
 		maxRetries: 9, // 10 attempts in total, including the first

staging/src/k8s.io/client-go/rest/request_watchlist_test.go

@@ -200,9 +200,7 @@ func TestWatchListSuccess(t *testing.T) {
 			ctx := context.Background()
 			fakeWatcher := watch.NewFake()
 			target := &Request{
-				c: &RESTClient{
+				c: &RESTClient{},
-					content: ClientContentConfig{},
-				},
 			}
 
 			go func(watchEvents []watch.Event) {