fixed ssh key error to better reflect its state. (#139)

KevinEdry · cmoog · deansheather · commit bf3feab5c49b · 2020-10-21T06:38:48.000Z
Fix config-ssh key file error to better reflect its state

Co-authored-by: Charles Moog &lt;moogcharlie@gmail.com&gt;
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -130,11 +130,12 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
 		}
 		err = writeSSHKey(ctx, client, privateKeyFilepath)
 		if err != nil {
-			return xerrors.Errorf("fetch and write ssh key: %w", err)
+			fmt.Printf("Your private ssh key already exists at \"%s\"\nYou may need to remove the existing file and re-run this command\n", privateKeyFilepath)
+		} else {
+			fmt.Printf("Your private ssh key was written to \"%s\"\n", privateKeyFilepath)
 		}
 
 		fmt.Printf("An auto-generated ssh config was written to \"%s\"\n", *configpath)
-		fmt.Printf("Your private ssh key was written to \"%s\"\n", privateKeyFilepath)
 		fmt.Println("You should now be able to ssh into your environment")
 		fmt.Printf("For example, try running\n\n\t$ ssh coder.%s\n\n", envs[0].Name)
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -130,11 +130,12 @@ func configSSH(configpath string, remove bool) func(cmd *cobra.Command, _ []st`
`130`	`130`	`}`
`131`	`131`	`err = writeSSHKey(ctx, client, privateKeyFilepath)`
`132`	`132`	`if err != nil {`
`133`		`- return xerrors.Errorf("fetch and write ssh key: %w", err)`
	`133`	`+ fmt.Printf("Your private ssh key already exists at \"%s\"\nYou may need to remove the existing file and re-run this command\n", privateKeyFilepath)`
	`134`	`+ } else {`
	`135`	`+ fmt.Printf("Your private ssh key was written to \"%s\"\n", privateKeyFilepath)`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`fmt.Printf("An auto-generated ssh config was written to \"%s\"\n", *configpath)`
`137`		`- fmt.Printf("Your private ssh key was written to \"%s\"\n", privateKeyFilepath)`
`138`	`139`	`fmt.Println("You should now be able to ssh into your environment")`
`139`	`140`	`fmt.Printf("For example, try running\n\n\t$ ssh coder.%s\n\n", envs[0].Name)`
`140`	`141`	`return nil`