From 9d3b5932ba5b0a35cb41c42995b0cecdd09aaa75 Mon Sep 17 00:00:00 2001 From: Kelvin Wang Date: Thu, 7 Mar 2019 19:44:20 -0500 Subject: [PATCH] fix(influx): return the error when token file already exists --- cmd/influx/setup.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cmd/influx/setup.go b/cmd/influx/setup.go index 1f1d926d07..cff0a886a4 100644 --- a/cmd/influx/setup.go +++ b/cmd/influx/setup.go @@ -62,6 +62,18 @@ func setupF(cmd *cobra.Command, args []string) error { return fmt.Errorf("instance at %q has already been setup", flags.host) } + dPath, dir, err := defaultTokenPath() + if err != nil { + return err + } + + if _, err := os.Stat(dPath); err == nil { + return &platform.Error{ + Code: platform.EConflict, + Msg: fmt.Sprintf("token already exists at %s", dPath), + } + } + req, err := onboardingRequest() if err != nil { return fmt.Errorf("failed to retrieve data to setup instance: %v", err) @@ -71,10 +83,7 @@ func setupF(cmd *cobra.Command, args []string) error { if err != nil { return fmt.Errorf("failed to setup instance: %v", err) } - dPath, dir, err := defaultTokenPath() - if err != nil { - return err - } + err = writeTokenToPath(result.Auth.Token, dPath, dir) if err != nil { return fmt.Errorf("failed to write token to path %q: %v", dPath, err)