fixup! Add gendocs ci step

cmoog · cmoog · commit 0c839a463a78 · 2020-08-13T09:49:26.000-05:00
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/url"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 	"time"
@@ -35,7 +36,7 @@ func makeConfigSSHCmd() *cobra.Command {
 	return cmd
 }
 
-func configSSH(filepath *string, remove *bool) func(cmd *cobra.Command, _ []string) error {
+func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []string) error {
 	startToken := "# ------------START-CODER-ENTERPRISE-----------"
 	startMessage := `# The following has been auto-generated by "coder config-ssh"
 # to make accessing your Coder Enterprise environments easier.
@@ -51,12 +52,20 @@ func configSSH(filepath *string, remove *bool) func(cmd *cobra.Command, _ []stri
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
-		currentConfig, err := readStr(*filepath)
+		if strings.HasPrefix(*configpath, "~") {
+			usr, err := user.Current()
+			if err != nil {
+				return xerrors.Errorf("get user home directory: %w", err)
+			}
+			*configpath = strings.Replace(*configpath, "~", usr.HomeDir, 1)
+		}
+
+		currentConfig, err := readStr(*configpath)
 		if os.IsNotExist(err) {
 			// SSH configs are not always already there.
 			currentConfig = ""
 		} else if err != nil {
-			return xerrors.Errorf("read ssh config file %q: %w", filepath, err)
+			return xerrors.Errorf("read ssh config file %q: %w", configpath, err)
 		}
 
 		startIndex := strings.Index(currentConfig, startToken)
@@ -68,9 +77,9 @@ func configSSH(filepath *string, remove *bool) func(cmd *cobra.Command, _ []stri
 			}
 			currentConfig = currentConfig[:startIndex-1] + currentConfig[endIndex+len(endToken)+1:]
 
-			err = writeStr(*filepath, currentConfig)
+			err = writeStr(*configpath, currentConfig)
 			if err != nil {
-				return xerrors.Errorf("write to ssh config file %q: %v", *filepath, err)
+				return xerrors.Errorf("write to ssh config file %q: %v", *configpath, err)
 			}
 
 			return nil
@@ -105,16 +114,16 @@ func configSSH(filepath *string, remove *bool) func(cmd *cobra.Command, _ []stri
 			currentConfig = currentConfig[:startIndex-1] + currentConfig[endIndex+len(endToken)+1:]
 		}
 
-		err = writeStr(*filepath, currentConfig+newConfig)
+		err = writeStr(*configpath, currentConfig+newConfig)
 		if err != nil {
-			return xerrors.Errorf("write new configurations to ssh config file %q: %w", filepath, err)
+			return xerrors.Errorf("write new configurations to ssh config file %q: %w", *configpath, err)
 		}
 		err = writeSSHKey(ctx, entClient)
 		if err != nil {
 			return xerrors.Errorf("fetch and write ssh key: %w", err)
 		}
 
-		fmt.Printf("An auto-generated ssh config was written to %q\n", *filepath)
+		fmt.Printf("An auto-generated ssh config was written to %q\n", *configpath)
 		fmt.Printf("Your private ssh key was written to %q\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)
