diff --git a/pkg/client/request.go b/pkg/client/request.go index 496bec6dc4d..0884b2d00f6 100644 --- a/pkg/client/request.go +++ b/pkg/client/request.go @@ -224,26 +224,6 @@ func (r *Request) Watch() (watch.Interface, error) { return watch.NewStreamWatcher(watchjson.NewDecoder(response.Body, r.c.Codec)), nil } -// Stream formats and executes the request, and offers streaming of the response. -// Returns io.ReadCloser which could be used for streaming of the response, or an error -func (r *Request) Stream() (io.ReadCloser, error) { - if r.err != nil { - return nil, r.err - } - req, err := http.NewRequest(r.verb, r.finalURL(), nil) - if err != nil { - return nil, err - } - if r.c.auth != nil { - req.SetBasicAuth(r.c.auth.User, r.c.auth.Password) - } - response, err := r.c.httpClient.Do(req) - if err != nil { - return nil, err - } - return response.Body, nil -} - // Do formats and executes the request. Returns the API object received, or an error. func (r *Request) Do() Result { for { diff --git a/pkg/client/request_test.go b/pkg/client/request_test.go index 7be72057aef..2e06f3f2f5a 100644 --- a/pkg/client/request_test.go +++ b/pkg/client/request_test.go @@ -439,37 +439,3 @@ func TestWatch(t *testing.T) { t.Fatal("Unexpected non-close") } } - -func TestStream(t *testing.T) { - auth := AuthInfo{User: "user", Password: "pass"} - expectedBody := "expected body" - - testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - checkAuth(t, auth, r) - flusher, ok := w.(http.Flusher) - if !ok { - panic("need flusher!") - } - w.Header().Set("Transfer-Encoding", "chunked") - w.WriteHeader(http.StatusOK) - w.Write([]byte(expectedBody)) - flusher.Flush() - })) - - c, err := New(testServer.URL, "v1beta1", &auth) - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - readCloser, err := c.Get().Path("path/to/stream/thing").Stream() - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - defer readCloser.Close() - buf := new(bytes.Buffer) - buf.ReadFrom(readCloser) - resultBody := buf.String() - - if expectedBody != resultBody { - t.Errorf("Expected %s, got %s", expectedBody, resultBody) - } -}