Add bundleName field to CrcBundleInfo

This allows to simplify slightly machine.getBundleMetadataFromDriver()

pkg/crc/machine/bundle/metadata.go

@@ -23,6 +23,7 @@ type CrcBundleInfo struct {
 	Storage     Storage     `json:"storage"`
 	DriverInfo  DriverInfo  `json:"driverInfo"`
 	cachedPath  string
+	bundleName  string
 }
 
 type BuildInfo struct {
@@ -71,6 +72,10 @@ func (bundle *CrcBundleInfo) resolvePath(filename string) string {
 	return filepath.Join(bundle.cachedPath, filename)
 }
 
+func (bundle *CrcBundleInfo) GetBundleName() string {
+	return bundle.bundleName
+}
+
 func (bundle *CrcBundleInfo) GetAPIHostname() string {
 	return fmt.Sprintf("api.%s.%s", bundle.ClusterInfo.ClusterName, bundle.ClusterInfo.BaseDomain)
 }

pkg/crc/machine/bundle/repository.go

@@ -45,6 +45,8 @@ func (repo *Repository) Get(bundleName string) (*CrcBundleInfo, error) {
 		return nil, err
 	}
 	bundleInfo.cachedPath = path
+	bundleInfo.bundleName = bundleName
+
 	if err := bundleInfo.verify(); err != nil {
 		return nil, err
 	}

pkg/crc/machine/console.go

@@ -19,7 +19,7 @@ func (client *client) GetConsoleURL() (*ConsoleResult, error) {
 		return nil, errors.Wrap(err, "Error getting the state for host")
 	}
 
-	_, crcBundleMetadata, err := getBundleMetadataFromDriver(host.Driver)
+	crcBundleMetadata, err := getBundleMetadataFromDriver(host.Driver)
 	if err != nil {
 		return nil, errors.Wrap(err, "Error loading bundle metadata")
 	}

pkg/crc/machine/machine.go

@@ -35,18 +35,18 @@ func getClusterConfig(bundleInfo *bundle.CrcBundleInfo) (*ClusterConfig, error)
 	}, nil
 }
 
-func getBundleMetadataFromDriver(driver drivers.Driver) (string, *bundle.CrcBundleInfo, error) {
+func getBundleMetadataFromDriver(driver drivers.Driver) (*bundle.CrcBundleInfo, error) {
 	bundleName, err := driver.GetBundleName()
 	if err != nil {
 		err := fmt.Errorf("Error getting bundle name from CodeReady Containers instance, make sure you ran 'crc setup' and are using the latest bundle")
-		return "", nil, err
+		return nil, err
 	}
 	metadata, err := bundle.Get(bundleName)
 	if err != nil {
-		return "", nil, err
+		return nil, err
 	}
 
-	return bundleName, metadata, err
+	return metadata, err
 }
 
 func createLibMachineClient() (*libmachine.Client, func()) {

pkg/crc/machine/start.go

@@ -162,11 +162,11 @@ func (client *client) Start(ctx context.Context, startConfig StartConfig) (*Star
 			return nil, errors.Wrap(err, "Error loading machine")
 		}
 
-		var bundleName string
-		bundleName, crcBundleMetadata, err = getBundleMetadataFromDriver(host.Driver)
+		crcBundleMetadata, err = getBundleMetadataFromDriver(host.Driver)
 		if err != nil {
 			return nil, errors.Wrap(err, "Error loading bundle metadata")
 		}
+		bundleName := crcBundleMetadata.GetBundleName()
 		if bundleName != filepath.Base(startConfig.BundlePath) {
 			logging.Debugf("Bundle '%s' was requested, but the existing VM is using '%s'",
 				filepath.Base(startConfig.BundlePath), bundleName)

pkg/crc/machine/status.go

@@ -28,7 +28,7 @@ func (client *client) Status() (*ClusterStatusResult, error) {
 		return nil, errors.Wrap(err, "Cannot get machine state")
 	}
 
-	_, crcBundleMetadata, err := getBundleMetadataFromDriver(host.Driver)
+	crcBundleMetadata, err := getBundleMetadataFromDriver(host.Driver)
 	if err != nil {
 		return nil, errors.Wrap(err, "Error loading bundle metadata")
 	}