DBAAS-972 Grant access to the newly created database instance in Atlas Operator: address review comments

Author: jianrongzhang89

config/dbaasprovider/dbaas_provider.yaml

@@ -64,8 +64,7 @@ spec:
       type: string
       required: false
       defaultValue: M0
-    - name: IPAccessList
+    - name: ipAccessList
       displayName: List of IP Addresses or Ranges (Space Separated) to Access the Cluster
       type: string
       required: false
-      defaultValue: 0.0.0.0/0

pkg/api/dbaas/mongodbatlasinstance_types.go

@@ -14,6 +14,10 @@ limitations under the License.
 package dbaas
 
 import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	dbaasv1alpha1 "github.com/RHEcosystemAppEng/dbaas-operator/api/v1alpha1"
@@ -94,3 +98,24 @@ func GetInstanceCondition(inv *MongoDBAtlasInstance, condType string) *metav1.Co
 	}
 	return nil
 }
+
+type IP struct {
+	Query string
+}
+
+// GetPublicIP returns the static outbound public IP of the OpenShift Cluster
+// Or when the operator runs locally, the h
+func GetPublicIP() (string, error) {
+	req, err := http.Get("http://ip-api.com/json/")
+	if err != nil {
+		return "", err
+	}
+	defer req.Body.Close()
+	body, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return "", err
+	}
+	var ip IP
+	json.Unmarshal(body, &ip)
+	return ip.Query, nil
+}

pkg/controller/atlasinstance/atlasinstance_controller.go

@@ -477,8 +477,13 @@ func getInstanceData(log *zap.SugaredLogger, inst *dbaas.MongoDBAtlasInstance) (
 
 	accessIP, ok := inst.Spec.OtherInstanceParams[dbaas.IPAccessListKey]
 	if !ok || len(strings.TrimSpace(accessIP)) == 0 {
-		accessIP = "0.0.0.0/0"
-		log.Infof("%v is missing, default value %s is used to allow access from anywhere.", dbaas.IPAccessListKey, accessIP)
+		ip, err := dbaas.GetPublicIP()
+		if err != nil {
+			log.Infof("Failed to get the public IP")
+			return nil, err
+		}
+		accessIP = ip
+		log.Infof("%v is missing, current IP %s is used.", dbaas.IPAccessListKey, accessIP)
 	}
 
 	return &InstanceData{

pkg/controller/atlasinstance/atlasinstance_test.go

@@ -118,7 +118,7 @@ func TestGetInstanceData(t *testing.T) {
 			expRegionName:       "AWS_REGION",
 			expInstanceSizeName: "M10",
 			expErrMsg:           "",
-			expIPAccessList:     "0.0.0.0/0",
+			expIPAccessList:     "52.206.222.245/32",
 		},
 		"UseDefaultRegion": {
 			deploymentName:      "myDeployment",
@@ -142,7 +142,7 @@ func TestGetInstanceData(t *testing.T) {
 			expRegionName:       "US_EAST_1",
 			expInstanceSizeName: "M0",
 			expErrMsg:           "",
-			expIPAccessList:     "0.0.0.0/0",
+			expIPAccessList:     "52.206.222.245/32",
 		},
 	}
 
@@ -406,7 +406,7 @@ func TestAtlasInstanceReconcile(t *testing.T) {
 	tcName := "mytest"
 	deploymentName := "mydeploymentnew"
 	projectName := "myproject"
-	ipAccessList := "0.0.0.0/0"
+	ipAccessList := "52.206.222.245/32"
 	expectedPhase := dbaasv1alpha1.InstancePhasePending
 	expectedErrString := "CLUSTER_NOT_FOUND"
 	expectedRequeue := true

pkg/controller/dbaasprovider/dbaasprovider_reconciler.go

@@ -26,6 +26,7 @@ import (
 	"time"
 
 	dbaasoperator "github.com/RHEcosystemAppEng/dbaas-operator/api/v1alpha1"
+	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/dbaas"
 	"go.uber.org/zap"
 	v1 "k8s.io/api/apps/v1"
 	rbac "k8s.io/api/rbac/v1"
@@ -164,6 +165,17 @@ func (r *DBaaSProviderReconciler) getAtlasProviderCR(clusterRoleList *rbac.Clust
 	if err != nil {
 		return nil, err
 	}
+
+	for ind, spec := range instance.Spec.InstanceParameterSpecs {
+		if spec.Name == dbaas.IPAccessListKey {
+			ip, err := dbaas.GetPublicIP()
+			if err != nil {
+				return nil, err
+			}
+			spec.DefaultValue = ip
+			instance.Spec.InstanceParameterSpecs[ind] = spec
+		}
+	}
 	instance.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
 		{
 			APIVersion:         "rbac.authorization.k8s.io/v1",