diff --git a/internal/providers/aws/util.go b/internal/providers/aws/util.go index e1e8a949f5..cb2e26d1b2 100644 --- a/internal/providers/aws/util.go +++ b/internal/providers/aws/util.go @@ -8,7 +8,7 @@ import ( "github.com/open-policy-agent/opa/logging" ) -// DoRequestWithClient is a convenience function to get the body of an http response with +// DoRequestWithClient is a convenience function to get the body of a http response with // appropriate error-handling boilerplate and logging. func DoRequestWithClient(req *http.Request, client *http.Client, desc string, logger logging.Logger) ([]byte, error) { resp, err := client.Do(req) @@ -24,22 +24,18 @@ func DoRequestWithClient(req *http.Request, client *http.Client, desc string, lo "headers": resp.Header, }).Debug("Received response from " + desc + " service.") - if resp.StatusCode != 200 { - if logger.GetLevel() == logging.Debug { - body, err := io.ReadAll(resp.Body) - if err == nil { - logger.Debug("Error response with response body: %s", body) - } - } - // could be 404 for role that's not available, but cover all the bases - return nil, errors.New(desc + " HTTP request returned unexpected status: " + resp.Status) - } - body, err := io.ReadAll(resp.Body) if err != nil { // deal with problems reading the body, whatever those might be return nil, errors.New(desc + " HTTP response body could not be read: " + err.Error()) } + if resp.StatusCode != 200 { + if logger.GetLevel() == logging.Debug { + logger.Debug("Error response with response body: %s", body) + } + // could be 404 for role that's not available, but cover all the bases + return nil, errors.New(desc + " HTTP request returned unexpected status: " + resp.Status) + } return body, nil }