Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkg/generators/golang/clients_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,6 @@ func (g *ClientsGenerator) generateRequestSource(method *concepts.Method) {
reader := bufio.NewReader(response.Body)
_, err = reader.Peek(1)
if err == io.EOF {
err = nil
return
}
if result.status >= 400 {
Expand Down
26 changes: 25 additions & 1 deletion tests/go/clients_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -523,11 +523,35 @@ var _ = Describe("Client", func() {
response, err := client.Add().
Body(body).
Send()
Expect(err).ToNot(HaveOccurred())
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(Equal("EOF"))
Expect(response).ToNot(BeNil())
Expect(response.Status()).To(Equal(http.StatusNoContent))
Expect(response.Body()).To(BeNil())
})

It("Returns EOF error when response body is empty for successful request", func() {
// Prepare the server to return a successful status with no content:
server.AppendHandlers(
RespondWith(http.StatusOK, ""),
)

// Create a transport that replaces the response body with an empty reader:
transport = &EmptyResponseBodyTransport{
wrapped: transport,
}

// Send the request:
client := cmv1.NewClustersClient(transport, "/api/clusters_mgmt/v1/clusters")
response, err := client.List().Send()

// With the change, EOF error should be preserved instead of being set to nil
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(Equal("EOF"))
Expect(response).ToNot(BeNil())
Expect(response.Status()).To(Equal(http.StatusOK))
})

It("Honors @http in query parameter", func() {
// Prepare the server:
server.AppendHandlers(
Expand Down
26 changes: 25 additions & 1 deletion tests/go/separate_clients_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -523,11 +523,35 @@ var _ = Describe("Separately Generated Client", func() {
response, err := client.Add().
Body(body).
Send()
Expect(err).ToNot(HaveOccurred())
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(Equal("EOF"))
Expect(response).ToNot(BeNil())
Expect(response.Status()).To(Equal(http.StatusNoContent))
Expect(response.Body()).To(BeNil())
})

It("Returns EOF error when response body is empty for successful request", func() {
// Prepare the server to return a successful status with no content:
server.AppendHandlers(
RespondWith(http.StatusOK, ""),
)

// Create a transport that replaces the response body with an empty reader:
transport = &EmptyResponseBodyTransport{
wrapped: transport,
}

// Send the request:
client := cmv1.NewClustersClient(transport, "/api/clusters_mgmt/v1/clusters")
response, err := client.List().Send()

// With the change, EOF error should be preserved instead of being set to nil
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(Equal("EOF"))
Expect(response).ToNot(BeNil())
Expect(response.Status()).To(Equal(http.StatusOK))
})

It("Honors @http in query parameter", func() {
// Prepare the server:
server.AppendHandlers(
Expand Down