From 6aa23bfcbce99eb75f6ad2da6446f5dee306ab12 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Mon, 31 Aug 2020 19:32:36 +0000 Subject: [PATCH] Remove dependency on HOME env var --- internal/cmd/configssh.go | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go index 5023ea7e..342c603c 100644 --- a/internal/cmd/configssh.go +++ b/internal/cmd/configssh.go @@ -52,11 +52,14 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st ctx, cancel := context.WithCancel(context.Background()) defer cancel() + usr, err := user.Current() + if err != nil { + return xerrors.Errorf("get user home directory: %w", err) + } + + privateKeyFilepath := filepath.Join(usr.HomeDir, ".ssh", "coder_enterprise") + 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) } @@ -104,7 +107,7 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st if len(envs) < 1 { return xerrors.New("no environments found") } - newConfig, err := makeNewConfigs(user.Username, envs, startToken, startMessage, endToken) + newConfig, err := makeNewConfigs(user.Username, envs, startToken, startMessage, endToken, privateKeyFilepath) if err != nil { return xerrors.Errorf("make new ssh configurations: %w", err) } @@ -122,7 +125,7 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st if err != nil { return xerrors.Errorf("write new configurations to ssh config file %q: %w", *configpath, err) } - err = writeSSHKey(ctx, client) + err = writeSSHKey(ctx, client, privateKeyFilepath) if err != nil { return xerrors.Errorf("fetch and write ssh key: %w", err) } @@ -135,19 +138,15 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st } } -var ( - privateKeyFilepath = filepath.Join(os.Getenv("HOME"), ".ssh", "coder_enterprise") -) - -func writeSSHKey(ctx context.Context, client *coder.Client) error { +func writeSSHKey(ctx context.Context, client *coder.Client, privateKeyPath string) error { key, err := client.SSHKey(ctx) if err != nil { return err } - return ioutil.WriteFile(privateKeyFilepath, []byte(key.PrivateKey), 0400) + return ioutil.WriteFile(privateKeyPath, []byte(key.PrivateKey), 0400) } -func makeNewConfigs(userName string, envs []coder.Environment, startToken, startMsg, endToken string) (string, error) { +func makeNewConfigs(userName string, envs []coder.Environment, startToken, startMsg, endToken, privateKeyFilepath string) (string, error) { hostname, err := configuredHostname() if err != nil { return "", nil @@ -155,14 +154,14 @@ func makeNewConfigs(userName string, envs []coder.Environment, startToken, start newConfig := fmt.Sprintf("\n%s\n%s\n\n", startToken, startMsg) for _, env := range envs { - newConfig += makeSSHConfig(hostname, userName, env.Name) + newConfig += makeSSHConfig(hostname, userName, env.Name, privateKeyFilepath) } newConfig += fmt.Sprintf("\n%s\n", endToken) return newConfig, nil } -func makeSSHConfig(host, userName, envName string) string { +func makeSSHConfig(host, userName, envName, privateKeyFilepath string) string { return fmt.Sprintf( `Host coder.%s HostName %s pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy