Merge pull request #3277 from alrs/kops-command-fixes

Automatic merge from submit-queue Kops command fixes TrimSuffix() on defaultStateStore doesn't actually do anything, and there is an unused answer variable in the tests.
kubernetes · Aug 26, 2017 · 847f6de · 847f6de
2 parents cc6fb51 + 408b11d
commit 847f6de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/kops/delete_confirm_test.go b/cmd/kops/delete_confirm_test.go
@@ -49,7 +49,7 @@ func TestConfirmation(t *testing.T) {
 	}
 
 	c.Default = "yes"
-	answer, err = ui.GetConfirm(c)
+	_, err = ui.GetConfirm(c)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/cmd/kops/root.go b/cmd/kops/root.go
@@ -128,7 +128,7 @@ func NewCmdRoot(f *util.Factory, out io.Writer) *cobra.Command {
 
 	defaultStateStore := os.Getenv("KOPS_STATE_STORE")
 	if strings.HasSuffix(defaultStateStore, "/") {
-		strings.TrimSuffix(defaultStateStore, "/")
+		defaultStateStore = strings.TrimSuffix(defaultStateStore, "/")
 	}
 	cmd.PersistentFlags().StringVarP(&rootCommand.RegistryPath, "state", "", defaultStateStore, "Location of state storage")