Add "NoVM" state

This would simplify podman-desktop ext status handling Signed-off-by: Yevhen Vydolob <[email protected]>
crc-org · Feb 1, 2024 · 6d61cbf · 6d61cbf
1 parent 0b8ec64
commit 6d61cbf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/cmd/crc/cmd/status.go b/cmd/crc/cmd/status.go
@@ -13,6 +13,7 @@ import (
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
 	"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
 	crcErrors "github.com/crc-org/crc/v2/pkg/crc/errors"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/state"
 	"github.com/crc-org/crc/v2/pkg/crc/machine/types"
 	"github.com/crc-org/crc/v2/pkg/crc/preset"
 	"github.com/docker/go-units"
@@ -152,6 +153,9 @@ func getStatus(client *daemonclient.Client, cacheDir string) *status {
 		}
 		return &status{Success: false, Error: crcErrors.ToSerializableError(err)}
 	}
+	if clusterStatus.CrcStatus == string(state.NoVM) {
+		return &status{Success: false, Error: crcErrors.ToSerializableError(crcErrors.VMNotExist)}
+	}
 	var size int64
 	err = filepath.Walk(cacheDir, func(_ string, info os.FileInfo, err error) error {
 		if !info.IsDir() {

diff --git a/pkg/crc/api/handlers.go b/pkg/crc/api/handlers.go
@@ -50,14 +50,6 @@ func NewHandler(config *crcConfig.Config, machine machine.Client, logger Logger,
 }
 
 func (h *Handler) Status(c *context) error {
-	exists, err := h.Client.Exists()
-	if err != nil {
-		return err
-	}
-	if !exists {
-		return c.String(http.StatusInternalServerError, string(errors.VMNotExist))
-	}
-
 	res, err := h.Client.Status()
 	if err != nil {
 		return err

diff --git a/pkg/crc/machine/state/state.go b/pkg/crc/machine/state/state.go
@@ -10,6 +10,7 @@ const (
 	Stopped  State = "Stopped"
 	Stopping State = "Stopping"
 	Starting State = "Starting"
+	NoVM     State = "NoVM"
 	Error    State = "Error"
 )
 

diff --git a/pkg/crc/machine/status.go b/pkg/crc/machine/status.go
@@ -18,8 +18,7 @@ func (client *client) Status() (*types.ClusterStatusResult, error) {
 	if err != nil {
 		if errors.Is(err, errMissingHost(client.name)) {
 			return &types.ClusterStatusResult{
-				CrcStatus:       state.Stopped,
-				OpenshiftStatus: types.OpenshiftStopped,
+				CrcStatus: state.NoVM,
 			}, nil
 		}
 		return nil, errors.Wrap(err, fmt.Sprintf("Cannot load '%s' virtual machine", client.name))

diff --git a/pkg/crc/machine/virtualmachine.go b/pkg/crc/machine/virtualmachine.go
@@ -32,6 +32,14 @@ func (err *MissingHostError) Error() string {
 	return fmt.Sprintf("no such libmachine vm: %s", err.name)
 }
 
+func (err *MissingHostError) Is(target error) bool {
+	var x *MissingHostError
+	if errors.As(target, &x) && x.name == err.name {
+		return true
+	}
+	return false
+}
+
 var errInvalidBundleMetadata = errors.New("Error loading bundle metadata")
 
 func loadVirtualMachine(name string, useVSock bool) (*virtualMachine, error) {