Merge pull request #63 from jianrongzhang89/host-fix

DBAAS-956 MongoDB Atlas Operator incorrectly sets host to empty when processing connections

Author: jianrongzhang89

pkg/controller/atlasconnection/atlasconnection_controller.go

@@ -150,8 +150,16 @@ func (r *MongoDBAtlasConnectionReconciler) Reconcile(cx context.Context, req ctr
 	projectID := instance.InstanceInfo[dbaas.ProjectIDKey]
 
 	if conn.Status.ConnectionInfoRef == nil {
+		srvString := instance.InstanceInfo[dbaas.ConnectionStringsStandardSrvKey]
+		if len(srvString) == 0 {
+			log.Info("Instance connection strings are empty. Will retry.")
+			result := workflow.Terminate(workflow.MongoDBAtlasInstanceNotReady, "Atlas database instance not ready")
+			dbaas.SetConnectionCondition(conn, dbaasv1alpha1.DBaaSConnectionProviderSyncType, metav1.ConditionFalse, string(result.Reason()), result.Message())
+			// Requeue
+			return ctrl.Result{}, fmt.Errorf("instance connection strings are empty")
+		}
 		// Now create a configmap for non-sensitive information needed for connecting to the DB instance
-		cm := getOwnedConfigMap(conn, instance.InstanceInfo[dbaas.ConnectionStringsStandardSrvKey])
+		cm := getOwnedConfigMap(conn, srvString)
 		cmCreated, err := r.Clientset.CoreV1().ConfigMaps(req.Namespace).Create(context.Background(), cm, metav1.CreateOptions{})
 		if err != nil {
 			result := workflow.Terminate(workflow.MongoDBAtlasConnectionBackendError, err.Error())

pkg/controller/atlasconnection/atlasconnection_test.go

@@ -206,6 +206,19 @@ func TestAtlasConnectionReconcile(t *testing.T) {
 			expectedStatus:      "False",
 			expectedReason:      "InventoryNotFound",
 		},
+		"InstanceNotReady": {
+			createConnection:    true,
+			configMapCreateFail: false,
+			secretCreateFail:    false,
+			instanceID:          "70b7a72f4877d05880cNoSrv",
+			inventoryReason:     "SyncOK",
+			inventoryStatus:     "True",
+			instancesPath:       "../../../test/e2e/data/atlasinventoryconditionsnosrv.json",
+			expectedErrString:   "instance connection strings are empty",
+			expectedRequeue:     false,
+			expectedStatus:      "False",
+			expectedReason:      "InstanceNotReady",
+		},
 		"ConfigMapCreateFail": {
 			createConnection:    true,
 			configMapCreateFail: true,
@@ -251,7 +264,7 @@ func TestAtlasConnectionReconcile(t *testing.T) {
 		t.Run(tcName, func(t *testing.T) {
 			instances := []dbaasv1alpha1.Instance{}
 			if len(tc.instancesPath) > 0 {
-				data, err := ioutil.ReadFile("../../../test/e2e/data/atlasinventoryexpected.json")
+				data, err := ioutil.ReadFile(tc.instancesPath)
 				assert.NoError(t, err)
 				err = json.Unmarshal(data, &instances)
 				assert.NoError(t, err)

pkg/controller/workflow/reason.go

@@ -81,6 +81,7 @@ const (
 	MongoDBAtlasInstanceReady               ConditionReason = "Ready"
 	MongoDBAtlasInstanceAtlasUnreachable    ConditionReason = "Unreachable"
 	MongoDBAtlasInstanceInventoryNotFound   ConditionReason = "InventoryNotFound"
+	MongoDBAtlasInstanceNotReady            ConditionReason = "InstanceNotReady"
 	MongoDBAtlasInstanceClusterNotFound     ConditionReason = "AtlasClusterNotFound"
 	MongoDBAtlasInstanceBackendError        ConditionReason = "BackendError"
 	MongoDBAtlasInstanceAuthenticationError ConditionReason = "AuthenticationError"

test/e2e/data/atlasinventoryconditionsnosrv.json

@@ -0,0 +1,14 @@
+[
+    {
+      "instanceID":"70b7a72f4877d05880cNoSrv",
+      "name":"testb",
+      "instanceInfo":{
+         "instanceSizeName":"M10",
+         "state":"Creating",
+         "projectID":"608df5e652e1944293e8584a",
+         "projectName":"Project 1",
+         "providerName":"AWS",
+         "regionName":"US_EAST_1"
+      }
+   }
+]