From 3c77b6f4cb1f6aeb11c6679b9d81b5c31d807ec9 Mon Sep 17 00:00:00 2001
From: Hiranmoy Das Chowdhury <hiranmoy@appscode.com>
Date: Thu, 29 Aug 2024 16:02:30 +0600
Subject: [PATCH] collect info from pgbouncer config secret Signed-off-by:
 Hiranmoy Das Chowdhury <hiranmoy@appscode.com>

---
 pgbouncer/client.go                |  9 ++++----
 pgbouncer/kubedb_client_builder.go | 35 +++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pgbouncer/client.go b/pgbouncer/client.go
index 30749a4c..f5a966c1 100644
--- a/pgbouncer/client.go
+++ b/pgbouncer/client.go
@@ -39,8 +39,9 @@ type XormClientList struct {
 	Mutex sync.Mutex
 	WG    sync.WaitGroup
 
-	context context.Context
-	pb      *dbapi.PgBouncer
-	auth    *Auth
-	dbName  string
+	context         context.Context
+	pb              *dbapi.PgBouncer
+	pbContainerPort rune
+	auth            *Auth
+	dbName          string
 }
diff --git a/pgbouncer/kubedb_client_builder.go b/pgbouncer/kubedb_client_builder.go
index cbea24f7..3397befe 100644
--- a/pgbouncer/kubedb_client_builder.go
+++ b/pgbouncer/kubedb_client_builder.go
@@ -43,14 +43,15 @@ type Auth struct {
 }
 
 type KubeDBClientBuilder struct {
-	kc            client.Client
-	pgbouncer     *dbapi.PgBouncer
-	url           string
-	podName       string
-	backendDBName string
-	ctx           context.Context
-	databaseRef   *dbapi.Database
-	auth          *Auth
+	kc              client.Client
+	pgbouncer       *dbapi.PgBouncer
+	url             string
+	podName         string
+	pbContainerPort *int32
+	backendDBName   string
+	ctx             context.Context
+	databaseRef     *dbapi.Database
+	auth            *Auth
 }
 
 func NewKubeDBClientBuilder(kc client.Client, pb *dbapi.PgBouncer) *KubeDBClientBuilder {
@@ -65,6 +66,11 @@ func (o *KubeDBClientBuilder) WithURL(url string) *KubeDBClientBuilder {
 	return o
 }
 
+func (o *KubeDBClientBuilder) WithPbPort(listenPort int32) *KubeDBClientBuilder {
+	o.pbContainerPort = &listenPort
+	return o
+}
+
 func (o *KubeDBClientBuilder) WithAuth(auth *Auth) *KubeDBClientBuilder {
 	if auth != nil && auth.UserName != "" && auth.Password != "" {
 		o.auth = auth
@@ -82,7 +88,7 @@ func (o *KubeDBClientBuilder) WithDatabaseRef(db *dbapi.Database) *KubeDBClientB
 	return o
 }
 
-func (o *KubeDBClientBuilder) WithPostgresDBName(dbName string) *KubeDBClientBuilder {
+func (o *KubeDBClientBuilder) WithDatabaseName(dbName string) *KubeDBClientBuilder {
 	if dbName == "" {
 		o.backendDBName = o.databaseRef.DatabaseName
 	} else {
@@ -176,15 +182,15 @@ func (o *KubeDBClientBuilder) getConnectionString() (string, error) {
 	}
 
 	var listeningPort int = kubedb.PgBouncerDatabasePort
-	if o.pgbouncer.Spec.ConnectionPool.Port != nil {
-		listeningPort = int(*o.pgbouncer.Spec.ConnectionPool.Port)
+	if o.pbContainerPort != nil {
+		listeningPort = int(*o.pbContainerPort)
 	}
 	// TODO ssl mode is disable now need to work on this after adding tls support
 	connector := fmt.Sprintf("user=%s password=%s host=%s port=%d connect_timeout=10 dbname=%s sslmode=%s", user, pass, o.url, listeningPort, o.backendDBName, TLSModeDisable)
 	return connector, nil
 }
 
-func GetXormClientList(kc client.Client, pb *dbapi.PgBouncer, ctx context.Context, auth *Auth, dbName string) (*XormClientList, error) {
+func GetXormClientList(kc client.Client, pb *dbapi.PgBouncer, ctx context.Context, auth *Auth, dbName string, listenPort rune) (*XormClientList, error) {
 	clientlist := &XormClientList{
 		List: []*XormClient{},
 	}
@@ -192,6 +198,7 @@ func GetXormClientList(kc client.Client, pb *dbapi.PgBouncer, ctx context.Contex
 	clientlist.pb = pb
 	clientlist.auth = auth
 	clientlist.dbName = dbName
+	clientlist.pbContainerPort = listenPort
 
 	for i := 0; int32(i) < *pb.Spec.Replicas; i++ {
 		podName := fmt.Sprintf("%s-%d", pb.OffshootName(), i)
@@ -216,7 +223,9 @@ func GetXormClientList(kc client.Client, pb *dbapi.PgBouncer, ctx context.Contex
 }
 
 func (l *XormClientList) addXormClient(kc client.Client, podName string) {
-	xormClient, err := NewKubeDBClientBuilder(kc, l.pb).WithContext(l.context).WithDatabaseRef(&l.pb.Spec.Database).WithPod(podName).WithAuth(l.auth).WithPostgresDBName(l.dbName).GetPgBouncerXormClient()
+	xormClient, err := NewKubeDBClientBuilder(kc, l.pb).WithContext(l.context).WithDatabaseRef(&l.pb.Spec.Database).
+		WithPod(podName).WithAuth(l.auth).WithDatabaseName(l.dbName).WithPbPort(l.pbContainerPort).GetPgBouncerXormClient()
+
 	l.Mutex.Lock()
 	defer l.Mutex.Unlock()
 	if err != nil {