Include html respone if kosli command fails and the debug flag is set server/#4839 (#744)

ToreMerkely · web-flow · commit ed0badfb8610 · 2026-03-30T10:52:55.000+02:00
diff --git a/internal/requests/requests.go b/internal/requests/requests.go
@@ -267,6 +267,7 @@ func (c *Client) Do(p *RequestParams) (*HTTPResponse, error) {
 			var respBody any
 			err := json.Unmarshal([]byte(body), &respBody)
 			if err != nil {
+				c.Logger.Debug("response body from %s (status %d):\n%s", req.URL, resp.StatusCode, string(body))
 				return &HTTPResponse{}, err
 			}
 			cleanedErrorMessage := ""
diff --git a/internal/requests/requests_test.go b/internal/requests/requests_test.go
@@ -59,6 +59,10 @@ func (suite *RequestsTestSuite) SetupSuite() {
 		Get("/fail/").
 		Reply(500).
 		BodyString("server broken")
+	suite.fakeService.NewHandler().
+		Get("/proxy-block/").
+		Reply(403).
+		BodyString(`<!DOCTYPE html><html><body><h1>403 Forbidden</h1><p>Blocked by proxy</p></body></html>`)
 }
 
 // shutdown the fake service after the suite execution
@@ -262,6 +266,7 @@ func (suite *RequestsTestSuite) TestDo() {
 	for _, t := range []struct {
 		name             string
 		params           *RequestParams
+		debug            bool
 		wantError        bool
 		expectedLog      string
 		expectedErrorMsg string
@@ -377,15 +382,29 @@ func (suite *RequestsTestSuite) TestDo() {
 			wantError:        true,
 			expectedErrorMsg: "unexpected end of JSON input",
 		},
+		{
+			name: "non-JSON error response body is logged with debug enabled",
+			params: &RequestParams{
+				Method: http.MethodGet,
+				URL:    suite.fakeService.ResolveURL("/proxy-block/"),
+			},
+			debug:            true,
+			wantError:        true,
+			expectedErrorMsg: "invalid character '<' looking for beginning of value",
+			expectedLog:      `<!DOCTYPE html><html><body><h1>403 Forbidden</h1><p>Blocked by proxy</p></body></html>`,
+		},
 	} {
 		suite.Run(t.name, func() {
 			buf := new(bytes.Buffer)
-			client, err := NewKosliClient("", 1, false, logger.NewLogger(buf, buf, false))
+			client, err := NewKosliClient("", 1, t.debug, logger.NewLogger(buf, buf, t.debug))
 			require.NoError(suite.T(), err)
 			resp, err := client.Do(t.params)
 			if t.wantError {
 				require.Error(suite.T(), err)
 				require.Equal(suite.T(), t.expectedErrorMsg, err.Error())
+				if t.expectedLog != "" {
+					require.Contains(suite.T(), buf.String(), t.expectedLog)
+				}
 			} else {
 				require.NoError(suite.T(), err)
 				output := buf.String()

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,7 @@ func (c Client) Do(p RequestParams) (*HTTPResponse, error) {`
`267`	`267`	`var respBody any`
`268`	`268`	`err := json.Unmarshal([]byte(body), &respBody)`
`269`	`269`	`if err != nil {`
	`270`	`+ c.Logger.Debug("response body from %s (status %d):\n%s", req.URL, resp.StatusCode, string(body))`
`270`	`271`	`return &HTTPResponse{}, err`
`271`	`272`	`}`
`272`	`273`	`cleanedErrorMessage := ""`