Skip to content

Commit 50d007d

Browse files
Remove obsolete work around for vcert logging prefix
Signed-off-by: Richard Wall <[email protected]>
1 parent 7a58cf9 commit 50d007d

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

pkg/logs/logs.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ func Initialize() error {
130130
// be using the global log.Default, also uses the common slog logger.
131131
vcertLog := log.Default()
132132
vcertLog.SetOutput(LogToSlogWriter{Slog: slog, Source: "vcert"})
133-
// This is a work around for a bug in vcert where it adds a `vCert: ` prefix
134-
// to the global log logger. It can be removed when this is fixed upstream
135-
// in vcert: https://github.com/Venafi/vcert/pull/512
136-
vcertLog.SetPrefix("")
137133

138134
// The venafi-connection-lib client uses various controller-runtime packages
139135
// which emit log messages. Make sure those log messages are not discarded.

pkg/logs/logs_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ E0000 00:00:00.000000 00000 logs_test.go:000] "Exiting due to error" err="Erro
117117
flags: "",
118118
skipIntialize: true,
119119
expectStderr: `
120-
vCert: 0000/00/00 00:00:00 log Print
121-
vCert: 0000/00/00 00:00:00 INFO slog Info
122-
vCert: 0000/00/00 00:00:00 WARN slog Warn
123-
vCert: 0000/00/00 00:00:00 ERROR slog Error
120+
0000/00/00 00:00:00 log Print
121+
0000/00/00 00:00:00 INFO slog Info
122+
0000/00/00 00:00:00 WARN slog Warn
123+
0000/00/00 00:00:00 ERROR slog Error
124124
I0000 00:00:00.000000 00000 logs_test.go:000] klog Info
125125
W0000 00:00:00.000000 00000 logs_test.go:000] klog Warning
126126
E0000 00:00:00.000000 00000 logs_test.go:000] "klog Error" err="fake-error"

0 commit comments

Comments
 (0)