Flags supported added

Author: bharathi-tenneti

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/onsi/gomega v1.8.1
 	github.com/prometheus/client_golang v1.0.0
 	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
+	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.10.0
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
@@ -22,6 +23,7 @@ require (
 	k8s.io/apiextensions-apiserver v0.17.2
 	k8s.io/apimachinery v0.17.2
 	k8s.io/client-go v0.17.2
+	k8s.io/klog v1.0.0
 	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
 	sigs.k8s.io/yaml v1.1.0
 )

pkg/log/zap/flags.go

@@ -0,0 +1,121 @@
+// Copyright 2019 The Operator-SDK Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package zap
+
+import (
+	"flag"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"k8s.io/klog"
+)
+
+type encoderConfigFunc func(*zapcore.EncoderConfig)
+
+type encoderValue struct {
+	set        bool
+	newEncoder zapcore.Encoder
+	str        string
+}
+
+func (v *encoderValue) Set(e string) error {
+	v.set = true
+	if e == "json" || e == "console" {
+		v.newEncoder = newEncoder(e)
+	} else {
+		return fmt.Errorf("unknown encoder \"%s\"", e)
+	}
+	v.str = e
+	return nil
+}
+
+func (v encoderValue) String() string {
+	return v.str
+}
+
+func (v encoderValue) Type() string {
+	return "encoder"
+}
+
+func newEncoder(e string, ecfs ...encoderConfigFunc) zapcore.Encoder {
+	if e == "json" {
+		encoderConfig := zap.NewProductionEncoderConfig()
+		for _, f := range ecfs {
+			f(&encoderConfig)
+		}
+		fmt.Println("HERE WITH JSON")
+		return zapcore.NewJSONEncoder(encoderConfig)
+	} else {
+		encoderConfig := zap.NewDevelopmentEncoderConfig()
+		for _, f := range ecfs {
+			f(&encoderConfig)
+		}
+		fmt.Println("HERE WITH CONSOLE")
+		return zapcore.NewConsoleEncoder(encoderConfig)
+	}
+
+}
+
+type levelValue struct {
+	set   bool
+	level zap.AtomicLevel
+}
+
+func (v *levelValue) Set(l string) error {
+	v.set = true
+	lower := strings.ToLower(l)
+	var lvl int
+	switch lower {
+	case "debug":
+		lvl = -1
+	case "info":
+		lvl = 0
+	case "error":
+		lvl = 2
+	default:
+		i, err := strconv.Atoi(lower)
+		if err != nil {
+			return fmt.Errorf("invalid log level \"%s\"", l)
+		}
+
+		if i > 0 {
+			lvl = -1 * i
+		} else {
+			return fmt.Errorf("NO LIKEY log level \"%s\"", l)
+		}
+	}
+	v.level.SetLevel(zapcore.Level(int8(lvl)))
+	// If log level is greater than debug, set glog/klog level to that level.
+	if lvl < -3 {
+		fs := flag.NewFlagSet("", flag.ContinueOnError)
+		klog.InitFlags(fs)
+		err := fs.Set("v", fmt.Sprintf("%v", -1*lvl))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (v levelValue) String() string {
+	return v.level.String()
+}
+
+func (v levelValue) Type() string {
+	return "level"
+}

pkg/log/zap/zap.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zapr"
+	"github.com/spf13/pflag"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -207,3 +208,23 @@ func NewRaw(opts ...Opts) *zap.Logger {
 	log = log.WithOptions(o.ZapOpts...)
 	return log
 }
+
+// BindToFlagSet
+func (o *Options) BindFlags(fs *pflag.FlagSet) {
+	// Set Encoder value
+	encval := encoderValue{newEncoder: o.Encoder}
+	fs.Var(&encval, "encoder-value", "json||console")
+	o.Encoder = encval.newEncoder
+
+	// Set the log level
+	lv := levelValue{level: zap.NewAtomicLevel()}
+	fs.Var(&lv, "log-level", "Log level")
+	o.Level = &lv.level
+}
+
+func UseNewOptions(in *Options) func(o *Options) {
+	return func(o *Options) {
+		*o = *in
+		o.addDefaults()
+	}
+}