Skip to content

Commit

Permalink
Expose log entry formatting methods to provide behaviour to external …
Browse files Browse the repository at this point in the history
…tools
  • Loading branch information
Stein Fletcher committed Feb 17, 2019
1 parent 1f9b174 commit 20f79e8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions diagram.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ func NewHTMLTemplateModel(r *Recorder) (HTMLTemplateModel, error) {
case HttpRequest:
httpReq := v.Value
webSequenceDiagram.AddRequestRow(v.Source, v.Target, fmt.Sprintf("%s %s", httpReq.Method, httpReq.URL))
entry, err := newHttpRequestLogEntry(httpReq)
entry, err := NewHttpRequestLogEntry(httpReq)
if err != nil {
return HTMLTemplateModel{}, err
}
entry.Timestamp = v.Timestamp
logs = append(logs, entry)
case HttpResponse:
webSequenceDiagram.AddResponseRow(v.Source, v.Target, strconv.Itoa(v.Value.StatusCode))
entry, err := newHttpResponseLogEntry(v.Value)
entry, err := NewHttpResponseLogEntry(v.Value)
if err != nil {
return HTMLTemplateModel{}, err
}
Expand Down Expand Up @@ -204,7 +204,7 @@ func NewHTMLTemplateModel(r *Recorder) (HTMLTemplateModel, error) {
}, nil
}

func newHttpRequestLogEntry(req *http.Request) (LogEntry, error) {
func NewHttpRequestLogEntry(req *http.Request) (LogEntry, error) {
reqHeader, err := httputil.DumpRequest(req, false)
if err != nil {
return LogEntry{}, err
Expand All @@ -216,7 +216,7 @@ func newHttpRequestLogEntry(req *http.Request) (LogEntry, error) {
return LogEntry{Header: string(reqHeader), Body: body}, err
}

func newHttpResponseLogEntry(res *http.Response) (LogEntry, error) {
func NewHttpResponseLogEntry(res *http.Response) (LogEntry, error) {
resDump, err := httputil.DumpResponse(res, false)
if err != nil {
return LogEntry{}, err
Expand Down
6 changes: 3 additions & 3 deletions diagram_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func aRecorder() *Recorder {
func TestNewHttpRequestLogEntry(t *testing.T) {
req := httptest.NewRequest(http.MethodGet, "/path", strings.NewReader(`{"a": 12345}`))

logEntry, err := newHttpRequestLogEntry(req)
logEntry, err := NewHttpRequestLogEntry(req)

assert.Nil(t, err)
assert.True(t, strings.Contains(logEntry.Header, "GET /path"))
Expand All @@ -147,7 +147,7 @@ func TestNewHttpResponseLogEntry_JSON(t *testing.T) {
Body: ioutil.NopCloser(strings.NewReader(`{"a": 12345}`)),
}

logEntry, err := newHttpResponseLogEntry(response)
logEntry, err := NewHttpResponseLogEntry(response)

assert.Nil(t, err)
assert.True(t, strings.Contains(logEntry.Header, `HTTP/1.1 200 OK`))
Expand All @@ -164,7 +164,7 @@ func TestNewHttpResponseLogEntry_PlainText(t *testing.T) {
Body: ioutil.NopCloser(strings.NewReader(`abcdef`)),
}

logEntry, err := newHttpResponseLogEntry(response)
logEntry, err := NewHttpResponseLogEntry(response)

assert.Nil(t, err)
assert.True(t, strings.Contains(logEntry.Header, `HTTP/1.1 200 OK`))
Expand Down

0 comments on commit 20f79e8

Please sign in to comment.