Adding ability to handle logging plugin logs on debug flag (#38)

* Adding ability to handle logging plugin logs on debug flag * setting up crane to pin to particular crane-lib versions
migtools · Sep 27, 2021 · 297b8fa · 297b8fa
1 parent c63a54b
commit 297b8fa
Show file tree

Hide file tree

Showing 7 changed files with 336 additions and 87 deletions.
diff --git a/cmd/transfer-pvc/transfer-pvc.go b/cmd/transfer-pvc/transfer-pvc.go
@@ -261,7 +261,7 @@ func (t *TransferPVCOptions) run() error {
 		log.Fatal(err, "error creating stunnel client")
 	}
 
-	s, err = stunnel.GetTransportFromKubeObjects(srcClient, destClient, s.NamespacedNamePair(), e)
+	s, err = stunnel.GetTransportFromKubeObjects(srcClient, destClient, s.NamespacedNamePair(), e, &transport.Options{})
 	if err != nil {
 		log.Fatal(err, "error creating from kube objects")
 	} else {

diff --git a/cmd/transform/listplugins/listplugins.go b/cmd/transform/listplugins/listplugins.go
@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/konveyor/crane/internal/flags"
 	"github.com/konveyor/crane/internal/plugin"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 type Options struct {
-	logger            logrus.FieldLogger
-	PluginDir         string
-	SkipPlugins       string
+	globalFlags *flags.GlobalFlags
+	PluginDir   string
+	SkipPlugins string
 }
 
 func (o *Options) Complete(c *cobra.Command, args []string) error {
@@ -29,9 +29,9 @@ func (o *Options) Run() error {
 	return o.run()
 }
 
-func NewListPluginsCommand() *cobra.Command {
+func NewListPluginsCommand(f *flags.GlobalFlags) *cobra.Command {
 	o := &Options{
-		logger: logrus.New(),
+		globalFlags: f,
 	}
 	cmd := &cobra.Command{
 		Use:   "list-plugins",
@@ -67,7 +67,9 @@ func (o *Options) run() error {
 		return err
 	}
 
-	plugins, err := plugin.GetFilteredPlugins(pluginDir, o.SkipPlugins)
+	log := o.globalFlags.GetLogger()
+
+	plugins, err := plugin.GetFilteredPlugins(pluginDir, o.SkipPlugins, log)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/transform/optionals/optionals.go b/cmd/transform/optionals/optionals.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/konveyor/crane/internal/flags"
 	"github.com/konveyor/crane/internal/plugin"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 type Options struct {
-	logger      logrus.FieldLogger
+	globalFlags *flags.GlobalFlags
 	PluginDir   string
 	SkipPlugins string
 }
@@ -29,9 +29,9 @@ func (o *Options) Run() error {
 	return o.run()
 }
 
-func NewOptionalsCommand() *cobra.Command {
+func NewOptionalsCommand(f *flags.GlobalFlags) *cobra.Command {
 	o := &Options{
-		logger: logrus.New(),
+		globalFlags: f,
 	}
 	cmd := &cobra.Command{
 		Use:   "optionals",
@@ -66,8 +66,9 @@ func (o *Options) run() error {
 	if err != nil {
 		return err
 	}
+	log := o.globalFlags.GetLogger()
 
-	plugins, err := plugin.GetFilteredPlugins(pluginDir, o.SkipPlugins)
+	plugins, err := plugin.GetFilteredPlugins(pluginDir, o.SkipPlugins, log)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/transform/transform.go b/cmd/transform/transform.go
@@ -63,8 +63,8 @@ func NewTransformCommand(f *flags.GlobalFlags) *cobra.Command {
 		},
 	}
 
-	cmd.AddCommand(optionals.NewOptionalsCommand())
-	cmd.AddCommand(listplugins.NewListPluginsCommand())
+	cmd.AddCommand(optionals.NewOptionalsCommand(f))
+	cmd.AddCommand(listplugins.NewListPluginsCommand(f))
 	addFlagsForOptions(o, cmd)
 
 	return cmd
@@ -107,7 +107,7 @@ func (o *Options) run() error {
 		}
 	}
 
-	plugins, err := plugin.GetFilteredPlugins(pluginDir, o.SkipPlugins)
+	plugins, err := plugin.GetFilteredPlugins(pluginDir, o.SkipPlugins, log)
 	if err != nil {
 		return err
 	}

diff --git a/go.mod b/go.mod
@@ -3,15 +3,15 @@ module github.com/konveyor/crane
 go 1.16
 
 require (
-	github.com/konveyor/crane-lib v0.0.0-20210811180027-d1409c9df453
+	github.com/konveyor/crane-lib v0.0.1
 	github.com/openshift/api v0.0.0-20210625082935-ad54d363d274
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.1.3
-	github.com/vmware-tanzu/velero v1.6.0
-	k8s.io/api v0.21.2
-	k8s.io/apimachinery v0.21.3
-	k8s.io/cli-runtime v0.21.0
-	k8s.io/client-go v0.21.2
-	sigs.k8s.io/controller-runtime v0.9.2
-	sigs.k8s.io/yaml v1.2.0
+	github.com/spf13/cobra v1.2.1
+	github.com/vmware-tanzu/velero v1.6.3
+	k8s.io/api v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/cli-runtime v0.22.2
+	k8s.io/client-go v0.22.2
+	sigs.k8s.io/controller-runtime v0.10.1
+	sigs.k8s.io/yaml v1.3.0
 )