Page MenuHomePhabricator

Remove code which overrides "diffusion.ssh-username" when instanced

Authored by epriestley on Fri, May 15, 1:31 PM.



Ref T13529. Now that instances can be renamed, an instance may have multiple valid SSH usernames and the preferred SSH username may not be the intenal instance name.

PhacilitySiteSource should already always set diffusion.ssh-username correctly, to the current preferred SSH username (which may be "new-name" after a rename from "old-name"), so we should never be able to reach this code without an accurate diffusion.ssh-username value available.

The code to resolve names into instances also already works for both "ssh old-name@..." and "ssh new-name@...".

So I believe this code has no beneficial effects and only causes harm: it may force us to return "old-name" when falling through would correctly return "new-name".

Test Plan
  • Previously: renamed an instance, then SSH'd to it using both the old and new names. Both work.
  • Previously: verified that diffusion.ssh-username is set correctly after a rename.
  • Verified that Diffusion "Clone" UI now shows "new-name" after an instance rename.
  • The real question here is: does this break something I'm not thinking of? And the change probably has to go to production to answer that.

Diff Detail

rP Phabricator
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley created this revision.Fri, May 15, 1:31 PM
epriestley requested review of this revision.Fri, May 15, 1:32 PM
This revision was not accepted when it landed; it landed in state Needs Review.Fri, May 15, 2:45 PM
This revision was automatically updated to reflect the committed changes.