Skip to content

Commit 9dcabc8

Browse files
committed
fix: allowing populated response in RoundTrip error cases
1 parent 65a591a commit 9dcabc8

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

pkg/networking/middleware/response.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ func (rm ResponseMiddleware) RoundTrip(req *http.Request) (*http.Response, error
4040

4141
err = rm.errHandler(err, res.Request.Context())
4242

43-
// RoundTrip should return one or the other.
44-
if err != nil {
45-
res = nil
46-
}
47-
4843
return res, err
4944
}
5045

pkg/networking/middleware/response_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func Test_ResponseMiddleware(t *testing.T) {
7777
req := buildRequest(url)
7878
res, err := rt.RoundTrip(req)
7979

80-
assert.Nil(t, res)
80+
assert.NotNil(t, res)
8181
assert.ErrorAs(t, err, &snykErr)
8282
assert.Equal(t, code, snykErr.StatusCode)
8383

@@ -121,7 +121,7 @@ func Test_ResponseMiddleware(t *testing.T) {
121121
req := buildRequest(server.URL + "/jsonapi-SNYK-0003")
122122
res, err := rt.RoundTrip(req)
123123

124-
assert.Nil(t, res)
124+
assert.NotNil(t, res)
125125
assert.Error(t, err)
126126

127127
actual := snyk_errors.Error{}
@@ -138,7 +138,7 @@ func Test_ResponseMiddleware(t *testing.T) {
138138
req := buildRequest(server.URL + "/jsonapi-SNYK-0000")
139139
res, err := rt.RoundTrip(req)
140140

141-
assert.Nil(t, res)
141+
assert.NotNil(t, res)
142142
assert.Error(t, err)
143143

144144
actual := snyk_errors.Error{}
@@ -155,7 +155,7 @@ func Test_ResponseMiddleware(t *testing.T) {
155155
req := buildRequest(server.URL + "/error-catalog")
156156
res, err := rt.RoundTrip(req)
157157

158-
assert.Nil(t, res)
158+
assert.NotNil(t, res)
159159
assert.Error(t, err)
160160

161161
expected := snyk.NewBadGatewayError("")

0 commit comments

Comments
 (0)