From 24c90cf8466081fc42bd512982e4acb13289f1ea Mon Sep 17 00:00:00 2001 From: Gildas Cherruel Date: Wed, 8 May 2024 21:50:14 +0900 Subject: [PATCH] Better Redactors --- common_test.go | 4 ++-- logger_internal_test.go | 3 +++ record_test.go | 2 +- redact_test.go | 9 +++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common_test.go b/common_test.go index 4f0b71a..6db3e44 100644 --- a/common_test.go +++ b/common_test.go @@ -99,8 +99,8 @@ func (user User) String() string { type Metadata struct { UserID string `json:"userId"` - Name string `json:"name"` - City string `json:"city"` + Name string `json:"name"` + City string `json:"city"` } func (metadata Metadata) Redact(keyToRedact ...string) interface{} { diff --git a/logger_internal_test.go b/logger_internal_test.go index 57b7d91..0aeafa2 100644 --- a/logger_internal_test.go +++ b/logger_internal_test.go @@ -340,13 +340,16 @@ func (suite *InternalLoggerSuite) TestIsHijacker() { } type hijackerResponse struct{} + func (*hijackerResponse) Header() http.Header { return nil } func (*hijackerResponse) Write([]byte) (int, error) { return 0, nil } func (*hijackerResponse) WriteHeader(statusCode int) {} func (*hijackerResponse) Hijack() (net.Conn, *bufio.ReadWriter, error) { return nil, nil, errors.NotImplemented.WithStack() } + type noopResponse struct{} + func (*noopResponse) Header() http.Header { return nil } func (*noopResponse) Write([]byte) (int, error) { return 0, nil } func (*noopResponse) WriteHeader(statusCode int) {} diff --git a/record_test.go b/record_test.go index df30220..d5ed7d7 100644 --- a/record_test.go +++ b/record_test.go @@ -316,4 +316,4 @@ func (suite *RecordSuite) TestCanAddKeysToRedact() { suite.Assert().Contains(record.KeysToRedact, "key2") suite.Assert().Contains(record.KeysToRedact, "key3") suite.Assert().NotContains(record.KeysToRedact, "key4") -} \ No newline at end of file +} diff --git a/redact_test.go b/redact_test.go index 027e321..dbb79c8 100644 --- a/redact_test.go +++ b/redact_test.go @@ -395,10 +395,11 @@ func (suite *RedactSuite) TestCanMergeWithString() { suite.Assert().Equal("message with nothing", redacted) } - type stringer logger.Redactor - func (s stringer) String() string { - return logger.Redactor(s).String() - } +type stringer logger.Redactor + +func (s stringer) String() string { + return logger.Redactor(s).String() +} func (suite *RedactSuite) TestCanMergeWithStringer() { expected := `3[47]\d{2}[- ]*\d{6}[- ]*\d{5}|4\d{3}[- ]*\d{4}[- ]*\d{4}[- ]*\d{4}`