Address comments 1

Author: sebrandon1

cmd/crc/cmd/bundle/download.go

@@ -32,7 +32,6 @@ func getDownloadCmd(config *crcConfig.Config) *cobra.Command {
 		Short: "Download a specific CRC bundle",
 		Long:  "Download a specific CRC bundle from the mirrors. If no version or architecture is specified, the bundle for the current CRC version will be downloaded.",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			verbose, _ := cmd.Flags().GetBool("verbose")
 			force, _ := cmd.Flags().GetBool("force")
 			presetStr, _ := cmd.Flags().GetString("preset")
 
@@ -47,10 +46,9 @@ func getDownloadCmd(config *crcConfig.Config) *cobra.Command {
 				preset = crcConfig.GetPreset(config)
 			}
 
-			return runDownload(args, preset, verbose, force)
+			return runDownload(args, preset, force)
 		},
 	}
-	downloadCmd.Flags().BoolP("verbose", "v", false, "Show detailed download information")
 	downloadCmd.Flags().BoolP("force", "f", false, "Overwrite existing bundle if present")
 	downloadCmd.Flags().StringP("preset", "p", "", "Target preset (openshift, okd, microshift)")
 
@@ -214,15 +212,15 @@ func runList(args []string, config *crcConfig.Config) error {
 }
 
 func isBundleCached(preset crcPreset.Preset, version string) bool {
-	bundleName := constructBundleName(preset, version, runtime.GOARCH)
+	bundleName := constants.BundleForPreset(preset, version)
 	bundlePath := filepath.Join(constants.MachineCacheDir, bundleName)
 	if _, err := os.Stat(bundlePath); err == nil {
 		return true
 	}
 	return false
 }
 
-func runDownload(args []string, preset crcPreset.Preset, verbose bool, force bool) error {
+func runDownload(args []string, preset crcPreset.Preset, force bool) error {
 	// Disk space check (simple check for ~10GB free)
 	// This is a basic check, more robust checking would require syscall/windows specific implementations
 	// We skip this for now to avoid adding heavy OS-specific deps, assuming user manages disk space or download fails naturally.
@@ -237,10 +235,8 @@ func runDownload(args []string, preset crcPreset.Preset, verbose bool, force boo
 			}
 		}
 
-		if verbose {
-			logging.Infof("Source: %s", constants.GetDefaultBundleDownloadURL(preset))
-			logging.Infof("Destination: %s", defaultBundlePath)
-		}
+		logging.Debugf("Source: %s", constants.GetDefaultBundleDownloadURL(preset))
+		logging.Debugf("Destination: %s", defaultBundlePath)
 		// For default bundle, we use the existing logic which handles verification internally
 		_, err := bundle.Download(context.Background(), preset, defaultBundlePath, false)
 		return err
@@ -250,13 +246,11 @@ func runDownload(args []string, preset crcPreset.Preset, verbose bool, force boo
 	version := args[0]
 
 	// Check if version is partial (Major.Minor) and resolve it if necessary
-	resolvedVersion, err := resolveOpenShiftVersion(preset, version, verbose)
+	resolvedVersion, err := resolveOpenShiftVersion(preset, version)
 	if err != nil {
 		logging.Warnf("Could not resolve version %s: %v. Trying with original version string.", version, err)
 	} else if resolvedVersion != version {
-		if verbose {
-			logging.Infof("Resolved version %s to %s", version, resolvedVersion)
-		}
+		logging.Debugf("Resolved version %s to %s", version, resolvedVersion)
 		version = resolvedVersion
 	}
 
@@ -265,7 +259,7 @@ func runDownload(args []string, preset crcPreset.Preset, verbose bool, force boo
 		architecture = args[1]
 	}
 
-	bundleName := constructBundleName(preset, version, architecture)
+	bundleName := constants.BundleName(preset, version, architecture)
 	bundlePath := filepath.Join(constants.MachineCacheDir, bundleName)
 
 	if !force {
@@ -281,10 +275,8 @@ func runDownload(args []string, preset crcPreset.Preset, verbose bool, force boo
 	sigURL := fmt.Sprintf("%s%s", baseVersionURL, "sha256sum.txt.sig")
 
 	logging.Infof("Downloading bundle: %s", bundleName)
-	if verbose {
-		logging.Infof("Source: %s", bundleURL)
-		logging.Infof("Destination: %s", constants.MachineCacheDir)
-	}
+	logging.Debugf("Source: %s", bundleURL)
+	logging.Debugf("Destination: %s", constants.MachineCacheDir)
 
 	// Implement verification logic
 	logging.Infof("Verifying signature for %s...", version)
@@ -334,30 +326,6 @@ func getVerifiedHashForCustomVersion(sigURL string, bundleName string) (string,
 	return "", fmt.Errorf("hash for %s not found in signature file", bundleName)
 }
 
-func constructBundleName(preset crcPreset.Preset, version string, architecture string) string {
-	var bundleName strings.Builder
-	bundleName.WriteString("crc")
-
-	switch preset {
-	case crcPreset.OKD:
-		bundleName.WriteString("_okd")
-	case crcPreset.Microshift:
-		bundleName.WriteString("_microshift")
-	}
-
-	switch runtime.GOOS {
-	case "darwin":
-		bundleName.WriteString("_vfkit")
-	case "linux":
-		bundleName.WriteString("_libvirt")
-	case "windows":
-		bundleName.WriteString("_hyperv")
-	}
-
-	fmt.Fprintf(&bundleName, "_%s_%s.crcbundle", version, architecture)
-	return bundleName.String()
-}
-
 func fetchAvailableVersions(preset crcPreset.Preset) ([]*semver.Version, error) {
 	// Base URL for the preset (e.g., https://mirror.openshift.com/pub/openshift-v4/clients/crc/bundles/openshift)
 	baseURL := fmt.Sprintf("https://mirror.openshift.com/pub/openshift-v4/clients/crc/bundles/%s/", preset.String())
@@ -433,7 +401,7 @@ func fetchAvailableVersions(preset crcPreset.Preset) ([]*semver.Version, error)
 	return versions, nil
 }
 
-func resolveOpenShiftVersion(preset crcPreset.Preset, inputVersion string, verbose bool) (string, error) {
+func resolveOpenShiftVersion(preset crcPreset.Preset, inputVersion string) (string, error) {
 	// If input already looks like a full version (Major.Minor.Patch), return as is
 	fullVersionRegex := regexp.MustCompile(`^\d+\.\d+\.\d+$`)
 	if fullVersionRegex.MatchString(inputVersion) {
@@ -446,9 +414,7 @@ func resolveOpenShiftVersion(preset crcPreset.Preset, inputVersion string, verbo
 		return inputVersion, nil
 	}
 
-	if verbose {
-		logging.Infof("Resolving latest version for %s...", inputVersion)
-	}
+	logging.Debugf("Resolving latest version for %s...", inputVersion)
 
 	versions, err := fetchAvailableVersions(preset)
 	if err != nil {

pkg/crc/constants/constants.go

@@ -76,6 +76,10 @@ func GetAdminHelperURL() string {
 }
 
 func BundleForPreset(preset crcpreset.Preset, version string) string {
+	return BundleName(preset, version, runtime.GOARCH)
+}
+
+func BundleName(preset crcpreset.Preset, version string, arch string) string {
 	var bundleName strings.Builder
 
 	bundleName.WriteString("crc")
@@ -96,7 +100,7 @@ func BundleForPreset(preset crcpreset.Preset, version string) string {
 		bundleName.WriteString("_hyperv")
 	}
 
-	fmt.Fprintf(&bundleName, "_%s_%s.crcbundle", version, runtime.GOARCH)
+	fmt.Fprintf(&bundleName, "_%s_%s.crcbundle", version, arch)
 	return bundleName.String()
 }