go.mod: use go-logr/logr that has InfoLogger compatibility alias

joelanford · joelanford · commit b420a19d56eb · 2020-07-31T11:49:35.000-04:00
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.13
 require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/go-logr/logr v0.2.0
+	github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6
 	github.com/go-logr/zapr v0.2.0
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/imdario/mergo v0.3.9 // indirect
diff --git a/go.sum b/go.sum
@@ -120,6 +120,8 @@ github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6 h1:ZPVluSmhtMIHlqUDMZu70FgMpRzbQfl4h9oKCAXOVDE=
+github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4=
 github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
 github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go
@@ -85,8 +85,8 @@ func (f *fakeLogger) Info(msg string, vals ...interface{}) {
 	})
 }
 
-func (f *fakeLogger) Enabled() bool         { return true }
-func (f *fakeLogger) V(lvl int) logr.Logger { return f }
+func (f *fakeLogger) Enabled() bool             { return true }
+func (f *fakeLogger) V(lvl int) logr.InfoLogger { return f }
 
 var _ = Describe("logging", func() {
 
diff --git a/pkg/log/null.go b/pkg/log/null.go
@@ -29,12 +29,12 @@ type NullLogger struct{}
 
 var _ logr.Logger = NullLogger{}
 
-// Info implements logr.Logger
+// Info implements logr.InfoLogger
 func (NullLogger) Info(_ string, _ ...interface{}) {
 	// Do nothing.
 }
 
-// Enabled implements logr.Logger
+// Enabled implements logr.InfoLogger
 func (NullLogger) Enabled() bool {
 	return false
 }
@@ -45,7 +45,7 @@ func (NullLogger) Error(_ error, _ string, _ ...interface{}) {
 }
 
 // V implements logr.Logger
-func (log NullLogger) V(_ int) logr.Logger {
+func (log NullLogger) V(_ int) logr.InfoLogger {
 	return log
 }
 
diff --git a/pkg/log/zap/zap_test.go b/pkg/log/zap/zap_test.go
@@ -115,8 +115,8 @@ func (f *fakeLogger) Info(msg string, vals ...interface{}) {
 	})
 }
 
-func (f *fakeLogger) Enabled() bool         { return true }
-func (f *fakeLogger) V(lvl int) logr.Logger { return f }
+func (f *fakeLogger) Enabled() bool             { return true }
+func (f *fakeLogger) V(lvl int) logr.InfoLogger { return f }
 
 var _ = Describe("Zap options setup", func() {
 	var opts *Options

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ func (f *fakeLogger) Info(msg string, vals ...interface{}) {`
`85`	`85`	`})`
`86`	`86`	`}`
`87`	`87`
`88`		`-func (f *fakeLogger) Enabled() bool { return true }`
`89`		`-func (f *fakeLogger) V(lvl int) logr.Logger { return f }`
	`88`	`+func (f *fakeLogger) Enabled() bool { return true }`
	`89`	`+func (f *fakeLogger) V(lvl int) logr.InfoLogger { return f }`
`90`	`90`
`91`	`91`	`var _ = Describe("logging", func() {`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ type NullLogger struct{}`
`29`	`29`
`30`	`30`	`var _ logr.Logger = NullLogger{}`
`31`	`31`
`32`		`-// Info implements logr.Logger`
	`32`	`+// Info implements logr.InfoLogger`
`33`	`33`	`func (NullLogger) Info(_ string, _ ...interface{}) {`
`34`	`34`	`// Do nothing.`
`35`	`35`	`}`
`36`	`36`
`37`		`-// Enabled implements logr.Logger`
	`37`	`+// Enabled implements logr.InfoLogger`
`38`	`38`	`func (NullLogger) Enabled() bool {`
`39`	`39`	`return false`
`40`	`40`	`}`
`@@ -45,7 +45,7 @@ func (NullLogger) Error(_ error, _ string, _ ...interface{}) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// V implements logr.Logger`
`48`		`-func (log NullLogger) V(_ int) logr.Logger {`
	`48`	`+func (log NullLogger) V(_ int) logr.InfoLogger {`
`49`	`49`	`return log`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ func (f *fakeLogger) Info(msg string, vals ...interface{}) {`
`115`	`115`	`})`
`116`	`116`	`}`
`117`	`117`
`118`		`-func (f *fakeLogger) Enabled() bool { return true }`
`119`		`-func (f *fakeLogger) V(lvl int) logr.Logger { return f }`
	`118`	`+func (f *fakeLogger) Enabled() bool { return true }`
	`119`	`+func (f *fakeLogger) V(lvl int) logr.InfoLogger { return f }`
`120`	`120`
`121`	`121`	`var _ = Describe("Zap options setup", func() {`
`122`	`122`	`var opts *Options`