Add function to check single operator status

Author: guillaumerose

pkg/crc/cluster/clusteroperator.go

@@ -2,6 +2,7 @@ package cluster
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"time"
 
@@ -35,24 +36,38 @@ type ClusterStatus struct {
 	Disabled    bool
 }
 
-func GetClusterOperatorStatus(ocConfig oc.OcConfig) (*ClusterStatus, error) {
-	cs := &ClusterStatus{}
+func GetClusterOperatorStatus(ocConfig oc.OcConfig, operator string) (*ClusterStatus, error) {
+	return getStatus(ocConfig, []string{operator})
+}
+
+func GetClusterOperatorsStatus(ocConfig oc.OcConfig) (*ClusterStatus, error) {
+	return getStatus(ocConfig, []string{})
+}
+
+func getStatus(ocConfig oc.OcConfig, selector []string) (*ClusterStatus, error) {
+	cs := &ClusterStatus{
+		Available: true,
+	}
+
 	data, stderr, err := ocConfig.RunOcCommand("get", "co", "-ojson")
 	if err != nil {
 		return cs, fmt.Errorf("%s", stderr)
 	}
 
 	var co K8sResource
-
-	err = json.Unmarshal([]byte(data), &co)
-	if err != nil {
+	if err := json.Unmarshal([]byte(data), &co); err != nil {
 		return cs, err
 	}
-	cs.Available = true
+
+	found := false
 	for _, c := range co.Items {
 		if contains(c.Metadata.Name, ignoreClusterOperators) {
 			continue
 		}
+		if len(selector) > 0 && !contains(c.Metadata.Name, selector) {
+			continue
+		}
+		found = true
 		for _, con := range c.Status.Conditions {
 			switch con.Type {
 			case "Available":
@@ -82,6 +97,9 @@ func GetClusterOperatorStatus(ocConfig oc.OcConfig) (*ClusterStatus, error) {
 			}
 		}
 	}
+	if !found {
+		return nil, errors.New("no cluster operator found")
+	}
 	return cs, nil
 }
 

pkg/crc/cluster/clusteroperator_test.go

@@ -5,30 +5,57 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/code-ready/crc/pkg/crc/oc"
+
+	"github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestGetClusterOperatorStatus(t *testing.T) {
-	status, err := GetClusterOperatorStatus(oc.OcConfig{
-		Runner: &mockRunner{file: filepath.Join("testdata", "co.json")},
-	})
-	assert.NoError(t, err)
-	assert.Equal(t, &ClusterStatus{
+var (
+	available = &ClusterStatus{
 		Available: true,
-	}, status)
+	}
+	progressing = &ClusterStatus{
+		Available:   true,
+		Progressing: true,
+	}
+)
+
+func TestGetClusterOperatorsStatus(t *testing.T) {
+	status, err := GetClusterOperatorsStatus(ocConfig("co.json"))
+	assert.NoError(t, err)
+	assert.Equal(t, available, status)
 }
 
-func TestGetClusterOperatorStatusProgressing(t *testing.T) {
-	status, err := GetClusterOperatorStatus(oc.OcConfig{
-		Runner: &mockRunner{file: filepath.Join("testdata", "co-progressing.json")},
-	})
+func TestGetClusterOperatorsStatusProgressing(t *testing.T) {
+	status, err := GetClusterOperatorsStatus(ocConfig("co-progressing.json"))
 	assert.NoError(t, err)
-	assert.Equal(t, &ClusterStatus{
-		Available:   true,
-		Progressing: true,
-	}, status)
+	assert.Equal(t, progressing, status)
+}
+
+func TestGetClusterOperatorStatus(t *testing.T) {
+	status, err := GetClusterOperatorStatus(ocConfig("co.json"), "authentication")
+	assert.NoError(t, err)
+	assert.Equal(t, available, status)
+
+	status, err = GetClusterOperatorStatus(ocConfig("co-progressing.json"), "authentication")
+	assert.NoError(t, err)
+	assert.Equal(t, progressing, status)
+
+	status, err = GetClusterOperatorStatus(ocConfig("co-progressing.json"), "cloud-credential")
+	assert.NoError(t, err)
+	assert.Equal(t, available, status)
+}
+
+func TestGetClusterOperatorStatusNotFound(t *testing.T) {
+	_, err := GetClusterOperatorStatus(ocConfig("co-progressing.json"), "not-found")
+	assert.EqualError(t, err, "no cluster operator found")
+}
+
+func ocConfig(s string) oc.OcConfig {
+	return oc.OcConfig{
+		Runner: &mockRunner{file: filepath.Join("testdata", s)},
+	}
 }
 
 type mockRunner struct {

pkg/crc/machine/machine.go

@@ -602,7 +602,7 @@ func Status(statusConfig ClusterStatusConfig) (ClusterStatusResult, error) {
 
 		// check if all the clusteroperators are running
 		ocConfig := oc.UseOCWithConfig(statusConfig.Name)
-		operatorsStatus, err := cluster.GetClusterOperatorStatus(ocConfig)
+		operatorsStatus, err := cluster.GetClusterOperatorsStatus(ocConfig)
 		if err != nil {
 			openshiftStatus = "Not Reachable"
 			logging.Debug(err.Error())

test/integration/crcsuite/crcsuite.go

@@ -184,7 +184,7 @@ func CheckClusterOperatorsWithRetry(retryCount int, retryWait string) error {
 
 	ocConfig := oc.UseOCWithConfig("crc")
 	for i := 0; i < retryCount; i++ {
-		s, err := cluster.GetClusterOperatorStatus(ocConfig)
+		s, err := cluster.GetClusterOperatorsStatus(ocConfig)
 		if err != nil {
 			return err
 		}