From 77ecd0a1472fc9b8ea80457532cad29631c69cfd Mon Sep 17 00:00:00 2001 From: Caleb Brose <5447118+cmbrose@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:56:31 -0500 Subject: [PATCH] Rename public key first for edge cases --- pkg/cmd/codespace/ssh.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go index 5ded0a8a7..762f7db9c 100644 --- a/pkg/cmd/codespace/ssh.go +++ b/pkg/cmd/codespace/ssh.go @@ -273,14 +273,14 @@ func checkAndUpdateOldKeyPair(sshContext ssh.Context) *ssh.KeyPair { // Both old public and private keys exist, rename them to the new name - privateKeyNew := strings.Replace(privateKey, automaticPrivateKeyNameOld, automaticPrivateKeyName, -1) - err = os.Rename(privateKey, privateKeyNew) + publicKeyNew := strings.Replace(publicKey, automaticPrivateKeyNameOld, automaticPrivateKeyName, -1) + err = os.Rename(publicKey, publicKeyNew) if err != nil { return nil } - publicKeyNew := strings.Replace(publicKey, automaticPrivateKeyNameOld, automaticPrivateKeyName, -1) - err = os.Rename(publicKey, publicKeyNew) + privateKeyNew := strings.Replace(privateKey, automaticPrivateKeyNameOld, automaticPrivateKeyName, -1) + err = os.Rename(privateKey, privateKeyNew) if err != nil { return nil }