fix(pkg/cmd): injecting factory also for delete and attach commands

iovisor · Nov 25, 2018 · eb190ff · eb190ff
1 parent 753a142
commit eb190ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/pkg/cmd/attach.go b/pkg/cmd/attach.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/fntlnz/kubectl-trace/pkg/factory"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
-	// "k8s.io/kubernetes/pkg/kubectl/util/templates"
 )
 
 var (
@@ -20,7 +20,7 @@ var (
   %[1]s trace attach -h
 
   # ...
-  %[1]s trace (...) attach`
+  %[1]s trace attach`
 )
 
 // AttachOptions ...
@@ -36,7 +36,7 @@ func NewAttachOptions(streams genericclioptions.IOStreams) *AttachOptions {
 }
 
 // NewAttachCommand provides the attach command wrapping AttachOptions.
-func NewAttachCommand(streams genericclioptions.IOStreams) *cobra.Command {
+func NewAttachCommand(factory factory.Factory, streams genericclioptions.IOStreams) *cobra.Command {
 	o := NewAttachOptions(streams)
 
 	cmd := &cobra.Command{

diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/fntlnz/kubectl-trace/pkg/factory"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	// "k8s.io/kubernetes/pkg/kubectl/util/templates"
@@ -35,15 +36,15 @@ func NewDeleteOptions(streams genericclioptions.IOStreams) *DeleteOptions {
 }
 
 // NewDeleteCommand provides the delete command wrapping DeleteOptions.
-func NewDeleteCommand(streams genericclioptions.IOStreams) *cobra.Command {
+func NewDeleteCommand(factory factory.Factory, streams genericclioptions.IOStreams) *cobra.Command {
 	o := NewDeleteOptions(streams)
 
 	cmd := &cobra.Command{
 		Use:     "delete TRACE_ID",
 		Short:   deleteShort,
 		Long:    deleteLong,                             // Wrap with templates.LongDesc()
 		Example: fmt.Sprintf(deleteExamples, "kubectl"), // Wrap with templates.Examples()
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(c *cobra.Command, args []string) {
 			fmt.Println("delete")
 			spew.Dump(o)
 		},

diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
@@ -127,9 +127,9 @@ func (o *RunOptions) Validate(cmd *cobra.Command, args []string) error {
 	// todo > complete validation
 	// - make errors
 	// - make validators
-	if len(o.container) == 0 {
-		return fmt.Errorf("invalid container")
-	}
+	// if len(o.container) == 0 {
+	// 	return fmt.Errorf("invalid container")
+	// }
 
 	return nil
 }

diff --git a/pkg/cmd/trace.go b/pkg/cmd/trace.go
@@ -74,8 +74,8 @@ func NewTraceCommand(streams genericclioptions.IOStreams) *cobra.Command {
 
 	cmd.AddCommand(NewRunCommand(f, streams))
 	cmd.AddCommand(NewGetCommand(f, streams))
-	cmd.AddCommand(NewAttachCommand(streams))
-	cmd.AddCommand(NewDeleteCommand(streams))
+	cmd.AddCommand(NewAttachCommand(f, streams))
+	cmd.AddCommand(NewDeleteCommand(f, streams))
 
 	return cmd
 }