✨ Add predefined functional options for log/zap

Author: hasbro17

pkg/log/zap/zap.go

@@ -43,9 +43,7 @@ func New(opts ...Opts) logr.Logger {
 //
 // Deprecated, use New() and the functional opts pattern instead:
 //
-// New(func(o *Options){
-//    o.Development: development,
-// })
+// New(Development(true))
 func Logger(development bool) logr.Logger {
 	return LoggerTo(os.Stderr, development)
 }
@@ -56,10 +54,7 @@ func Logger(development bool) logr.Logger {
 //
 // Deprecated, use New() and the functional opts pattern instead:
 //
-// New(func(o *Options){
-//    o.Development: development,
-//    o.DestWriter: writer,
-// })
+// New(Development(development), DestWritter(destWriter))
 func LoggerTo(destWriter io.Writer, development bool) logr.Logger {
 	return zapr.NewLogger(RawLoggerTo(destWriter, development))
 }
@@ -69,16 +64,9 @@ func LoggerTo(destWriter io.Writer, development bool) logr.Logger {
 //
 // Deprecated, use NewRaw() and the functional opts pattern instead:
 //
-// NewRaw(func(o *Options){
-//    o.Development: development,
-// })
+// NewRaw(Development(development), DestWritter(destWriter), ZapOpts(opts))
 func RawLoggerTo(destWriter io.Writer, development bool, opts ...zap.Option) *zap.Logger {
-	o := func(o *Options) {
-		o.DestWritter = destWriter
-		o.Development = development
-		o.ZapOpts = opts
-	}
-	return NewRaw(o)
+	return NewRaw(Development(development), DestWritter(destWriter), ZapOpts(opts))
 }
 
 // Opts allows to manipulate Options
@@ -149,6 +137,48 @@ func (o *Options) addDefaults() {
 	o.ZapOpts = append(o.ZapOpts, zap.AddStacktrace(o.StacktraceLevel))
 }
 
+// Development sets the Development option for the logger
+func Development(development bool) func(o *Options) {
+	return func(o *Options) {
+		o.Development = development
+	}
+}
+
+// Encoder sets the Encoder option for the logger
+func Encoder(encoder zapcore.Encoder) func(o *Options) {
+	return func(o *Options) {
+		o.Encoder = encoder
+	}
+}
+
+// DestWritter sets the DestWritter option for the logger
+func DestWritter(destWriter io.Writer) func(o *Options) {
+	return func(o *Options) {
+		o.DestWritter = destWriter
+	}
+}
+
+// Level sets the Level option for the logger
+func Level(level *zap.AtomicLevel) func(o *Options) {
+	return func(o *Options) {
+		o.Level = level
+	}
+}
+
+// StacktraceLevel sets the StacktraceLevel option for the logger
+func StacktraceLevel(stacktraceLevel *zap.AtomicLevel) func(o *Options) {
+	return func(o *Options) {
+		o.StacktraceLevel = stacktraceLevel
+	}
+}
+
+// ZapOpts appends zapOpts to the raw zap.Options option of the logger
+func ZapOpts(zapOpts []zap.Option) func(o *Options) {
+	return func(o *Options) {
+		o.ZapOpts = append(o.ZapOpts, zapOpts...)
+	}
+}
+
 // NewRaw returns a new zap.Logger configured with the passed Opts
 // or their defaults. It uses KubeAwareEncoder which adds Type
 // information and Namespace/Name to the log.