From f4e91669f6b15739f6b3a431cc3dc37899542393 Mon Sep 17 00:00:00 2001 From: "Sean R. Sullivan" Date: Tue, 14 Apr 2020 23:36:02 -0700 Subject: [PATCH] Removes duplicate import; cleans up comment --- cmd/apply/cmdapply.go | 5 ++--- cmd/preview/cmdpreview.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cmd/apply/cmdapply.go b/cmd/apply/cmdapply.go index b00cc15..7d68f5e 100644 --- a/cmd/apply/cmdapply.go +++ b/cmd/apply/cmdapply.go @@ -10,14 +10,13 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "sigs.k8s.io/cli-utils/cmd/printers" "sigs.k8s.io/cli-utils/pkg/apply" ) -func GetApplyRunner(f util.Factory, ioStreams genericclioptions.IOStreams) *ApplyRunner { +func GetApplyRunner(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *ApplyRunner { r := &ApplyRunner{ applier: apply.NewApplier(f, ioStreams), ioStreams: ioStreams, @@ -52,7 +51,7 @@ func GetApplyRunner(f util.Factory, ioStreams genericclioptions.IOStreams) *Appl return r } -func ApplyCommand(f util.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { +func ApplyCommand(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { return GetApplyRunner(f, ioStreams).command } diff --git a/cmd/preview/cmdpreview.go b/cmd/preview/cmdpreview.go index 5a0e848..114d808 100644 --- a/cmd/preview/cmdpreview.go +++ b/cmd/preview/cmdpreview.go @@ -8,15 +8,14 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "sigs.k8s.io/cli-utils/pkg/apply" "sigs.k8s.io/cli-utils/pkg/apply/event" ) -// NewCmdApply creates the `apply` command -func NewCmdPreview(f util.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { +// NewCmdPreview creates the `preview` command +func NewCmdPreview(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { applier := apply.NewApplier(f, ioStreams) destroyer := apply.NewDestroyer(f, ioStreams)