apiservers: added unit tests for openshiftapiserver.go (#381)

Co-authored-by: nkononov <[email protected]>
openshift-kni · May 1, 2024 · ecf4a63 · ecf4a63
1 parent 9e72b77
commit ecf4a63
Show file tree

Hide file tree

Showing 5 changed files with 322 additions and 28 deletions.
diff --git a/pkg/apiservers/kubeapiserver.go b/pkg/apiservers/kubeapiserver.go
@@ -31,8 +31,8 @@ type KubeAPIServerBuilder struct {
 
 var kubeAPIServerObjName = "cluster"
 
-// PullKubeAPIServerBuilder pulls existing kubeApiServer from the cluster.
-func PullKubeAPIServerBuilder(apiClient *clients.Settings) (*KubeAPIServerBuilder, error) {
+// PullKubeAPIServer pulls existing kubeApiServer from the cluster.
+func PullKubeAPIServer(apiClient *clients.Settings) (*KubeAPIServerBuilder, error) {
 	glog.V(100).Infof("Pulling existing kubeApiServer from cluster")
 
 	if apiClient == nil {

diff --git a/pkg/apiservers/kubeapiserver_test.go b/pkg/apiservers/kubeapiserver_test.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-func TestPullKubeAPIServerBuilder(t *testing.T) {
+func TestPullKubeAPIServer(t *testing.T) {
 	generateKubeAPIServer := func() *operatorv1.KubeAPIServer {
 		return &operatorv1.KubeAPIServer{
 			ObjectMeta: metav1.ObjectMeta{
@@ -60,7 +60,7 @@ func TestPullKubeAPIServerBuilder(t *testing.T) {
 			testSettings = clients.GetTestClients(clients.TestClientParams{K8sMockObjects: runtimeObjects})
 		}
 
-		builderResult, err := PullKubeAPIServerBuilder(testSettings)
+		builderResult, err := PullKubeAPIServer(testSettings)
 
 		assert.Equal(t, testCase.expectedError, err)
 
@@ -202,26 +202,21 @@ func TestKubeAPIServerWaitUntilConditionTrue(t *testing.T) {
 func TestKubeAPIServerWaitAllNodesAtTheLatestRevision(t *testing.T) {
 	testCases := []struct {
 		testKubeAPIServerBuilder *KubeAPIServerBuilder
-		condition                string
 		expectedError            error
 	}{
 		{
-			condition:                "NodeInstallerProgressing",
 			testKubeAPIServerBuilder: buildValidKubeAPIServerBuilder(buildKubeAPIServerWithDummyObject()),
 			expectedError:            nil,
 		},
 		{
-			condition:                "unavailable",
 			testKubeAPIServerBuilder: buildValidKubeAPIServerBuilder(buildKubeAPIServerWithDummyObject()),
 			expectedError:            fmt.Errorf("the unavailable condition not found exists: context deadline exceeded"),
 		},
 		{
-			condition:                "",
 			testKubeAPIServerBuilder: buildValidKubeAPIServerBuilder(buildKubeAPIServerWithDummyObject()),
 			expectedError:            fmt.Errorf("kubeAPIServer 'conditionType' cannot be empty"),
 		},
 		{
-			condition:                "NodeInstallerProgressing",
 			testKubeAPIServerBuilder: buildValidKubeAPIServerBuilder(clients.GetTestClients(clients.TestClientParams{})),
 			expectedError:            fmt.Errorf("cluster kubeAPIServer not found"),
 		},

diff --git a/pkg/apiservers/openshiftapiserver.go b/pkg/apiservers/openshiftapiserver.go
@@ -31,24 +31,8 @@ type OpenshiftAPIServerBuilder struct {
 	errorMsg string
 }
 
-// Exists checks whether the given openshiftAPIServer exists.
-func (builder *OpenshiftAPIServerBuilder) Exists() bool {
-	if valid, _ := builder.validate(); !valid {
-		return false
-	}
-
-	var err error
-	builder.Object, err = builder.Get()
-
-	if err != nil {
-		glog.V(100).Infof("Failed to collect openshiftAPIServer object due to %s", err.Error())
-	}
-
-	return err == nil || !k8serrors.IsNotFound(err)
-}
-
-// PullOpenshiftAPIServerBuilder pulls existing openshiftApiServer from the cluster.
-func PullOpenshiftAPIServerBuilder(apiClient *clients.Settings) (*OpenshiftAPIServerBuilder, error) {
+// PullOpenshiftAPIServer pulls existing openshiftApiServer from the cluster.
+func PullOpenshiftAPIServer(apiClient *clients.Settings) (*OpenshiftAPIServerBuilder, error) {
 	glog.V(100).Infof("Pulling existing openshiftApiServer from cluster")
 
 	if apiClient == nil {
@@ -75,6 +59,22 @@ func PullOpenshiftAPIServerBuilder(apiClient *clients.Settings) (*OpenshiftAPISe
 	return &builder, nil
 }
 
+// Exists checks whether the given openshiftAPIServer exists.
+func (builder *OpenshiftAPIServerBuilder) Exists() bool {
+	if valid, _ := builder.validate(); !valid {
+		return false
+	}
+
+	var err error
+	builder.Object, err = builder.Get()
+
+	if err != nil {
+		glog.V(100).Infof("Failed to collect openshiftAPIServer object due to %s", err.Error())
+	}
+
+	return err == nil || !k8serrors.IsNotFound(err)
+}
+
 // Get returns openshiftAPIServer object if found.
 func (builder *OpenshiftAPIServerBuilder) Get() (*operatorV1.OpenShiftAPIServer, error) {
 	if valid, err := builder.validate(); !valid {
@@ -89,7 +89,7 @@ func (builder *OpenshiftAPIServerBuilder) Get() (*operatorV1.OpenShiftAPIServer,
 	if err != nil {
 		glog.V(100).Infof("openshiftAPIServer object doesn't exist")
 
-		return nil, fmt.Errorf("openshiftAPIServer object doesn't exist")
+		return nil, err
 	}
 
 	return openshiftAPIServer, err
@@ -104,6 +104,10 @@ func (builder *OpenshiftAPIServerBuilder) GetCondition(conditionType string) (
 
 	glog.V(100).Infof("Get %s openshiftAPIServer %s condition", builder.Definition.Name, conditionType)
 
+	if conditionType == "" {
+		return nil, "", fmt.Errorf("openshiftAPIServer 'conditionType' cannot be empty")
+	}
+
 	if !builder.Exists() {
 		return nil, "", fmt.Errorf("%s openshiftAPIServer not found", builder.Definition.Name)
 	}
@@ -131,6 +135,10 @@ func (builder *OpenshiftAPIServerBuilder) WaitUntilConditionTrue(
 		return err
 	}
 
+	if conditionType == "" {
+		return fmt.Errorf("openshiftAPIServer 'conditionType' cannot be empty")
+	}
+
 	if !builder.Exists() {
 		return fmt.Errorf("%s openshiftAPIServer not found", builder.Definition.Name)
 	}