added db to role

Author: raffis

api/v1beta1/database_types.go

@@ -73,7 +73,8 @@ type SecretReference struct {
 }
 
 type Role struct {
-	Name string `json:"name"`
+	Name string  `json:"name"`
+	Db   *string `json:"db,omitempty"`
 }
 
 // Extension is a resource representing database extension

api/v1beta1/mongodbuser_type.go

@@ -76,8 +76,12 @@ func (in *MongoDBUser) GetCredentials() *SecretReference {
 	return in.Spec.Credentials
 }
 
-func (in *MongoDBUser) GetRoles() *[]Role {
-	return in.Spec.Roles
+func (in *MongoDBUser) GetRoles() []Role {
+	if in.Spec.Roles == nil {
+		return []Role{}
+	}
+
+	return *in.Spec.Roles
 }
 
 // +kubebuilder:object:root=true

api/v1beta1/postgresqluser_type.go

@@ -68,9 +68,9 @@ func (in *PostgreSQLUser) GetCredentials() *SecretReference {
 	return in.Spec.Credentials
 }
 
-func (in *PostgreSQLUser) GetRoles() *[]Role {
+func (in *PostgreSQLUser) GetRoles() []Role {
 	// NOOP
-	return nil
+	return []Role{}
 }
 
 // +kubebuilder:object:root=true

common/db/handler.go

@@ -2,6 +2,8 @@ package db
 
 import (
 	"context"
+
+	infrav1beta1 "github.com/doodlescheduling/k8sdb-controller/api/v1beta1"
 )
 
 // Invoke a database handler
@@ -10,7 +12,7 @@ type Invoke func(ctx context.Context, uri, database, username, password string)
 // Handler is a wrapper arround a certain database client
 type Handler interface {
 	Close() error
-	SetupUser(database string, username string, password string, roles []string) error
+	SetupUser(database string, username string, password string, roles []infrav1beta1.Role) error
 	DropUser(database string, username string) error
 	CreateDatabaseIfNotExists(database string) error
 	EnableExtension(name string) error

common/db/mongodb.go

@@ -10,6 +10,8 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
+
+	infrav1beta1 "github.com/doodlescheduling/k8sdb-controller/api/v1beta1"
 )
 
 const (
@@ -67,7 +69,7 @@ func (m *MongoDBRepository) CreateDatabaseIfNotExists(database string) error {
 	return nil
 }
 
-func (m *MongoDBRepository) SetupUser(database string, username string, password string, roles []string) error {
+func (m *MongoDBRepository) SetupUser(database string, username string, password string, roles []infrav1beta1.Role) error {
 	doesUserExist, err := m.doesUserExist(database, username)
 	if err != nil {
 		return err
@@ -138,25 +140,30 @@ func (m *MongoDBRepository) getAllUsers(database string, username string) (Users
 	return users, nil
 }
 
-func (m *MongoDBRepository) getRoles(database string, roles []string) []bson.M {
+func (m *MongoDBRepository) getRoles(database string, roles []infrav1beta1.Role) []bson.M {
 	// by default, assign readWrite role (backward compatibility)
-	if roles == nil || len(roles) == 0 {
+	if len(roles) == 0 {
 		return []bson.M{{
 			"role": "readWrite",
 			"db":   database,
 		}}
 	}
 	rs := make([]bson.M, 0)
 	for _, r := range roles {
+		db := r.Db
+		if db == nil {
+			db = &database
+		}
+
 		rs = append(rs, bson.M{
-			"role": r,
-			"db":   database,
+			"role": r.Name,
+			"db":   db,
 		})
 	}
 	return rs
 }
 
-func (m *MongoDBRepository) createUser(database string, username string, password string, roles []string) error {
+func (m *MongoDBRepository) createUser(database string, username string, password string, roles []infrav1beta1.Role) error {
 	command := &bson.D{primitive.E{Key: "createUser", Value: username}, primitive.E{Key: "pwd", Value: password},
 		primitive.E{Key: "roles", Value: m.getRoles(database, roles)}}
 	r := m.runCommand(database, command)
@@ -166,7 +173,7 @@ func (m *MongoDBRepository) createUser(database string, username string, passwor
 	return nil
 }
 
-func (m *MongoDBRepository) updateUserPasswordAndRoles(database string, username string, password string, roles []string) error {
+func (m *MongoDBRepository) updateUserPasswordAndRoles(database string, username string, password string, roles []infrav1beta1.Role) error {
 	command := &bson.D{primitive.E{Key: "updateUser", Value: username}, primitive.E{Key: "pwd", Value: password},
 		primitive.E{Key: "roles", Value: m.getRoles(database, roles)}}
 	r := m.runCommand(database, command)

common/db/postgresql.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/url"
 
+	infrav1beta1 "github.com/doodlescheduling/k8sdb-controller/api/v1beta1"
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
 )
@@ -69,7 +70,7 @@ func (s *PostgreSQLRepository) CreateDatabaseIfNotExists(database string) error
 	}
 }
 
-func (s *PostgreSQLRepository) SetupUser(database string, user string, password string, roles []string) error {
+func (s *PostgreSQLRepository) SetupUser(database string, user string, password string, roles []infrav1beta1.Role) error {
 	if err := s.createUserIfNotExists(user); err != nil {
 		return err
 	}

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

@@ -80,6 +80,8 @@ spec:
                 - name: readWrite
                 items:
                   properties:
+                    db:
+                      type: string
                     name:
                       type: string
                   required:

controllers/handler.go

@@ -40,7 +40,7 @@ type user interface {
 	runtime.Object
 	GetStatusConditions() *[]metav1.Condition
 	GetCredentials() *infrav1beta1.SecretReference
-	GetRoles() *[]infrav1beta1.Role
+	GetRoles() []infrav1beta1.Role
 	GetDatabase() string
 }
 
@@ -73,17 +73,6 @@ func extractCredentials(credentials *infrav1beta1.SecretReference, secret *corev
 	return user, pw, nil
 }
 
-func extractRoles(roles *[]infrav1beta1.Role) []string {
-	if roles == nil || len(*roles) == 0 {
-		return nil
-	}
-	rolesToReturn := make([]string, 0)
-	for _, r := range *roles {
-		rolesToReturn = append(rolesToReturn, r.Name)
-	}
-	return rolesToReturn
-}
-
 func reconcileDatabase(c client.Client, pool *db.ClientPool, invoke db.Invoke, database database, recorder record.EventRecorder) (database, ctrl.Result) {
 	// Fetch referencing root secret
 	secret := &corev1.Secret{}
@@ -215,7 +204,7 @@ func reconcileUser(database database, c client.Client, pool *db.ClientPool, invo
 		return user, ctrl.Result{Requeue: true}
 	}
 
-	err = dbHandler.SetupUser(database.GetDatabaseName(), usr, pw, extractRoles(user.GetRoles()))
+	err = dbHandler.SetupUser(database.GetDatabaseName(), usr, pw, user.GetRoles())
 	if err != nil {
 		msg := fmt.Sprintf("Failed to provison user account: %s", err.Error())
 		recorder.Event(user, "Normal", "error", msg)