@@ -54,6 +54,7 @@ type sshConfigOptions struct {
5454disableAutostart bool
5555header []string
5656headerCommand string
57+ removedKeys map [string ]bool
5758}
5859
5960// addOptions expects options in the form of "option=value" or "option value".
@@ -74,30 +75,20 @@ func (o *sshConfigOptions) addOption(option string) error {
7475if err != nil {
7576return err
7677}
77- for i ,existing := range o .sshOptions {
78- // Override existing option if they share the same key.
79- // This is case-insensitive. Parsing each time might be a little slow,
80- // but it is ok.
81- existingKey ,_ ,err := codersdk .ParseSSHConfigOption (existing )
82- if err != nil {
83- // Don't mess with original values if there is an error.
84- // This could have come from the user's manual edits.
85- continue
86- }
87- if strings .EqualFold (existingKey ,key ) {
88- if value == "" {
89- // Delete existing option.
90- o .sshOptions = append (o .sshOptions [:i ],o .sshOptions [i + 1 :]... )
91- }else {
92- // Override existing option.
93- o .sshOptions [i ]= option
94- }
95- return nil
96- }
78+ lowerKey := strings .ToLower (key )
79+ if o .removedKeys != nil && o .removedKeys [lowerKey ] {
80+ // Key marked as removed, skip.
81+ return nil
9782}
98- // Only append the option if it is not empty.
83+ // Only append the option if it is not empty
84+ // (we interpret empty as removal).
9985if value != "" {
10086o .sshOptions = append (o .sshOptions ,option )
87+ }else {
88+ if o .removedKeys == nil {
89+ o .removedKeys = make (map [string ]bool )
90+ }
91+ o .removedKeys [lowerKey ]= true
10192}
10293return nil
10394}
@@ -245,6 +236,8 @@ func (r *RootCmd) configSSH() *serpent.Command {
245236r .InitClient (client ),
246237),
247238Handler :func (inv * serpent.Invocation )error {
239+ ctx := inv .Context ()
240+
248241if sshConfigOpts .waitEnum != "auto" && skipProxyCommand {
249242// The wait option is applied to the ProxyCommand. If the user
250243// specifies skip-proxy-command, then wait cannot be applied.
@@ -253,7 +246,14 @@ func (r *RootCmd) configSSH() *serpent.Command {
253246sshConfigOpts .header = r .header
254247sshConfigOpts .headerCommand = r .headerCommand
255248
256- recvWorkspaceConfigs := sshPrepareWorkspaceConfigs (inv .Context (),client )
249+ // Talk to the API early to prevent the version mismatch
250+ // warning from being printed in the middle of a prompt.
251+ // This is needed because the asynchronous requests issued
252+ // by sshPrepareWorkspaceConfigs may otherwise trigger the
253+ // warning at any time.
254+ _ ,_ = client .BuildInfo (ctx )
255+
256+ recvWorkspaceConfigs := sshPrepareWorkspaceConfigs (ctx ,client )
257257
258258out := inv .Stdout
259259if dryRun {
@@ -375,7 +375,7 @@ func (r *RootCmd) configSSH() *serpent.Command {
375375return xerrors .Errorf ("fetch workspace configs failed: %w" ,err )
376376}
377377
378- coderdConfig ,err := client .SSHConfiguration (inv . Context () )
378+ coderdConfig ,err := client .SSHConfiguration (ctx )
379379if err != nil {
380380// If the error is 404, this deployment does not support
381381// this endpoint yet. Do not error, just assume defaults.
@@ -440,26 +440,29 @@ func (r *RootCmd) configSSH() *serpent.Command {
440440configOptions := sshConfigOpts
441441configOptions .sshOptions = nil
442442
443- // Add standard options.
444- err := configOptions .addOptions (defaultOptions ... )
445- if err != nil {
446- return err
443+ // User options first (SSH only uses the first
444+ // option unless it can be given multiple times)
445+ for _ ,opt := range sshConfigOpts .sshOptions {
446+ err := configOptions .addOptions (opt )
447+ if err != nil {
448+ return xerrors .Errorf ("add flag config option %q: %w" ,opt ,err )
449+ }
447450}
448451
449- // Override with deployment options
452+ // Deployment options second, allow them to
453+ // override standard options.
450454for k ,v := range coderdConfig .SSHConfigOptions {
451455opt := fmt .Sprintf ("%s %s" ,k ,v )
452456err := configOptions .addOptions (opt )
453457if err != nil {
454458return xerrors .Errorf ("add coderd config option %q: %w" ,opt ,err )
455459}
456460}
457- // Override with flag options
458- for _ ,opt := range sshConfigOpts .sshOptions {
459- err := configOptions .addOptions (opt )
460- if err != nil {
461- return xerrors .Errorf ("add flag config option %q: %w" ,opt ,err )
462- }
461+
462+ // Finally, add the standard options.
463+ err := configOptions .addOptions (defaultOptions ... )
464+ if err != nil {
465+ return err
463466}
464467
465468hostBlock := []string {