From bef0a4cca77b299347305e9283a4e7a63aa67126 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Sun, 12 Apr 2020 18:19:38 -0700 Subject: [PATCH] Move kubeconfig utility to a shared pkg Signed-off-by: Ahmet Alp Balkan --- cmd/kubectx/current.go | 2 +- cmd/kubectx/delete.go | 2 +- cmd/kubectx/kubeconfig.go | 2 +- cmd/kubectx/list.go | 2 +- cmd/kubectx/rename.go | 2 +- cmd/kubectx/switch.go | 2 +- cmd/kubectx/unset.go | 4 ++-- {cmd/kubectx => internal}/kubeconfig/contextmodify.go | 0 {cmd/kubectx => internal}/kubeconfig/contextmodify_test.go | 0 {cmd/kubectx => internal}/kubeconfig/contexts.go | 0 {cmd/kubectx => internal}/kubeconfig/contexts_test.go | 0 {cmd/kubectx => internal}/kubeconfig/currentcontext.go | 0 {cmd/kubectx => internal}/kubeconfig/currentcontext_test.go | 0 {cmd/kubectx => internal}/kubeconfig/helpers_test.go | 0 {cmd/kubectx => internal}/kubeconfig/kubeconfig.go | 0 {cmd/kubectx => internal}/kubeconfig/kubeconfig_test.go | 0 16 files changed, 8 insertions(+), 8 deletions(-) rename {cmd/kubectx => internal}/kubeconfig/contextmodify.go (100%) rename {cmd/kubectx => internal}/kubeconfig/contextmodify_test.go (100%) rename {cmd/kubectx => internal}/kubeconfig/contexts.go (100%) rename {cmd/kubectx => internal}/kubeconfig/contexts_test.go (100%) rename {cmd/kubectx => internal}/kubeconfig/currentcontext.go (100%) rename {cmd/kubectx => internal}/kubeconfig/currentcontext_test.go (100%) rename {cmd/kubectx => internal}/kubeconfig/helpers_test.go (100%) rename {cmd/kubectx => internal}/kubeconfig/kubeconfig.go (100%) rename {cmd/kubectx => internal}/kubeconfig/kubeconfig_test.go (100%) diff --git a/cmd/kubectx/current.go b/cmd/kubectx/current.go index a8e44bb..6155136 100644 --- a/cmd/kubectx/current.go +++ b/cmd/kubectx/current.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/ahmetb/kubectx/cmd/kubectx/kubeconfig" + "github.com/ahmetb/kubectx/internal/kubeconfig" ) // CurrentOp prints the current context diff --git a/cmd/kubectx/delete.go b/cmd/kubectx/delete.go index 4b0e784..85f35a0 100644 --- a/cmd/kubectx/delete.go +++ b/cmd/kubectx/delete.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/ahmetb/kubectx/cmd/kubectx/kubeconfig" + "github.com/ahmetb/kubectx/internal/kubeconfig" ) // DeleteOp indicates intention to delete contexts. diff --git a/cmd/kubectx/kubeconfig.go b/cmd/kubectx/kubeconfig.go index b528adf..3bcf9f7 100644 --- a/cmd/kubectx/kubeconfig.go +++ b/cmd/kubectx/kubeconfig.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/ahmetb/kubectx/cmd/kubectx/kubeconfig" + "github.com/ahmetb/kubectx/internal/kubeconfig" ) var ( diff --git a/cmd/kubectx/list.go b/cmd/kubectx/list.go index 13f780b..e3d28b7 100644 --- a/cmd/kubectx/list.go +++ b/cmd/kubectx/list.go @@ -8,7 +8,7 @@ import ( "github.com/fatih/color" "github.com/pkg/errors" - "github.com/ahmetb/kubectx/cmd/kubectx/kubeconfig" + "github.com/ahmetb/kubectx/internal/kubeconfig" ) // ListOp describes listing contexts. diff --git a/cmd/kubectx/rename.go b/cmd/kubectx/rename.go index 1320439..b564e98 100644 --- a/cmd/kubectx/rename.go +++ b/cmd/kubectx/rename.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/ahmetb/kubectx/cmd/kubectx/kubeconfig" + "github.com/ahmetb/kubectx/internal/kubeconfig" ) // RenameOp indicates intention to rename contexts. diff --git a/cmd/kubectx/switch.go b/cmd/kubectx/switch.go index bc64b46..f5087b8 100644 --- a/cmd/kubectx/switch.go +++ b/cmd/kubectx/switch.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/ahmetb/kubectx/cmd/kubectx/kubeconfig" + "github.com/ahmetb/kubectx/internal/kubeconfig" ) // SwitchOp indicates intention to switch contexts. diff --git a/cmd/kubectx/unset.go b/cmd/kubectx/unset.go index ff985f9..ee97037 100644 --- a/cmd/kubectx/unset.go +++ b/cmd/kubectx/unset.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/ahmetb/kubectx/cmd/kubectx/kubeconfig" + "github.com/ahmetb/kubectx/internal/kubeconfig" ) // UnsetOp indicates intention to remove current-context preference. @@ -26,6 +26,6 @@ func (_ UnsetOp) Run(_, stderr io.Writer) error { return errors.Wrap(err, "failed to save kubeconfig file after modification") } - _, err := fmt.Fprintln(stderr, "Successfully unset the current context") + _, err := fmt.Fprintln(stderr, "Successfully unset the active context for kubectl.") return errors.Wrap(err, "write error") } diff --git a/cmd/kubectx/kubeconfig/contextmodify.go b/internal/kubeconfig/contextmodify.go similarity index 100% rename from cmd/kubectx/kubeconfig/contextmodify.go rename to internal/kubeconfig/contextmodify.go diff --git a/cmd/kubectx/kubeconfig/contextmodify_test.go b/internal/kubeconfig/contextmodify_test.go similarity index 100% rename from cmd/kubectx/kubeconfig/contextmodify_test.go rename to internal/kubeconfig/contextmodify_test.go diff --git a/cmd/kubectx/kubeconfig/contexts.go b/internal/kubeconfig/contexts.go similarity index 100% rename from cmd/kubectx/kubeconfig/contexts.go rename to internal/kubeconfig/contexts.go diff --git a/cmd/kubectx/kubeconfig/contexts_test.go b/internal/kubeconfig/contexts_test.go similarity index 100% rename from cmd/kubectx/kubeconfig/contexts_test.go rename to internal/kubeconfig/contexts_test.go diff --git a/cmd/kubectx/kubeconfig/currentcontext.go b/internal/kubeconfig/currentcontext.go similarity index 100% rename from cmd/kubectx/kubeconfig/currentcontext.go rename to internal/kubeconfig/currentcontext.go diff --git a/cmd/kubectx/kubeconfig/currentcontext_test.go b/internal/kubeconfig/currentcontext_test.go similarity index 100% rename from cmd/kubectx/kubeconfig/currentcontext_test.go rename to internal/kubeconfig/currentcontext_test.go diff --git a/cmd/kubectx/kubeconfig/helpers_test.go b/internal/kubeconfig/helpers_test.go similarity index 100% rename from cmd/kubectx/kubeconfig/helpers_test.go rename to internal/kubeconfig/helpers_test.go diff --git a/cmd/kubectx/kubeconfig/kubeconfig.go b/internal/kubeconfig/kubeconfig.go similarity index 100% rename from cmd/kubectx/kubeconfig/kubeconfig.go rename to internal/kubeconfig/kubeconfig.go diff --git a/cmd/kubectx/kubeconfig/kubeconfig_test.go b/internal/kubeconfig/kubeconfig_test.go similarity index 100% rename from cmd/kubectx/kubeconfig/kubeconfig_test.go rename to internal/kubeconfig/kubeconfig_test.go