displaybody should respect new line [main]

[h0nIg]

Description of the Change

REQUEST and RESPONSE should behave the same with CF_TRACE=true and CF_TRACE=testfile. even across request logger.

cli/util/ui/request_logger_terminal_display.go

Line 27 in fa795ba

fmt.Fprintf(display.ui.Out, "%s\n", RedactedValue)

cli/util/ui/request_logger_file_writer.go

Line 32 in fa795ba

_, err := logFile.WriteString(RedactedValue)

CLI stdout

Authenticating...
REQUEST: [2024-07-02T13:42:02Z]
POST /oauth/token HTTP/1.1
Host: login.xxxxx
Accept: application/json
Authorization: [PRIVATE DATA HIDDEN]
Connection: close
Content-Type: application/x-www-form-urlencoded
User-Agent: cf8/8.7.10+5b7ce3c.2024-04-04 (go1.22.1; amd64 linux)
[PRIVATE DATA HIDDEN]

RESPONSE: [2024-07-02T13:42:02Z]
HTTP/1.1 200 OK

CLI file output

REQUEST: [2024-07-02T11:14:36Z]
POST /oauth/token HTTP/1.1
Host: login.xxx
Accept: application/json
Authorization: [PRIVATE DATA HIDDEN]
Connection: close
Content-Type: application/x-www-form-urlencoded
User-Agent: cf8/8.7.10+5b7ce3c.2024-04-04 (go1.22.1; amd64 linux)
[PRIVATE DATA HIDDEN]
RESPONSE: [2024-07-02T11:14:36Z]
HTTP/1.1 200 OK

Why Is This PR Valuable?

proper parsing across all redaction code (uaa, cloud controler, ...)

cli/api/cloudcontroller/wrapper/request_logger.go

Line 116 in fa795ba

return logger.output.DisplayMessage(fmt.Sprintf("[%s Content Hidden]", strings.Split(contentType, ";")[0]))

cli/api/uaa/wrapper/request_logger.go

Line 104 in fa795ba

err = logger.output.DisplayBody(rawRequestBody)

uaa:

REQUEST: [2024-07-02T11:14:36Z]
POST /oauth/token HTTP/1.1
Host: login.xxx
Accept: application/json
Authorization: [PRIVATE DATA HIDDEN]
Connection: close
Content-Type: application/x-www-form-urlencoded
User-Agent: cf8/8.7.10+5b7ce3c.2024-04-04 (go1.22.1; amd64 linux)
[PRIVATE DATA HIDDEN]
RESPONSE: [2024-07-02T11:14:36Z]
HTTP/1.1 200 OK

cloud controller (including newline)

REQUEST: [2024-07-02T11:14:28Z]
GET / HTTP/1.1
Host: api.xxx
Accept: application/json
Content-Type: application/json
User-Agent: cf8/8.7.10+5b7ce3c.2024-04-04 (go1.22.1; amd64 linux)
[application/json Content Hidden]

RESPONSE: [2024-07-02T11:14:28Z]
HTTP/1.1 200 OK

How Urgent Is The Change?

Not urgent

[joaopapereira]

Hey thanks for the PR do you mind rebasing your PR?

[h0nIg]

@joaopapereira done, unit tests green but still some flaky integration tests, any idea?

  [FAILED] Got stuck at:
      
  Waiting for:
      APP2-82d5acd4-30b8-4cc2-6f96-1835209e208b\s+e231607e-16bb-4314-74d0-034adc03bc47\s+create succeeded\s*\n
  In [It] at: /__w/cli/cli/integration/v7/isolated/service_command_test.go:179 @ 07/04/24 08:46:09.628

[h0nIg]

@joaopapereira @gururajsh may i ask to re-trigger the flapping "Tests / Integration tests / MIN CAPI / run-integration-tests"?

Do you see any show stoppers to get this merged?

[a-b]

@h0nIg, if you want to have this change released, please submit a pull request to the v8 branch too.

[h0nIg]

@a-b #3151 done

[h0nIg]

@a-b ping

[a-b]

Thanks for the heads up. We will merge as soon as the tests are green.

[h0nIg]

@a-b

The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

[h0nIg]

@a-b the tests are green, may i ask for a merge please?