add support for http.ResponseController to ResponseRecorder

once the fix for golang/go#60229 makes
it to the go version, this commit can be dropped

Author: tkashem

pkg/controlplane/instance_test.go

@@ -45,6 +45,7 @@ import (
 	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/apiserver/pkg/authorization/authorizerfactory"
 	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
+	responsewritertesting "k8s.io/apiserver/pkg/endpoints/responsewriter/testing"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/server/options"
 	"k8s.io/apiserver/pkg/server/resourceconfig"
@@ -217,7 +218,9 @@ func TestVersion(t *testing.T) {
 	defer etcdserver.Terminate(t)
 
 	req, _ := http.NewRequest("GET", "/version", nil)
-	resp := httptest.NewRecorder()
+	// TODO: remove WithFakeResponseController once
+	//  https://github.com/golang/go/issues/60229 is fixed.
+	resp := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 	s.GenericAPIServer.Handler.ServeHTTP(resp, req)
 	if resp.Code != 200 {
 		t.Fatalf("expected http 200, got: %d", resp.Code)

staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline_test.go

@@ -197,7 +197,9 @@ func TestWithRequestDeadline(t *testing.T) {
 				t.Fatalf("test setup failed, expected the new HTTP request context to have no deadline but got: %s", remaning)
 			}
 
-			w := httptest.NewRecorder()
+			// TODO: remove WithFakeResponseController once
+			//  https://github.com/golang/go/issues/60229 is fixed.
+			w := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 			withDeadline.ServeHTTP(w, testRequest)
 
 			if test.handlerCallCountExpected != callCount {
@@ -245,7 +247,9 @@ func TestWithRequestDeadlineWithClock(t *testing.T) {
 	// the request has arrived just now.
 	testRequest = testRequest.WithContext(request.WithReceivedTimestamp(testRequest.Context(), time.Now()))
 
-	w := httptest.NewRecorder()
+	// TODO: remove WithFakeResponseController once
+	//  https://github.com/golang/go/issues/60229 is fixed.
+	w := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 	withDeadline.ServeHTTP(w, testRequest)
 
 	if !hasDeadlineGot {
@@ -271,7 +275,9 @@ func TestWithRequestDeadlineWithInvalidTimeoutIsAudited(t *testing.T) {
 	withDeadline = WithRequestInfo(withDeadline, &fakeRequestResolver{})
 
 	testRequest := newRequest(t, "/api/v1/namespaces?timeout=foo")
-	w := httptest.NewRecorder()
+	// TODO: remove WithFakeResponseController once
+	//  https://github.com/golang/go/issues/60229 is fixed.
+	w := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 	withDeadline.ServeHTTP(w, testRequest)
 
 	if handlerInvoked {
@@ -313,7 +319,9 @@ func TestWithRequestDeadlineWithPanic(t *testing.T) {
 	})
 
 	testRequest := newRequest(t, "/api/v1/namespaces?timeout=1s")
-	w := httptest.NewRecorder()
+	// TODO: remove WithFakeResponseController once
+	//  https://github.com/golang/go/issues/60229 is fixed.
+	w := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 	withPanicRecovery.ServeHTTP(w, testRequest)
 
 	if panicErrExpected != panicErrGot {
@@ -344,7 +352,9 @@ func TestWithRequestDeadlineWithRequestTimesOut(t *testing.T) {
 	withDeadline = WithRequestInfo(withDeadline, &fakeRequestResolver{})
 
 	testRequest := newRequest(t, fmt.Sprintf("/api/v1/namespaces?timeout=%s", timeout))
-	w := httptest.NewRecorder()
+	// TODO: remove WithFakeResponseController once
+	//  https://github.com/golang/go/issues/60229 is fixed.
+	w := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 	withDeadline.ServeHTTP(w, testRequest)
 
 	if errGot != context.DeadlineExceeded {
@@ -390,7 +400,9 @@ func TestWithFailedRequestAudit(t *testing.T) {
 
 			withAudit := withFailedRequestAudit(errorHandler, test.statusErr, fakeSink, fakeRuleEvaluator)
 
-			w := httptest.NewRecorder()
+			// TODO: remove WithFakeResponseController once
+			//  https://github.com/golang/go/issues/60229 is fixed.
+			w := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 			testRequest := newRequest(t, "/apis/v1/namespaces/default/pods")
 			info := request.RequestInfo{}
 			testRequest = testRequest.WithContext(request.WithRequestInfo(testRequest.Context(), &info))

staging/src/k8s.io/apiserver/pkg/endpoints/responsewriter/testing/recorder.go

@@ -17,9 +17,41 @@ limitations under the License.
 package testing
 
 import (
+	"net/http/httptest"
 	"strings"
+	"time"
 )
 
+// WithFakeResponseController extends a given httptest.ResponseRecorder object
+// with a fake implementaion of http.ResonseController.
+// NOTE: use this function for testing purposes only.
+//
+// httptest.ResponseRecorder does not implement SetReadDeadline or
+// SetWriteDeadline, see https://github.com/golang/go/issues/60229
+// for more details.
+// TODO: once https://github.com/golang/go/issues/60229 is fixed
+// we can remove this function.
+func WithFakeResponseController(w *httptest.ResponseRecorder) *FakeResponseRecorder {
+	return &FakeResponseRecorder{ResponseRecorder: w}
+}
+
+type FakeResponseRecorder struct {
+	*httptest.ResponseRecorder
+
+	ReadDeadlines  []time.Time
+	WriteDeadlines []time.Time
+}
+
+func (w *FakeResponseRecorder) SetReadDeadline(deadline time.Time) error {
+	w.ReadDeadlines = append(w.ReadDeadlines, deadline)
+	return nil
+}
+
+func (w *FakeResponseRecorder) SetWriteDeadline(deadline time.Time) error {
+	w.WriteDeadlines = append(w.WriteDeadlines, deadline)
+	return nil
+}
+
 func IsStreamReadOrWriteTimeout(err error) bool {
 	if err == nil {
 		return false

staging/src/k8s.io/apiserver/pkg/server/config_test.go

@@ -37,6 +37,7 @@ import (
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/endpoints/request"
+	responsewritertesting "k8s.io/apiserver/pkg/endpoints/responsewriter/testing"
 	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
@@ -322,7 +323,10 @@ func TestAuthenticationAuditAnnotationsDefaultChain(t *testing.T) {
 			t.Errorf("failed to write response: %v", err)
 		}
 	}), c)
-	w := httptest.NewRecorder()
+
+	// TODO: remove WithFakeResponseController once
+	//  https://github.com/golang/go/issues/60229 is fixed.
+	w := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 
 	h.ServeHTTP(w, httptest.NewRequest("GET", "https://ignored.com", nil))
 

staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go

@@ -46,6 +46,7 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/discovery"
 	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
 	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
+	responsewritertesting "k8s.io/apiserver/pkg/endpoints/responsewriter/testing"
 	"k8s.io/apiserver/pkg/registry/rest"
 	genericfilters "k8s.io/apiserver/pkg/server/filters"
 	"k8s.io/client-go/informers"
@@ -472,8 +473,11 @@ func TestNotRestRoutesHaveAuth(t *testing.T) {
 		{"/debug/flags/"},
 		{"/version"},
 	} {
-		resp := httptest.NewRecorder()
+		// TODO: remove WithFakeResponseController once
+		//  https://github.com/golang/go/issues/60229 is fixed.
+		resp := responsewritertesting.WithFakeResponseController(httptest.NewRecorder())
 		req, _ := http.NewRequest("GET", test.route, nil)
+
 		s.Handler.ServeHTTP(resp, req)
 		if resp.Code != 200 {
 			t.Errorf("route %q expected to work: code %d", test.route, resp.Code)