Fix nil pointer ha e2e (FoundationDB#1952)

* Fix nil pointer exception when creating a FDB cluster in e2e test suite

e2e/fixtures/factory.go

@@ -188,7 +188,7 @@ func (factory *Factory) CreateFdbHaCluster(
 	startTime := time.Now()
 	config.SetDefaults(factory)
 
-	cluster, err := factory.ensureHAFdbClusterExists(
+	cluster := factory.ensureHAFdbClusterExists(
 		config,
 		options,
 	)
@@ -200,8 +200,6 @@ func (factory *Factory) CreateFdbHaCluster(
 		time.Since(startTime).Minutes(),
 	)
 
-	gomega.Expect(err).ToNot(gomega.HaveOccurred())
-
 	return cluster
 }
 

e2e/fixtures/fdb_operator_fixtures.go

@@ -22,6 +22,7 @@ package fixtures
 
 import (
 	"fmt"
+	"github.com/onsi/gomega"
 	"log"
 
 	fdbv1beta2 "github.com/FoundationDB/fdb-kubernetes-operator/api/v1beta2"
@@ -149,7 +150,7 @@ func (factory *Factory) ensureHaMemberClusterExists(
 func (factory *Factory) ensureHAFdbClusterExists(
 	config *ClusterConfig,
 	options []ClusterOption,
-) (*HaFdbCluster, error) {
+) *HaFdbCluster {
 	fdb := &HaFdbCluster{}
 	clusterPrefix := factory.getClusterName()
 
@@ -182,18 +183,13 @@ func (factory *Factory) ensureHAFdbClusterExists(
 		initialDatabaseConfiguration,
 		options,
 	)
-	if err != nil {
-		return nil, err
-	}
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 	err = fdb.WaitForReconciliation(CreationTrackerLoggerOption(config.CreationTracker))
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 	log.Printf("primary cluster is reconciled in namespaces=%s", namespaces)
-	if err != nil {
-		return nil, err
-	}
+
 	cluster, err := factory.getClusterStatus(fdb.GetPrimary().Name(), fdb.GetPrimary().Namespace())
-	if err != nil {
-		return nil, err
-	}
+	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
 	for idx := range dcIDs {
 		currentConfig := config.Copy()
@@ -208,20 +204,15 @@ func (factory *Factory) ensureHAFdbClusterExists(
 			&databaseConfiguration,
 			options,
 		)
-		if err != nil {
-			return nil, err
-		}
+		gomega.Expect(err).ToNot(gomega.HaveOccurred())
 	}
 
 	// Wait until clusters are ready
-	err = fdb.WaitForReconciliation(CreationTrackerLoggerOption(config.CreationTracker))
-	if err != nil {
-		return nil, err
-	}
+	gomega.Expect(fdb.WaitForReconciliation(CreationTrackerLoggerOption(config.CreationTracker))).ToNot(gomega.HaveOccurred())
 
 	config.CreationCallback(fdb.GetPrimary())
 
-	return fdb, nil
+	return fdb
 }
 
 // GetDcIDsFromConfig returns  unique DC IDs from the current config.