Revert "Include response in err struct"

This reverts commit 1aeefa4.

Author: FelGel

pkg/dataplane/http/context.go

@@ -341,19 +341,7 @@ func (c *context) GetItemsSync(getItemsInput *v3io.GetItemsInput) (*v3io.Respons
 		false)
 
 	if err != nil {
-		errorWithStatusAndResponse, ok := err.(v3ioerrors.ErrorWithStatusCodeAndResponse)
-		if !ok {
-			return nil, err
-		}
-		if errorWithStatusAndResponse.Response() == nil || errorWithStatusAndResponse.Response().HTTPResponse == nil {
-			return nil, err
-		}
-
-		// if error has included response - attempt to parse it
-		// unlike regular response, there is no need to release response from `errorWithStatusAndResponse`
-		response = errorWithStatusAndResponse.Response()
-		response.Output, _ = c.getItemsParseJSONResponse(response, getItemsInput)
-		return response, err
+		return nil, err
 	}
 
 	contentType := string(response.HeaderPeek("Content-Type"))
@@ -1016,20 +1004,7 @@ func (c *context) sendRequestAndXMLUnmarshal(dataPlaneInput *v3io.DataPlaneInput
 
 	response, err := c.sendRequest(dataPlaneInput, method, path, query, headers, body, false)
 	if err != nil {
-		errorWithStatusAndResponse, ok := err.(v3ioerrors.ErrorWithStatusCodeAndResponse)
-		if !ok {
-			return nil, err
-		}
-		if errorWithStatusAndResponse.Response() == nil || errorWithStatusAndResponse.Response().HTTPResponse == nil {
-			return nil, err
-		}
-
-		// if error has included response - attempt to parse it
-		// unlike regular response, there is no need to release response from `errorWithStatusAndResponse`
-		response = errorWithStatusAndResponse.Response()
-		_ = xml.Unmarshal(response.Body(), output)
-		response.Output = output
-		return response, err
+		return nil, err
 	}
 
 	// unmarshal the body into the output
@@ -1141,18 +1116,11 @@ func (c *context) sendRequest(dataPlaneInput *v3io.DataPlaneInput,
 	// make sure we got expected status
 	if !success {
 		var re = regexp.MustCompile(".*X-V3io-Session-Key:.*")
-
-		// Include response in error only if caller has requested it
-		var _response *v3io.Response
-		if !releaseResponse {
-			_response = response
-		}
 		sanitizedRequest := re.ReplaceAllString(request.String(), "X-V3io-Session-Key: SANITIZED")
-		err = v3ioerrors.NewErrorWithStatusCodeAndResponse(
+		err = v3ioerrors.NewErrorWithStatusCode(
 			fmt.Errorf("Expected a 2xx response status code: %s\nRequest details:\n%s",
 				response.HTTPResponse.String(), sanitizedRequest),
-			statusCode,
-			_response)
+			statusCode)
 		goto cleanup
 	}
 

pkg/errors/errors.go

@@ -2,9 +2,6 @@ package v3ioerrors
 
 import (
 	"errors"
-
-	v3io "github.com/v3io/v3io-go/pkg/dataplane"
-	"github.com/valyala/fasthttp"
 )
 
 var ErrInvalidTypeConversion = errors.New("Invalid type conversion")
@@ -17,11 +14,6 @@ type ErrorWithStatusCode struct {
 	statusCode int
 }
 
-type ErrorWithStatusCodeAndResponse struct {
-	ErrorWithStatusCode
-	response *v3io.Response
-}
-
 func NewErrorWithStatusCode(err error, statusCode int) ErrorWithStatusCode {
 	return ErrorWithStatusCode{
 		error:      err,
@@ -36,32 +28,3 @@ func (e ErrorWithStatusCode) StatusCode() int {
 func (e ErrorWithStatusCode) Error() string {
 	return e.error.Error()
 }
-
-func NewErrorWithStatusCodeAndResponse(err error,
-	statusCode int,
-	response *v3io.Response) ErrorWithStatusCodeAndResponse {
-
-	// Copy response struct since original response will be released if error is encountered
-	var _copiedResponse *v3io.Response
-	if response != nil {
-		copiedHTTPResponse := &fasthttp.Response{}
-		if response.HTTPResponse != nil {
-			response.HTTPResponse.CopyTo(copiedHTTPResponse)
-		}
-		_copiedResponse = &v3io.Response{
-			Output:       response.Output,
-			Context:      response.Context,
-			Error:        response.Error,
-			HTTPResponse: copiedHTTPResponse,
-		}
-	}
-
-	return ErrorWithStatusCodeAndResponse{
-		ErrorWithStatusCode: NewErrorWithStatusCode(err, statusCode),
-		response:            _copiedResponse,
-	}
-}
-
-func (e ErrorWithStatusCodeAndResponse) Response() *v3io.Response {
-	return e.response
-}