Adding private connection string counterparts. (#344)

Authored-by: Jeremy Hill <[email protected]>

Author: jhill072

pkg/api/v1/status/zz_generated.deepcopy.go

@@ -51,10 +51,12 @@ func CreateOrUpdateConnectionSecrets(ctx *workflow.Context, k8sClient client.Cli
 			return workflow.Terminate(workflow.DatabaseUserConnectionSecretsNotCreated, err.Error())
 		}
 		data := connectionsecret.ConnectionData{
-			DBUserName: dbUser.Spec.Username,
-			ConnURL:    cluster.ConnectionStrings.Standard,
-			SrvConnURL: cluster.ConnectionStrings.StandardSrv,
-			Password:   password,
+			DBUserName:    dbUser.Spec.Username,
+			ConnURL:       cluster.ConnectionStrings.Standard,
+			SrvConnURL:    cluster.ConnectionStrings.StandardSrv,
+			PvtConnURL:    cluster.ConnectionStrings.Private,
+			PvtSrvConnURL: cluster.ConnectionStrings.PrivateSrv,
+			Password:      password,
 		}
 		var secretName string
 		if secretName, err = connectionsecret.Ensure(k8sClient, dbUser.Namespace, project.Spec.Name, project.ID(), cluster.Name, data); err != nil {

pkg/api/v1/zz_generated.deepcopy.go

@@ -19,12 +19,14 @@ const (
 
 	connectionSecretStdKey    string = "connectionStringStandard"
 	connectionSecretStdSrvKey string = "connectionStringStandardSrv"
+	connectionSecretPvtKey    string = "connectionStringPrivate"
+	connectionSecretPvtSrvKey string = "connectionStringPrivateSrv"
 	userNameKey               string = "username"
 	passwordKey               string = "password"
 )
 
 type ConnectionData struct {
-	DBUserName, ConnURL, SrvConnURL, Password string
+	DBUserName, ConnURL, SrvConnURL, PvtConnURL, PvtSrvConnURL, Password string
 }
 
 // Ensure creates or updates the connection Secret for the specific cluster and db user. Returns the name of the Secret
@@ -50,20 +52,32 @@ func Ensure(client client.Client, namespace, projectName, projectID, clusterName
 }
 
 func fillSecret(secret *corev1.Secret, projectID string, clusterName string, data ConnectionData) error {
-	var connURL, srvConnURL string
+	var connURL, srvConnURL, pvtConnURL, pvtSrvConnURL string
 	var err error
 	if connURL, err = AddCredentialsToConnectionURL(data.ConnURL, data.DBUserName, data.Password); err != nil {
 		return err
 	}
 	if srvConnURL, err = AddCredentialsToConnectionURL(data.SrvConnURL, data.DBUserName, data.Password); err != nil {
 		return err
 	}
+	if data.PvtConnURL != "" {
+		if pvtConnURL, err = AddCredentialsToConnectionURL(data.PvtConnURL, data.DBUserName, data.Password); err != nil {
+			return err
+		}
+	}
+	if data.PvtSrvConnURL != "" {
+		if pvtSrvConnURL, err = AddCredentialsToConnectionURL(data.PvtSrvConnURL, data.DBUserName, data.Password); err != nil {
+			return err
+		}
+	}
 
 	secret.Labels = map[string]string{ProjectLabelKey: projectID, ClusterLabelKey: kube.NormalizeLabelValue(clusterName)}
 
 	secret.Data = map[string][]byte{
 		connectionSecretStdKey:    []byte(connURL),
 		connectionSecretStdSrvKey: []byte(srvConnURL),
+		connectionSecretPvtKey:    []byte(pvtConnURL),
+		connectionSecretPvtSrvKey: []byte(pvtSrvConnURL),
 		userNameKey:               []byte(data.DBUserName),
 		passwordKey:               []byte(data.Password),
 	}

pkg/controller/atlasdatabaseuser/connectionsecrets.go

@@ -86,6 +86,8 @@ func validateSecret(t *testing.T, fakeClient client.Client, namespace, projectNa
 	expectedData := map[string][]byte{
 		"connectionStringStandard":    []byte(buildConnectionURL(data.ConnURL, data.DBUserName, data.Password)),
 		"connectionStringStandardSrv": []byte(buildConnectionURL(data.SrvConnURL, data.DBUserName, data.Password)),
+		"connectionStringPrivate":     []byte(buildConnectionURL(data.PvtConnURL, data.DBUserName, data.Password)),
+		"connectionStringPrivateSrv":  []byte(buildConnectionURL(data.PvtSrvConnURL, data.DBUserName, data.Password)),
 		"username":                    []byte(data.DBUserName),
 		"password":                    []byte(data.Password),
 	}
@@ -109,9 +111,11 @@ func buildConnectionURL(connURL, userName, password string) string {
 
 func dataForSecret() ConnectionData {
 	return ConnectionData{
-		DBUserName: "admin",
-		ConnURL:    "mongodb://mongodb0.example.com:27017,mongodb1.example.com:27017/?authSource=admin",
-		SrvConnURL: "mongodb+srv://mongodb.example.com:27017/?authSource=admin",
-		Password:   "m@gick%",
+		DBUserName:    "admin",
+		ConnURL:       "mongodb://mongodb0.example.com:27017,mongodb1.example.com:27017/?authSource=admin",
+		SrvConnURL:    "mongodb+srv://mongodb.example.com:27017/?authSource=admin",
+		PvtConnURL:    "mongodb://mongodb0-pri.example.com:27017,mongodb1-pri.example.com:27017/?authSource=admin",
+		PvtSrvConnURL: "mongodb+srv://mongodb-pri.example.com:27017/?authSource=admin",
+		Password:      "m@gick%",
 	}
 }

pkg/controller/connectionsecret/ensuresecret.go

@@ -673,6 +673,8 @@ func validateSecret(k8sClient client.Client, project mdbv1.AtlasProject, cluster
 	expectedData := map[string][]byte{
 		"connectionStringStandard":    []byte(buildConnectionURL(c.ConnectionStrings.Standard, username, password)),
 		"connectionStringStandardSrv": []byte(buildConnectionURL(c.ConnectionStrings.StandardSrv, username, password)),
+		"connectionStringPrivate":     []byte(buildConnectionURL(c.ConnectionStrings.Private, username, password)),
+		"connectionStringPrivateSrv":  []byte(buildConnectionURL(c.ConnectionStrings.PrivateSrv, username, password)),
 		"username":                    []byte(username),
 		"password":                    []byte(password),
 	}
@@ -700,6 +702,10 @@ func checkNumberOfConnectionSecrets(k8sClient client.Client, project mdbv1.Atlas
 }
 
 func buildConnectionURL(connURL, userName, password string) string {
+	if connURL == "" {
+		return ""
+	}
+
 	u, err := connectionsecret.AddCredentialsToConnectionURL(connURL, userName, password)
 	Expect(err).NotTo(HaveOccurred())
 	return u