From 40ace52c3743942a4dece7e3f91682f418483133 Mon Sep 17 00:00:00 2001 From: Jaipradeesh Janarthanan Date: Mon, 8 May 2017 12:57:21 +0530 Subject: [PATCH] [Fixes #2439] Trim trailing slash (if present) in state store value Signed-off-by: Jaipradeesh Janarthanan --- cmd/kops/root.go | 4 ++++ cmd/kops/util/factory.go | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/kops/root.go b/cmd/kops/root.go index 16b124f41f..39e96392b1 100644 --- a/cmd/kops/root.go +++ b/cmd/kops/root.go @@ -21,6 +21,7 @@ import ( "fmt" "io" "os" + "strings" "github.com/golang/glog" "github.com/spf13/cobra" @@ -95,6 +96,9 @@ func NewCmdRoot(f *util.Factory, out io.Writer) *cobra.Command { cmd.PersistentFlags().StringVar(&rootCommand.configFile, "config", "", "config file (default is $HOME/.kops.yaml)") defaultStateStore := os.Getenv("KOPS_STATE_STORE") + if strings.HasSuffix(defaultStateStore, "/") { + strings.TrimSuffix(defaultStateStore, "/") + } cmd.PersistentFlags().StringVarP(&rootCommand.RegistryPath, "state", "", defaultStateStore, "Location of state storage") cmd.PersistentFlags().StringVarP(&rootCommand.clusterName, "name", "", "", "Name of cluster") diff --git a/cmd/kops/util/factory.go b/cmd/kops/util/factory.go index 165556f0c0..ae587ac7e2 100644 --- a/cmd/kops/util/factory.go +++ b/cmd/kops/util/factory.go @@ -49,7 +49,8 @@ A s3 bucket is required to store cluster state information.` INVALID_STATE_ERROR = `Unable to read state store s3 bucket. Please use a valid s3 bucket uri when setting --state or KOPS_STATE_STORE evn var. -A valid value follows the format s3://.` +A valid value follows the format s3://. +Trailing slash will be trimmed.` ) func (f *Factory) Clientset() (simple.Clientset, error) {