Rename GetRsaPrivateKeyPath to GetECDSAPrivateKeyPath for backward compatibility

praveenkumar · praveenkumar · commit ee363718f576 · 2024-08-20T04:48:08.000Z
We were using RSA Algo long time ago and this function is used to
provide a backward compatibility for that version of crc but since in
previous commit we have updated the ssh algo from ecdsa to ed25519, to
have the backward compatibility for some released version we are
renaming this function.
diff --git a/pkg/crc/constants/constants.go b/pkg/crc/constants/constants.go
@@ -185,9 +185,9 @@ func GetHostDockerSocketPath() string {
 	return filepath.Join(MachineInstanceDir, DefaultName, "docker.sock")
 }
 
-// For backward compatibility to v 1.20.0
-func GetRsaPrivateKeyPath() string {
-	return filepath.Join(MachineInstanceDir, DefaultName, "id_rsa")
+// For backward compatibility to v 2.40.0
+func GetECDSAPrivateKeyPath() string {
+	return filepath.Join(MachineInstanceDir, DefaultName, "id_ecdsa")
 }
 
 func GetKubeAdminPasswordPath() string {
diff --git a/pkg/crc/machine/ip.go b/pkg/crc/machine/ip.go
@@ -21,6 +21,6 @@ func (client *client) ConnectionDetails() (*types.ConnectionDetails, error) {
 		IP:          ip,
 		SSHPort:     vm.SSHPort(),
 		SSHUsername: constants.DefaultSSHUser,
-		SSHKeys:     []string{constants.GetPrivateKeyPath(), constants.GetRsaPrivateKeyPath(), vm.bundle.GetSSHKeyPath()},
+		SSHKeys:     []string{constants.GetPrivateKeyPath(), constants.GetECDSAPrivateKeyPath(), vm.bundle.GetSSHKeyPath()},
 	}, nil
 }
diff --git a/pkg/crc/machine/virtualmachine.go b/pkg/crc/machine/virtualmachine.go
@@ -106,5 +106,5 @@ func (vm *virtualMachine) SSHRunner() (*ssh.Runner, error) {
 	if err != nil {
 		return nil, err
 	}
-	return ssh.CreateRunner(ip, vm.SSHPort(), constants.GetPrivateKeyPath(), constants.GetRsaPrivateKeyPath(), vm.bundle.GetSSHKeyPath())
+	return ssh.CreateRunner(ip, vm.SSHPort(), constants.GetPrivateKeyPath(), constants.GetECDSAPrivateKeyPath(), vm.bundle.GetSSHKeyPath())
 }

Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,9 @@ func GetHostDockerSocketPath() string {`
`185`	`185`	`return filepath.Join(MachineInstanceDir, DefaultName, "docker.sock")`
`186`	`186`	`}`
`187`	`187`
`188`		`-// For backward compatibility to v 1.20.0`
`189`		`-func GetRsaPrivateKeyPath() string {`
`190`		`- return filepath.Join(MachineInstanceDir, DefaultName, "id_rsa")`
	`188`	`+// For backward compatibility to v 2.40.0`
	`189`	`+func GetECDSAPrivateKeyPath() string {`
	`190`	`+ return filepath.Join(MachineInstanceDir, DefaultName, "id_ecdsa")`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`func GetKubeAdminPasswordPath() string {`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ func (client client) ConnectionDetails() (types.ConnectionDetails, error) {`
`21`	`21`	`IP: ip,`
`22`	`22`	`SSHPort: vm.SSHPort(),`
`23`	`23`	`SSHUsername: constants.DefaultSSHUser,`
`24`		`- SSHKeys: []string{constants.GetPrivateKeyPath(), constants.GetRsaPrivateKeyPath(), vm.bundle.GetSSHKeyPath()},`
	`24`	`+ SSHKeys: []string{constants.GetPrivateKeyPath(), constants.GetECDSAPrivateKeyPath(), vm.bundle.GetSSHKeyPath()},`
`25`	`25`	`}, nil`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,5 +106,5 @@ func (vm virtualMachine) SSHRunner() (ssh.Runner, error) {`
`106`	`106`	`if err != nil {`
`107`	`107`	`return nil, err`
`108`	`108`	`}`
`109`		`- return ssh.CreateRunner(ip, vm.SSHPort(), constants.GetPrivateKeyPath(), constants.GetRsaPrivateKeyPath(), vm.bundle.GetSSHKeyPath())`
	`109`	`+ return ssh.CreateRunner(ip, vm.SSHPort(), constants.GetPrivateKeyPath(), constants.GetECDSAPrivateKeyPath(), vm.bundle.GetSSHKeyPath())`
`110`	`110`	`}`