Merge branch 'DK-2230' into DK-2384

Author: raffis

api/v1beta1/database_types.go

@@ -38,8 +38,8 @@ type DatabaseSpec struct {
 	DatabaseName string `json:"databaseName"`
 
 	// The connect URI
-	// +required
-	Address string `json:"address"`
+	// +optional
+	Address string `json:"address,omitempty"`
 
 	// Contains a credentials set of a user with enough permission to manage databases and user accounts
 	// +required
@@ -76,7 +76,7 @@ type Role struct {
 	Name string `json:"name"`
 
 	// +optional
-	Db *string `json:"db,omitempty"`
+	Db string `json:"db,omitempty"`
 }
 
 // Extension is a resource representing database extension

api/v1beta1/mongodbdatabase_types.go

@@ -24,6 +24,7 @@ import (
 // MongoDBDatabaseSpec defines the desired state of MongoDBDatabase
 type MongoDBDatabaseSpec struct {
 	*DatabaseSpec `json:",inline"`
+	AtlasGroupId  string `json:"atlasGroupId,omitempty"`
 }
 
 // GetStatusConditions returns a pointer to the Status.Conditions slice
@@ -57,6 +58,10 @@ type MongoDBDatabase struct {
 	Status MongoDBDatabaseStatus `json:"status,omitempty"`
 }
 
+func (in *MongoDBDatabase) GetAtlasGroupId() string {
+	return in.Spec.AtlasGroupId
+}
+
 func (in *MongoDBDatabase) GetAddress() string {
 	return in.Spec.Address
 }

api/v1beta1/postgresqldatabase_types.go

@@ -57,6 +57,10 @@ type PostgreSQLDatabase struct {
 	Status PostgreSQLDatabaseStatus `json:"status,omitempty"`
 }
 
+func (in *PostgreSQLDatabase) GetAtlasGroupId() string {
+	return ""
+}
+
 func (in *PostgreSQLDatabase) GetAddress() string {
 	return in.Spec.Address
 }

common/db/atlas.go

@@ -73,9 +73,9 @@ func (m *AtlasRepository) EnableExtension(ctx context.Context, name string) erro
 }
 
 func (m *AtlasRepository) doesUserExist(ctx context.Context, database string, username string) (bool, error) {
-	user, _, err := m.atlas.DatabaseUsers.Get(ctx, database, m.groupId, username)
-	if user == nil {
-		return false, err
+	_, _, err := m.atlas.DatabaseUsers.Get(ctx, database, m.groupId, username)
+	if err != nil {
+		return false, nil
 	}
 
 	return true, err
@@ -93,13 +93,13 @@ func (m *AtlasRepository) getRoles(database string, roles []infrav1beta1.Role) [
 	rs := make([]mongodbatlas.Role, 0)
 	for _, r := range roles {
 		db := r.Db
-		if db == nil {
-			db = &database
+		if db == "" {
+			db = database
 		}
 
 		rs = append(rs, mongodbatlas.Role{
 			RoleName:     r.Name,
-			DatabaseName: *db,
+			DatabaseName: db,
 		})
 	}
 
@@ -108,9 +108,10 @@ func (m *AtlasRepository) getRoles(database string, roles []infrav1beta1.Role) [
 
 func (m *AtlasRepository) createUser(ctx context.Context, database string, username string, password string, roles []infrav1beta1.Role) error {
 	user := &mongodbatlas.DatabaseUser{
-		Username: username,
-		Password: password,
-		Roles:    m.getRoles(database, roles),
+		Username:     username,
+		Password:     password,
+		DatabaseName: database,
+		Roles:        m.getRoles(database, roles),
 	}
 
 	_, _, err := m.atlas.DatabaseUsers.Create(ctx, m.groupId, user)

common/db/handler.go

@@ -4,11 +4,10 @@ import (
 	"context"
 
 	infrav1beta1 "github.com/doodlescheduling/k8sdb-controller/api/v1beta1"
-	v1 "k8s.io/api/core/v1"
 )
 
 // Invoke a database handler
-type Invoke func(ctx context.Context, db *infrav1beta1.Database, secret *v1.Secret) (Handler, error)
+type Invoke func(ctx context.Context, uri, database, username, password string) (Handler, error)
 
 // Handler is a wrapper arround a certain database client
 type Handler interface {

common/db/mongodb.go

@@ -3,6 +3,7 @@ package db
 import (
 	"context"
 	"errors"
+	"time"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -36,7 +37,10 @@ type MongoDBRepository struct {
 }
 
 func NewMongoDBRepository(ctx context.Context, uri, database, username, password string) (Handler, error) {
-	o := options.Client().ApplyURI(uri)
+	o := options.Client()
+	o.SetConnectTimeout(time.Duration(2) * time.Second)
+	o.ApplyURI(uri)
+
 	o.SetAuth(options.Credential{
 		Username: username,
 		Password: password,
@@ -146,8 +150,8 @@ func (m *MongoDBRepository) getRoles(database string, roles []infrav1beta1.Role)
 	rs := make([]bson.M, 0)
 	for _, r := range roles {
 		db := r.Db
-		if db == nil {
-			db = &database
+		if db == "" {
+			db = database
 		}
 
 		rs = append(rs, bson.M{

common/db/pool.go

@@ -28,9 +28,25 @@ func NewPostgreSQLRepository(ctx context.Context, uri, database, username, passw
 
 	opt.User = url.UserPassword(username, password)
 
+	q, _ := url.ParseQuery(opt.RawQuery)
+	hasConnectTimeout := false
+	for k, _ := range q {
+		if k == "connect_timeout" {
+			hasConnectTimeout = true
+			break
+		}
+	}
+
+	if hasConnectTimeout == false {
+		q.Add("connect_timeout", "2")
+	}
+
+	opt.RawQuery = q.Encode()
+
 	if database != "" {
 		opt.Path = database
 	}
+
 	dbpool, err := pgxpool.Connect(ctx, opt.String())
 	if err != nil {
 		return nil, err

common/db/postgresql.go

@@ -51,6 +51,8 @@ spec:
               address:
                 description: The connect URI
                 type: string
+              atlasGroupId:
+                type: string
               databaseName:
                 description: DatabaseName is by default the same as metata.name
                 type: string
@@ -83,7 +85,6 @@ spec:
                 - name
                 type: object
             required:
-            - address
             - rootSecret
             type: object
           status:

config/crd/bases/dbprovisioning.infra.doodle.com_mongodbdatabases.yaml

@@ -83,7 +83,6 @@ spec:
                 - name
                 type: object
             required:
-            - address
             - rootSecret
             type: object
           status: