New JSON field in HTTP request collector if any (#1511)

* add new raw_json field to http collector

* add unit test

Author: nvanthao

pkg/collect/http.go

@@ -14,12 +14,14 @@ import (
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 )
 
 type HTTPResponse struct {
 	Status  int               `json:"status"`
 	Body    string            `json:"body"`
 	Headers map[string]string `json:"headers"`
+	RawJSON json.RawMessage   `json:"raw_json,omitempty"`
 }
 
 type HTTPError struct {
@@ -127,10 +129,17 @@ func responseToOutput(response *http.Response, err error) ([]byte, error) {
 			headers[k] = strings.Join(v, ",")
 		}
 
+		var rawJSON json.RawMessage
+		if err := json.Unmarshal(body, &rawJSON); err != nil {
+			klog.Infof("failed to unmarshal response body as JSON: %v", err)
+			rawJSON = json.RawMessage{}
+		}
+
 		output["response"] = HTTPResponse{
 			Status:  response.StatusCode,
 			Body:    string(body),
 			Headers: headers,
+			RawJSON: rawJSON,
 		}
 	}
 

pkg/collect/http_test.go

@@ -1,8 +1,10 @@
 package collect
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -376,3 +378,64 @@ func Test_parseTimeout(t *testing.T) {
 		})
 	}
 }
+
+func Test_responseToOutput(t *testing.T) {
+	tests := []struct {
+		name     string
+		response *http.Response
+		err      error
+		want     []byte
+		wantErr  bool
+	}{
+		{
+			name: "valid JSON response",
+			response: &http.Response{
+				Body:       io.NopCloser(bytes.NewBufferString(`{"ok": false, "error": "invalid_auth"}`)),
+				Header:     http.Header{"Content-Type": []string{"application/json; charset=utf-8"}},
+				StatusCode: http.StatusOK,
+			},
+			err: nil,
+			want: []byte(`
+			{
+				"response":
+				{
+					"status":200,
+					"body":"{\"ok\": false, \"error\": \"invalid_auth\"}",
+					"headers":{"Content-Type":"application/json; charset=utf-8"},
+					"raw_json":{"ok":false,"error":"invalid_auth"}
+				}
+			}`),
+			wantErr: false,
+		},
+		{
+			name: "invalid JSON response",
+			response: &http.Response{
+				Body:       io.NopCloser(bytes.NewBufferString(`foobar`)),
+				Header:     http.Header{"Content-Type": []string{"text/html; charset=utf-8"}},
+				StatusCode: http.StatusOK,
+			},
+			err: nil,
+			want: []byte(`
+			{
+				"response":
+				{
+					"status":200,
+					"body":"foobar",
+					"headers":{"Content-Type":"text/html; charset=utf-8"}
+				}
+			}`),
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := responseToOutput(tt.response, tt.err)
+			if tt.wantErr {
+				assert.Error(t, err)
+				return
+			}
+			assert.NoError(t, err)
+			assert.JSONEq(t, string(got), string(tt.want))
+		})
+	}
+}