chore(lint): modernize Go (#7536)

Use modern Go constructs through the modernize analyzer from the
golang.org/x/tools package.

Signed-off-by: Ville Vesilehto <ville@vesilehto.fi>

plugin/pkg/log/listener.go

@@ -9,16 +9,16 @@ import (
 // A usage example is, the external plugin k8s_event will replicate log prints to Kubernetes events.
 type Listener interface {
 	Name() string
-	Debug(plugin string, v ...interface{})
-	Debugf(plugin string, format string, v ...interface{})
-	Info(plugin string, v ...interface{})
-	Infof(plugin string, format string, v ...interface{})
-	Warning(plugin string, v ...interface{})
-	Warningf(plugin string, format string, v ...interface{})
-	Error(plugin string, v ...interface{})
-	Errorf(plugin string, format string, v ...interface{})
-	Fatal(plugin string, v ...interface{})
-	Fatalf(plugin string, format string, v ...interface{})
+	Debug(plugin string, v ...any)
+	Debugf(plugin string, format string, v ...any)
+	Info(plugin string, v ...any)
+	Infof(plugin string, format string, v ...any)
+	Warning(plugin string, v ...any)
+	Warningf(plugin string, format string, v ...any)
+	Error(plugin string, v ...any)
+	Errorf(plugin string, format string, v ...any)
+	Fatal(plugin string, v ...any)
+	Fatalf(plugin string, format string, v ...any)
 }
 
 type listeners struct {
@@ -60,7 +60,7 @@ func DeregisterListener(old Listener) error {
 	return nil
 }
 
-func (ls *listeners) debug(plugin string, v ...interface{}) {
+func (ls *listeners) debug(plugin string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Debug(plugin, v...)
@@ -68,7 +68,7 @@ func (ls *listeners) debug(plugin string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) debugf(plugin string, format string, v ...interface{}) {
+func (ls *listeners) debugf(plugin string, format string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Debugf(plugin, format, v...)
@@ -76,7 +76,7 @@ func (ls *listeners) debugf(plugin string, format string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) info(plugin string, v ...interface{}) {
+func (ls *listeners) info(plugin string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Info(plugin, v...)
@@ -84,7 +84,7 @@ func (ls *listeners) info(plugin string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) infof(plugin string, format string, v ...interface{}) {
+func (ls *listeners) infof(plugin string, format string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Infof(plugin, format, v...)
@@ -92,7 +92,7 @@ func (ls *listeners) infof(plugin string, format string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) warning(plugin string, v ...interface{}) {
+func (ls *listeners) warning(plugin string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Warning(plugin, v...)
@@ -100,7 +100,7 @@ func (ls *listeners) warning(plugin string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) warningf(plugin string, format string, v ...interface{}) {
+func (ls *listeners) warningf(plugin string, format string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Warningf(plugin, format, v...)
@@ -108,7 +108,7 @@ func (ls *listeners) warningf(plugin string, format string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) error(plugin string, v ...interface{}) {
+func (ls *listeners) error(plugin string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Error(plugin, v...)
@@ -116,7 +116,7 @@ func (ls *listeners) error(plugin string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) errorf(plugin string, format string, v ...interface{}) {
+func (ls *listeners) errorf(plugin string, format string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Errorf(plugin, format, v...)
@@ -124,7 +124,7 @@ func (ls *listeners) errorf(plugin string, format string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) fatal(plugin string, v ...interface{}) {
+func (ls *listeners) fatal(plugin string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Fatal(plugin, v...)
@@ -132,7 +132,7 @@ func (ls *listeners) fatal(plugin string, v ...interface{}) {
 	ls.RUnlock()
 }
 
-func (ls *listeners) fatalf(plugin string, format string, v ...interface{}) {
+func (ls *listeners) fatalf(plugin string, format string, v ...any) {
 	ls.RLock()
 	for _, l := range ls.listeners {
 		l.Fatalf(plugin, format, v...)

plugin/pkg/log/listener_test.go

@@ -80,42 +80,42 @@ func (l *mockListener) Name() string {
 	return l.name
 }
 
-func (l *mockListener) Debug(plugin string, v ...interface{}) {
+func (l *mockListener) Debug(plugin string, v ...any) {
 	log(debug, l.name+" mocked debug")
 }
 
-func (l *mockListener) Debugf(plugin string, format string, v ...interface{}) {
+func (l *mockListener) Debugf(plugin string, format string, v ...any) {
 	log(debug, l.name+" mocked debug")
 }
 
-func (l *mockListener) Info(plugin string, v ...interface{}) {
+func (l *mockListener) Info(plugin string, v ...any) {
 	log(info, l.name+" mocked info")
 }
 
-func (l *mockListener) Infof(plugin string, format string, v ...interface{}) {
+func (l *mockListener) Infof(plugin string, format string, v ...any) {
 	log(info, l.name+" mocked info")
 }
 
-func (l *mockListener) Warning(plugin string, v ...interface{}) {
+func (l *mockListener) Warning(plugin string, v ...any) {
 	log(warning, l.name+" mocked warning")
 }
 
-func (l *mockListener) Warningf(plugin string, format string, v ...interface{}) {
+func (l *mockListener) Warningf(plugin string, format string, v ...any) {
 	log(warning, l.name+" mocked warning")
 }
 
-func (l *mockListener) Error(plugin string, v ...interface{}) {
+func (l *mockListener) Error(plugin string, v ...any) {
 	log(err, l.name+" mocked error")
 }
 
-func (l *mockListener) Errorf(plugin string, format string, v ...interface{}) {
+func (l *mockListener) Errorf(plugin string, format string, v ...any) {
 	log(err, l.name+" mocked error")
 }
 
-func (l *mockListener) Fatal(plugin string, v ...interface{}) {
+func (l *mockListener) Fatal(plugin string, v ...any) {
 	log(fatal, l.name+" mocked fatal")
 }
 
-func (l *mockListener) Fatalf(plugin string, format string, v ...interface{}) {
+func (l *mockListener) Fatalf(plugin string, format string, v ...any) {
 	log(fatal, l.name+" mocked fatal")
 }

plugin/pkg/log/log.go

@@ -40,18 +40,18 @@ func (d *d) Value() bool {
 }
 
 // logf calls log.Printf prefixed with level.
-func logf(level, format string, v ...interface{}) {
+func logf(level, format string, v ...any) {
 	golog.Print(level, fmt.Sprintf(format, v...))
 }
 
 // log calls log.Print prefixed with level.
-func log(level string, v ...interface{}) {
+func log(level string, v ...any) {
 	golog.Print(level, fmt.Sprint(v...))
 }
 
 // Debug is equivalent to log.Print(), but prefixed with "[DEBUG] ". It only outputs something
 // if D is true.
-func Debug(v ...interface{}) {
+func Debug(v ...any) {
 	if !D.Value() {
 		return
 	}
@@ -60,7 +60,7 @@ func Debug(v ...interface{}) {
 
 // Debugf is equivalent to log.Printf(), but prefixed with "[DEBUG] ". It only outputs something
 // if D is true.
-func Debugf(format string, v ...interface{}) {
+func Debugf(format string, v ...any) {
 	if !D.Value() {
 		return
 	}
@@ -68,30 +68,30 @@ func Debugf(format string, v ...interface{}) {
 }
 
 // Info is equivalent to log.Print, but prefixed with "[INFO] ".
-func Info(v ...interface{}) { log(info, v...) }
+func Info(v ...any) { log(info, v...) }
 
 // Infof is equivalent to log.Printf, but prefixed with "[INFO] ".
-func Infof(format string, v ...interface{}) { logf(info, format, v...) }
+func Infof(format string, v ...any) { logf(info, format, v...) }
 
 // Warning is equivalent to log.Print, but prefixed with "[WARNING] ".
-func Warning(v ...interface{}) { log(warning, v...) }
+func Warning(v ...any) { log(warning, v...) }
 
 // Warningf is equivalent to log.Printf, but prefixed with "[WARNING] ".
-func Warningf(format string, v ...interface{}) { logf(warning, format, v...) }
+func Warningf(format string, v ...any) { logf(warning, format, v...) }
 
 // Error is equivalent to log.Print, but prefixed with "[ERROR] ".
-func Error(v ...interface{}) { log(err, v...) }
+func Error(v ...any) { log(err, v...) }
 
 // Errorf is equivalent to log.Printf, but prefixed with "[ERROR] ".
-func Errorf(format string, v ...interface{}) { logf(err, format, v...) }
+func Errorf(format string, v ...any) { logf(err, format, v...) }
 
 // Fatal is equivalent to log.Print, but prefixed with "[FATAL] ", and calling
 // os.Exit(1).
-func Fatal(v ...interface{}) { log(fatal, v...); os.Exit(1) }
+func Fatal(v ...any) { log(fatal, v...); os.Exit(1) }
 
 // Fatalf is equivalent to log.Printf, but prefixed with "[FATAL] ", and calling
 // os.Exit(1)
-func Fatalf(format string, v ...interface{}) { logf(fatal, format, v...); os.Exit(1) }
+func Fatalf(format string, v ...any) { logf(fatal, format, v...); os.Exit(1) }
 
 // Discard sets the log output to /dev/null.
 func Discard() { golog.SetOutput(io.Discard) }

plugin/pkg/log/plugin.go

@@ -14,16 +14,16 @@ type P struct {
 // I.e [INFO] plugin/<name>: message.
 func NewWithPlugin(name string) P { return P{"plugin/" + name + ": "} }
 
-func (p P) logf(level, format string, v ...interface{}) {
+func (p P) logf(level, format string, v ...any) {
 	log(level, p.plugin, fmt.Sprintf(format, v...))
 }
 
-func (p P) log(level string, v ...interface{}) {
+func (p P) log(level string, v ...any) {
 	log(level+p.plugin, v...)
 }
 
 // Debug logs as log.Debug.
-func (p P) Debug(v ...interface{}) {
+func (p P) Debug(v ...any) {
 	if !D.Value() {
 		return
 	}
@@ -32,7 +32,7 @@ func (p P) Debug(v ...interface{}) {
 }
 
 // Debugf logs as log.Debugf.
-func (p P) Debugf(format string, v ...interface{}) {
+func (p P) Debugf(format string, v ...any) {
 	if !D.Value() {
 		return
 	}
@@ -41,50 +41,50 @@ func (p P) Debugf(format string, v ...interface{}) {
 }
 
 // Info logs as log.Info.
-func (p P) Info(v ...interface{}) {
+func (p P) Info(v ...any) {
 	ls.info(p.plugin, v...)
 	p.log(info, v...)
 }
 
 // Infof logs as log.Infof.
-func (p P) Infof(format string, v ...interface{}) {
+func (p P) Infof(format string, v ...any) {
 	ls.infof(p.plugin, format, v...)
 	p.logf(info, format, v...)
 }
 
 // Warning logs as log.Warning.
-func (p P) Warning(v ...interface{}) {
+func (p P) Warning(v ...any) {
 	ls.warning(p.plugin, v...)
 	p.log(warning, v...)
 }
 
 // Warningf logs as log.Warningf.
-func (p P) Warningf(format string, v ...interface{}) {
+func (p P) Warningf(format string, v ...any) {
 	ls.warningf(p.plugin, format, v...)
 	p.logf(warning, format, v...)
 }
 
 // Error logs as log.Error.
-func (p P) Error(v ...interface{}) {
+func (p P) Error(v ...any) {
 	ls.error(p.plugin, v...)
 	p.log(err, v...)
 }
 
 // Errorf logs as log.Errorf.
-func (p P) Errorf(format string, v ...interface{}) {
+func (p P) Errorf(format string, v ...any) {
 	ls.errorf(p.plugin, format, v...)
 	p.logf(err, format, v...)
 }
 
 // Fatal logs as log.Fatal and calls os.Exit(1).
-func (p P) Fatal(v ...interface{}) {
+func (p P) Fatal(v ...any) {
 	ls.fatal(p.plugin, v...)
 	p.log(fatal, v...)
 	os.Exit(1)
 }
 
 // Fatalf logs as log.Fatalf and calls os.Exit(1).
-func (p P) Fatalf(format string, v ...interface{}) {
+func (p P) Fatalf(format string, v ...any) {
 	ls.fatalf(p.plugin, format, v...)
 	p.logf(fatal, format, v...)
 	os.Exit(1)