Return NewErrorWithStatusCode instead of NewErrorWithStatusCodeAndResponse if response was not requested

Author: FelGel

pkg/dataplane/http/context.go

@@ -1122,18 +1122,18 @@ func (c *context) sendRequest(dataPlaneInput *v3io.DataPlaneInput,
 	if !success {
 		var re = regexp.MustCompile(".*X-V3io-Session-Key:.*")
 
+		sanitizedRequest := re.ReplaceAllString(request.String(), "X-V3io-Session-Key: SANITIZED")
+		_err := fmt.Errorf("Expected a 2xx response status code: %s\nRequest details:\n%s",
+			response.HTTPResponse.String(), sanitizedRequest)
+
 		// Include response in error only if caller has requested it
 		// Otherwise it will be released automatically
-		var _response *v3io.Response
 		if dataPlaneInput.IncludeResponseInError {
-			_response = response
+			err = v3ioerrors.NewErrorWithStatusCodeAndResponse(_err, statusCode, response)
+		} else {
+			err = v3ioerrors.NewErrorWithStatusCode(_err, statusCode)
 		}
-		sanitizedRequest := re.ReplaceAllString(request.String(), "X-V3io-Session-Key: SANITIZED")
-		err = v3ioerrors.NewErrorWithStatusCodeAndResponse(
-			fmt.Errorf("Expected a 2xx response status code: %s\nRequest details:\n%s",
-				response.HTTPResponse.String(), sanitizedRequest),
-			statusCode,
-			_response)
+
 		goto cleanup
 	}
 

pkg/dataplane/test/sync_test.go

@@ -1002,7 +1002,6 @@ func (suite *syncKVTestSuite) TestIncludeResponseInError() {
 	suite.Assert().ElementsMatch(scatteredItemKeys, errorItemKeys)
 }
 
-
 func (suite *syncKVTestSuite) TestPutItemsWithError() {
 	items := map[string]map[string]interface{}{
 		"bob":     {"age": 42, "feature": "mustache"},
@@ -1312,7 +1311,7 @@ func (suite *syncStreamTestSuite) TestStream() {
 	for _, cursorItem := range cursorItems {
 		shardName, err := cursorItem.GetFieldString("__name")
 		suite.Require().NoError(err, "Failed to get item name")
-		chunkMap , _, err := cursorItem.GetShard()
+		chunkMap, _, err := cursorItem.GetShard()
 		suite.Require().NoError(err, "Failed to get stream")
 
 		suite.Require().Contains(chunkMap, 0, "chunk indexes doesn't match")