@@ -52,11 +52,14 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
5252ctx ,cancel := context .WithCancel (context .Background ())
5353defer cancel ()
5454
55+ usr ,err := user .Current ()
56+ if err != nil {
57+ return xerrors .Errorf ("get user home directory: %w" ,err )
58+ }
59+
60+ privateKeyFilepath := filepath .Join (usr .HomeDir ,".ssh" ,"coder_enterprise" )
61+
5562if strings .HasPrefix (* configpath ,"~" ) {
56- usr ,err := user .Current ()
57- if err != nil {
58- return xerrors .Errorf ("get user home directory: %w" ,err )
59- }
6063* configpath = strings .Replace (* configpath ,"~" ,usr .HomeDir ,1 )
6164}
6265
@@ -104,7 +107,7 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
104107if len (envs )< 1 {
105108return xerrors .New ("no environments found" )
106109}
107- newConfig ,err := makeNewConfigs (user .Username ,envs ,startToken ,startMessage ,endToken )
110+ newConfig ,err := makeNewConfigs (user .Username ,envs ,startToken ,startMessage ,endToken , privateKeyFilepath )
108111if err != nil {
109112return xerrors .Errorf ("make new ssh configurations: %w" ,err )
110113}
@@ -122,7 +125,7 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
122125if err != nil {
123126return xerrors .Errorf ("write new configurations to ssh config file %q: %w" ,* configpath ,err )
124127}
125- err = writeSSHKey (ctx ,client )
128+ err = writeSSHKey (ctx ,client , privateKeyFilepath )
126129if err != nil {
127130return xerrors .Errorf ("fetch and write ssh key: %w" ,err )
128131}
@@ -135,34 +138,30 @@ func configSSH(configpath *string, remove *bool) func(cmd *cobra.Command, _ []st
135138}
136139}
137140
138- var (
139- privateKeyFilepath = filepath .Join (os .Getenv ("HOME" ),".ssh" ,"coder_enterprise" )
140- )
141-
142- func writeSSHKey (ctx context.Context ,client * coder.Client )error {
141+ func writeSSHKey (ctx context.Context ,client * coder.Client ,privateKeyPath string )error {
143142key ,err := client .SSHKey (ctx )
144143if err != nil {
145144return err
146145}
147- return ioutil .WriteFile (privateKeyFilepath , []byte (key .PrivateKey ),0400 )
146+ return ioutil .WriteFile (privateKeyPath , []byte (key .PrivateKey ),0400 )
148147}
149148
150- func makeNewConfigs (userName string ,envs []coder.Environment ,startToken ,startMsg ,endToken string ) (string ,error ) {
149+ func makeNewConfigs (userName string ,envs []coder.Environment ,startToken ,startMsg ,endToken , privateKeyFilepath string ) (string ,error ) {
151150hostname ,err := configuredHostname ()
152151if err != nil {
153152return "" ,nil
154153}
155154
156155newConfig := fmt .Sprintf ("\n %s\n %s\n \n " ,startToken ,startMsg )
157156for _ ,env := range envs {
158- newConfig += makeSSHConfig (hostname ,userName ,env .Name )
157+ newConfig += makeSSHConfig (hostname ,userName ,env .Name , privateKeyFilepath )
159158}
160159newConfig += fmt .Sprintf ("\n %s\n " ,endToken )
161160
162161return newConfig ,nil
163162}
164163
165- func makeSSHConfig (host ,userName ,envName string )string {
164+ func makeSSHConfig (host ,userName ,envName , privateKeyFilepath string )string {
166165return fmt .Sprintf (
167166`Host coder.%s
168167 HostName %s