Add the size and the mtime to the cache key

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/sshutil/sshutil.go

@@ -14,6 +14,7 @@ import (
 	"runtime"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/lima-vm/lima/pkg/ioutilx"
@@ -277,19 +278,29 @@ func ParseOpenSSHVersion(version []byte) *semver.Version {
 	return &semver.Version{}
 }
 
+// sshExecutable beyond path also records size and mtime, in the case of ssh upgrades.
+type sshExecutable struct {
+	Path    string
+	Size    int64
+	ModTime time.Time
+}
+
 // sshVersions caches the parsed version of each ssh executable, if it is needed again.
-var sshVersions = map[string]*semver.Version{}
+var sshVersions = map[sshExecutable]*semver.Version{}
 
 func DetectOpenSSHVersion() semver.Version {
 	var (
 		v      semver.Version
+		exe    sshExecutable
 		stderr bytes.Buffer
 	)
 	path, err := exec.LookPath("ssh")
 	if err != nil {
 		logrus.Warnf("failed to find ssh executable: %v", err)
 	} else {
-		if ver := sshVersions[path]; ver != nil {
+		st, _ := os.Stat(path)
+		exe = sshExecutable{Path: path, Size: st.Size(), ModTime: st.ModTime()}
+		if ver := sshVersions[exe]; ver != nil {
 			return *ver
 		}
 	}
@@ -300,7 +311,7 @@ func DetectOpenSSHVersion() semver.Version {
 	} else {
 		v = *ParseOpenSSHVersion(stderr.Bytes())
 		logrus.Debugf("OpenSSH version %s detected", v)
-		sshVersions[path] = &v
+		sshVersions[exe] = &v
 	}
 	return v
 }