[cherry-pick] Use klog/v2 (#969) (#973)

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: 1gtm

cmd/stash-mongodb/main.go

@@ -23,21 +23,22 @@ import (
 	_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
 	"stash.appscode.dev/mongodb/pkg"
 
-	"gomodules.xyz/kglog"
+	"gomodules.xyz/logs"
 	_ "k8s.io/client-go/kubernetes/fake"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/klog/v2"
 )
 
 func main() {
-	kglog.InitLogs()
-	defer kglog.FlushLogs()
+	rootCmd := pkg.NewRootCmd()
+	logs.Init(rootCmd, true)
+	defer logs.FlushLogs()
 
 	if len(os.Getenv("GOMAXPROCS")) == 0 {
 		runtime.GOMAXPROCS(runtime.NumCPU())
 	}
 
-	if err := pkg.NewRootCmd().Execute(); err != nil {
+	if err := rootCmd.Execute(); err != nil {
 		klog.Fatalln("error:", err)
 	}
 }

go.mod

@@ -3,26 +3,26 @@ module stash.appscode.dev/mongodb
 go 1.15
 
 require (
-	github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
+	cloud.google.com/go v0.58.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.1.3
 	go.bytebuilders.dev/license-verifier/kubernetes v0.9.1
-	gomodules.xyz/kglog v0.0.1
+	gomodules.xyz/flags v0.1.0
+	gomodules.xyz/go-sh v0.1.0
+	gomodules.xyz/logs v0.0.2
 	gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
-	gomodules.xyz/x v0.0.4
+	gomodules.xyz/x v0.0.5
 	k8s.io/api v0.21.0
 	k8s.io/apimachinery v0.21.0
 	k8s.io/client-go v0.21.0
 	k8s.io/klog/v2 v2.8.0
-	kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e
-	kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690
+	kmodules.xyz/client-go v0.0.0-20210605021217-cabaee7b953e
+	kmodules.xyz/custom-resources v0.0.0-20210605111625-741fcb992541
 	kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5
-	kubedb.dev/apimachinery v0.18.1-0.20210506003355-e982e5902ad2
-	stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593
+	kubedb.dev/apimachinery v0.18.1-0.20210605201001-29627ec663dc
+	stash.appscode.dev/apimachinery v0.13.1-0.20210605201829-a382bbe2f22a
 )
 
-replace go.mongodb.org/mongo-driver => github.com/appscode/mongo-go-driver v1.4.0-beta2.0.20210223075318-951c8933c59c
-
 replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
 
 replace cloud.google.com/go => cloud.google.com/go v0.54.0
@@ -127,6 +127,4 @@ replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20
 
 replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 
-replace kmodules.xyz/resource-metadata => kmodules.xyz/resource-metadata v0.5.0
-
 replace sigs.k8s.io/application => github.com/kmodules/application v0.8.4-0.20210427030912-90eeee3bc4ad

go.sum

@@ -36,12 +36,12 @@ import (
 	"stash.appscode.dev/apimachinery/pkg/restic"
 	api_util "stash.appscode.dev/apimachinery/pkg/util"
 
-	"github.com/codeskyblue/go-sh"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	license "go.bytebuilders.dev/license-verifier/kubernetes"
+	"gomodules.xyz/flags"
+	"gomodules.xyz/go-sh"
 	"gomodules.xyz/pointer"
-	"gomodules.xyz/x/flags"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"

pkg/backup.go

@@ -33,8 +33,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	license "go.bytebuilders.dev/license-verifier/kubernetes"
+	"gomodules.xyz/flags"
 	"gomodules.xyz/pointer"
-	"gomodules.xyz/x/flags"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"

pkg/restore.go

@@ -17,13 +17,9 @@ limitations under the License.
 package pkg
 
 import (
-	"flag"
-
 	"stash.appscode.dev/apimachinery/client/clientset/versioned/scheme"
 
 	"github.com/spf13/cobra"
-	"gomodules.xyz/kglog"
-	"gomodules.xyz/x/flags"
 	v "gomodules.xyz/x/version"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
 	"kmodules.xyz/client-go/tools/cli"
@@ -40,14 +36,11 @@ func NewRootCmd() *cobra.Command {
 		Long:              `MongoDB backup & restore plugin for Stash by AppsCode. For more information, visit here: https://appscode.com/products/stash`,
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(c *cobra.Command, args []string) error {
-			flags.DumpAll(c.Flags())
 			cli.SendAnalytics(c, v.Version.Version)
 
 			return scheme.AddToScheme(clientsetscheme.Scheme)
 		},
 	}
-	rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
-	kglog.ParseFlags()
 	rootCmd.PersistentFlags().StringVar(&licenseApiService, "license-apiservice", "", "Name of ApiService used to expose License endpoint")
 	rootCmd.PersistentFlags().BoolVar(&cli.EnableAnalytics, "enable-analytics", cli.EnableAnalytics, "Send analytical events to Google Analytics")