Use real hostname

Author: cmoog

cmd/coder/config_ssh.go

@@ -4,23 +4,28 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"cdr.dev/coder-cli/internal/config"
 	"cdr.dev/coder-cli/internal/entclient"
 	"github.com/spf13/pflag"
 
 	"go.coder.com/cli"
 	"go.coder.com/flog"
 )
 
+var (
+	privateKeyFilepath = filepath.Join(os.Getenv("HOME"), ".ssh", "coder_enterprise")
+)
+
 type configSSHCmd struct {
 	filepath string
 	remove   bool
 
 	startToken, startMessage, endToken string
-	privateKeyFilepath                 string
 }
 
 func (cmd *configSSHCmd) Spec() cli.CommandSpec {
@@ -47,7 +52,6 @@ func (cmd *configSSHCmd) RegisterFlags(fl *pflag.FlagSet) {
 #
 # You should not hand-edit this section, unless you are deleting it.`
 	cmd.endToken = "# ------------END-CODER-ENTERPRISE------------"
-	cmd.privateKeyFilepath = filepath.Join(home, ".ssh", "coder_enterprise")
 }
 
 func (cmd *configSSHCmd) Run(fl *pflag.FlagSet) {
@@ -87,7 +91,10 @@ func (cmd *configSSHCmd) Run(fl *pflag.FlagSet) {
 	if len(envs) < 1 {
 		flog.Fatal("no environments found")
 	}
-	newConfig := cmd.makeNewConfigs(me.Username, envs)
+	newConfig, err := cmd.makeNewConfigs(me.Username, envs)
+	if err != nil {
+		flog.Fatal("failed to make new ssh configurations: %v", err)
+	}
 
 	// if we find the old config, remove those chars from the string
 	if startIndex != -1 && endIndex != -1 {
@@ -98,48 +105,57 @@ func (cmd *configSSHCmd) Run(fl *pflag.FlagSet) {
 	if err != nil {
 		flog.Fatal("failed to write new configurations to ssh config file %q: %v", cmd.filepath, err)
 	}
-	err = cmd.writeSSHKey(ctx, entClient)
+	err = writeSSHKey(ctx, entClient)
 	if err != nil {
 		flog.Fatal("failed to fetch and write ssh key: %v", err)
 	}
 
 	fmt.Printf("An auto-generated ssh config was written to %q\n", cmd.filepath)
-	fmt.Printf("Your private ssh key was written to %q\n", cmd.privateKeyFilepath)
+	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)
 }
 
-func (cmd *configSSHCmd) writeSSHKey(ctx context.Context, client *entclient.Client) error {
+func writeSSHKey(ctx context.Context, client *entclient.Client) error {
 	key, err := client.SSHKey()
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(cmd.privateKeyFilepath, []byte(key.PrivateKey), 400)
+	err = ioutil.WriteFile(privateKeyFilepath, []byte(key.PrivateKey), 400)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (cmd *configSSHCmd) makeNewConfigs(userName string, envs []entclient.Environment) string {
+func (cmd *configSSHCmd) makeNewConfigs(userName string, envs []entclient.Environment) (string, error) {
+	u, err := config.URL.Read()
+	if err != nil {
+		return "", err
+	}
+	url, err := url.Parse(u)
+	if err != nil {
+		return "", err
+	}
+
 	newConfig := fmt.Sprintf("\n%s\n%s\n\n", cmd.startToken, cmd.startMessage)
 	for _, env := range envs {
-		newConfig += cmd.makeConfig(userName, env.Name)
+		newConfig += cmd.makeConfig(url.Hostname(), userName, env.Name)
 	}
 	newConfig += fmt.Sprintf("\n%s\n", cmd.endToken)
 
-	return newConfig
+	return newConfig, nil
 }
 
-func (cmd *configSSHCmd) makeConfig(userName, envName string) string {
+func (cmd *configSSHCmd) makeConfig(host, userName, envName string) string {
 	return fmt.Sprintf(
 		`Host coder.%s
     HostName %s
     User %s-%s
     StrictHostKeyChecking no
     ConnectTimeout=0
     IdentityFile=%s
-`, envName, "MOCK-SSHPROXY-IP", userName, envName, cmd.privateKeyFilepath) // TODO: get real ssh proxy ip address
+`, envName, host, userName, envName, privateKeyFilepath)
 }
 
 func writeStr(filename, data string) error {