Merge branch 'fix-panic-short-id' into 'main'

Fix panic with short IDs

Closes #33

See merge request bootc-org/podman-bootc-cli!69

Author: cgwalters

pkg/vm/vm.go

@@ -25,24 +25,24 @@ import (
 var ErrVMInUse = errors.New("VM already in use")
 
 // GetVMCachePath returns the path to the VM cache directory
-func GetVMCachePath(imageId string, user user.User) (path string, err error) {
+func GetVMCachePath(imageId string, user user.User) (longID string, path string, err error) {
 	files, err := os.ReadDir(user.CacheDir())
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
 	fullImageId := ""
 	for _, f := range files {
-		if f.IsDir() && strings.HasPrefix(f.Name(), imageId) {
+		if f.IsDir() && len(f.Name()) == 64 && strings.HasPrefix(f.Name(), imageId) {
 			fullImageId = f.Name()
 		}
 	}
 
 	if fullImageId == "" {
-		return "", fmt.Errorf("local installation '%s' does not exists", imageId)
+		return "", "", fmt.Errorf("local installation '%s' does not exists", imageId)
 	}
 
-	return filepath.Join(user.CacheDir(), fullImageId), nil
+	return fullImageId, filepath.Join(user.CacheDir(), fullImageId), nil
 }
 
 type NewVMParameters struct {

pkg/vm/vm_darwin.go

@@ -25,7 +25,7 @@ func NewVM(params NewVMParameters) (vm *BootcVMMac, err error) {
 		return nil, fmt.Errorf("image ID is required")
 	}
 
-	cacheDir, err := GetVMCachePath(params.ImageID, params.User)
+	longId, cacheDir, err := GetVMCachePath(params.ImageID, params.User)
 	if err != nil {
 		return nil, fmt.Errorf("unable to get VM cache path: %w", err)
 	}
@@ -36,9 +36,9 @@ func NewVM(params NewVMParameters) (vm *BootcVMMac, err error) {
 	}
 
 	vm = &BootcVMMac{
-		socketFile: filepath.Join(params.User.CacheDir(), params.ImageID[:12]+"-console.sock"),
+		socketFile: filepath.Join(params.User.CacheDir(), longId[:12]+"-console.sock"),
 		BootcVMCommon: BootcVMCommon{
-			imageID:       params.ImageID,
+			imageID:       longId,
 			cacheDir:      cacheDir,
 			diskImagePath: filepath.Join(cacheDir, config.DiskImage),
 			pidFile:       filepath.Join(cacheDir, config.RunPidFile),

pkg/vm/vm_linux.go

@@ -39,7 +39,7 @@ func NewVM(params NewVMParameters) (vm *BootcVMLinux, err error) {
 		return nil, fmt.Errorf("libvirt URI is required")
 	}
 
-	cacheDir, err := GetVMCachePath(params.ImageID, params.User)
+	longId, cacheDir, err := GetVMCachePath(params.ImageID, params.User)
 	if err != nil {
 		return nil, fmt.Errorf("unable to get VM cache path: %w", err)
 	}
@@ -52,8 +52,8 @@ func NewVM(params NewVMParameters) (vm *BootcVMLinux, err error) {
 	vm = &BootcVMLinux{
 		libvirtUri: params.LibvirtUri,
 		BootcVMCommon: BootcVMCommon{
-			vmName:        vmName(params.ImageID),
-			imageID:       params.ImageID,
+			vmName:        vmName(longId),
+			imageID:       longId,
 			cacheDir:      cacheDir,
 			diskImagePath: filepath.Join(cacheDir, config.DiskImage),
 			user:          params.User,