Merge pull request vmware-tanzu#474 from TaoZou1/httpdebug

Add http request, response debug log
TaoZou1 · Jan 9, 2024 · 6e6a1c6 · 6e6a1c6
2 parents f5902cc + 1c07b2d
commit 6e6a1c6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/pkg/nsx/endpoint.go b/pkg/nsx/endpoint.go
@@ -332,7 +332,6 @@ func (ep *Endpoint) UpdateHttpRequestAuth(request *http.Request) error {
 	} else {
 		xsrfToken := ep.XSRFToken()
 		if len(xsrfToken) > 0 {
-			log.V(2).Info("update cookie")
 			if request.Header.Get("Authorization") != "" {
 				request.Header.Del("Authorization")
 			}

diff --git a/pkg/nsx/transport.go b/pkg/nsx/transport.go
@@ -6,7 +6,7 @@ package nsx
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -46,6 +46,7 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
 			ep.UpdateHttpRequestAuth(r)
 			start := time.Now()
 			ep.wait()
+			util.DumpHttpRequest(r)
 			waitTime := time.Since(start)
 			if resp, resul = t.base().RoundTrip(r); resul != nil {
 				ep.setStatus(DOWN)
@@ -57,10 +58,9 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
 			if resp == nil {
 				return nil
 			}
-
-			body, err := ioutil.ReadAll(resp.Body)
+			body, err := io.ReadAll(resp.Body)
 			resp.Body.Close()
-			resp.Body = ioutil.NopCloser(bytes.NewReader(body))
+			resp.Body = io.NopCloser(bytes.NewReader(body))
 
 			if err != nil {
 				log.Error(err, "failed to extract HTTP body")

diff --git a/pkg/nsx/util/utils.go b/pkg/nsx/util/utils.go
@@ -4,6 +4,7 @@
 package util
 
 import (
+	"bytes"
 	"crypto/sha1"
 	"crypto/sha256"
 	"crypto/x509"
@@ -129,6 +130,7 @@ func InitErrorFromResponse(host string, statusCode int, body []byte) NsxError {
 }
 
 func extractHTTPDetailFromBody(host string, statusCode int, body []byte) (ErrorDetail, error) {
+	log.V(2).Info("http response", "status code", statusCode, "body", string(body))
 	ec := ErrorDetail{StatusCode: statusCode}
 	if len(body) == 0 {
 		log.V(1).Info("body length is 0")
@@ -141,7 +143,6 @@ func extractHTTPDetailFromBody(host string, statusCode int, body []byte) (ErrorD
 	}
 
 	ec.ErrorCode = res.ErrorCode
-	log.V(2).Info("http response", "status code", statusCode, "body", res)
 	msg := []string{res.ErrorMsg}
 	for _, a := range res.RelatedErr {
 		ec.RelatedErrorCodes = append(ec.RelatedErrorCodes, a.ErrorCode)
@@ -289,6 +290,22 @@ func ParseVPCPath(nsxResourcePath string) (orgID string, projectID string, vpcID
 	resourceID = paras[8]
 	return
 }
+func DumpHttpRequest(request *http.Request) {
+	var body []byte
+	var err error
+	if request.Body == nil {
+		return
+	}
+	if request != nil {
+		body, err = io.ReadAll(request.Body)
+		if err != nil {
+			return
+		}
+	}
+	request.Body.Close()
+	request.Body = io.NopCloser(bytes.NewReader(body))
+	log.V(2).Info("http request", "url", request.URL, "body", string(body))
+}
 
 // if ApiError is nil, check ErrorTypeEnum, such as ServiceUnavailable
 // if both return value are nil, the error is not on the list