fixup log and fakeinformer to handle breaking changes in k8s 1.19

joelanford · joelanford · commit ce846f819a81 · 2020-07-31T11:41:05.000-04:00
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ 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/zapr v0.1.0
+	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
 	github.com/onsi/ginkgo v1.12.1
diff --git a/go.sum b/go.sum
@@ -120,8 +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/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54=
-github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
+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=
 github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
 github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
@@ -410,6 +410,7 @@ go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
diff --git a/pkg/controller/controllertest/util.go b/pkg/controller/controllertest/util.go
@@ -106,3 +106,8 @@ func (f *FakeInformer) GetController() cache.Controller {
 func (f *FakeInformer) LastSyncResourceVersion() string {
 	return ""
 }
+
+// SetWatchErrorHandler does nothing.  TODO(community): Implement this.
+func (f *FakeInformer) SetWatchErrorHandler(cache.WatchErrorHandler) error {
+	return nil
+}
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.InfoLogger { return f }
+func (f *fakeLogger) Enabled() bool         { return true }
+func (f *fakeLogger) V(lvl int) logr.Logger { 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.InfoLogger
+// Info implements logr.Logger
 func (NullLogger) Info(_ string, _ ...interface{}) {
 	// Do nothing.
 }
 
-// Enabled implements logr.InfoLogger
+// Enabled implements logr.Logger
 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.InfoLogger {
+func (log NullLogger) V(_ int) logr.Logger {
 	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.InfoLogger { return f }
+func (f *fakeLogger) Enabled() bool         { return true }
+func (f *fakeLogger) V(lvl int) logr.Logger { return f }
 
 var _ = Describe("Zap options setup", func() {
 	var opts *Options

Original file line number	Diff line number	Diff line change
`@@ -106,3 +106,8 @@ func (f *FakeInformer) GetController() cache.Controller {`
`106`	`106`	`func (f *FakeInformer) LastSyncResourceVersion() string {`
`107`	`107`	`return ""`
`108`	`108`	`}`
	`109`	`+`
	`110`	`+// SetWatchErrorHandler does nothing. TODO(community): Implement this.`
	`111`	`+func (f *FakeInformer) SetWatchErrorHandler(cache.WatchErrorHandler) error {`
	`112`	`+ return nil`
	`113`	`+}`
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.InfoLogger { return f }`
	`88`	`+func (f *fakeLogger) Enabled() bool { return true }`
	`89`	`+func (f *fakeLogger) V(lvl int) logr.Logger { 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.InfoLogger`
	`32`	`+// Info implements logr.Logger`
`33`	`33`	`func (NullLogger) Info(_ string, _ ...interface{}) {`
`34`	`34`	`// Do nothing.`
`35`	`35`	`}`
`36`	`36`
`37`		`-// Enabled implements logr.InfoLogger`
	`37`	`+// Enabled implements logr.Logger`
`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.InfoLogger {`
	`48`	`+func (log NullLogger) V(_ int) logr.Logger {`
`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.InfoLogger { return f }`
	`118`	`+func (f *fakeLogger) Enabled() bool { return true }`
	`119`	`+func (f *fakeLogger) V(lvl int) logr.Logger { return f }`
`120`	`120`
`121`	`121`	`var _ = Describe("Zap options setup", func() {`
`122`	`122`	`var opts *Options`