Move linux/darwin binaries into cache/binaries folder

Author: henry3260

pkg/minikube/download/binary.go

@@ -53,7 +53,11 @@ func binaryWithChecksumURL(binaryName, version, osName, archName, binaryURL stri
 
 // Binary will download a binary onto the host
 func Binary(binary, version, osName, archName, binaryURL string) (string, error) {
-	targetDir := localpath.MakeMiniPath("cache", osName, archName, version)
+	// targetDir := localpath.MakeMiniPath("cache", osName, archName, version)
+	targetDir := localpath.MakeMiniPath("cache", "binaries", osName, archName, version)
+	if err := os.MkdirAll(targetDir, 0755); err != nil {
+		return "", errors.Wrapf(err, "failed to create target dir %s", targetDir)
+	}
 	targetFilepath := path.Join(targetDir, binary)
 	targetLock := targetFilepath + ".lock"
 

pkg/minikube/download/download_test.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io/fs"
 	"os"
+	"path/filepath"
 	"sync"
 	"testing"
 	"time"
@@ -242,3 +243,24 @@ func testPreloadWithCachedSizeZero(t *testing.T) {
 		t.Errorf("Expected only 1 download attempt but got %v!", downloadNum)
 	}
 }
+
+func TestBinaryCreatesBinariesDir(t *testing.T) {
+	// mock download function that creates a fake binary file
+	DownloadMock = func(src, dst string) error {
+		// create a fake binary file at dst
+		return os.WriteFile(dst, []byte("fake-binary"), 0755)
+	}
+
+	_, err := Binary("kubectl", "v1.31.0", "linux", "amd64", "")
+	if err != nil {
+		t.Fatalf("Binary() failed: %v", err)
+	}
+
+	// check that the binaries directory was created
+	targetDir := filepath.Join(
+		os.Getenv("HOME"), ".minikube", "cache", "binaries", "linux", "amd64", "v1.31.0",
+	)
+	if _, err := os.Stat(targetDir); os.IsNotExist(err) {
+		t.Errorf("Expected binaries dir %s to exist, but it does not", targetDir)
+	}
+}