Merge pull request #7 from fly-apps/fix-cred-usage

davissp14 · web-flow · commit 3ba479de3e71 · 2022-12-14T10:46:49.000-06:00
Internal connections should use the flypgadmin user
diff --git a/config/pgbouncer.ini b/config/pgbouncer.ini
@@ -7,7 +7,7 @@ unix_socket_dir = /tmp
 auth_user = postgres
 auth_file = /data/pgbouncer.auth
 
-admin_users = postgres
+admin_users = postgres,flypgadmin
 
 user = postgres
 
diff --git a/pkg/flypg/node.go b/pkg/flypg/node.go
@@ -280,12 +280,12 @@ func (n *Node) PostInit() error {
 
 func (n *Node) NewPGBouncerConnection(ctx context.Context) (*pgx.Conn, error) {
 	host := net.JoinHostPort(n.PrivateIP, strconv.Itoa(n.ProxyPort))
-	return openConnection(ctx, host, "pgbouncer", n.OperatorCredentials)
+	return openConnection(ctx, host, "pgbouncer", n.SUCredentials)
 }
 
 func (n *Node) NewLocalConnection(ctx context.Context) (*pgx.Conn, error) {
 	host := net.JoinHostPort(n.PrivateIP, strconv.Itoa(n.PGPort))
-	return openConnection(ctx, host, "postgres", n.OperatorCredentials)
+	return openConnection(ctx, host, "postgres", n.SUCredentials)
 }
 
 func (n *Node) NewRepLocalConnection(ctx context.Context) (*pgx.Conn, error) {

Original file line number	Diff line number	Diff line change
`@@ -280,12 +280,12 @@ func (n *Node) PostInit() error {`
`280`	`280`
`281`	`281`	`func (n Node) NewPGBouncerConnection(ctx context.Context) (pgx.Conn, error) {`
`282`	`282`	`host := net.JoinHostPort(n.PrivateIP, strconv.Itoa(n.ProxyPort))`
`283`		`- return openConnection(ctx, host, "pgbouncer", n.OperatorCredentials)`
	`283`	`+ return openConnection(ctx, host, "pgbouncer", n.SUCredentials)`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`func (n Node) NewLocalConnection(ctx context.Context) (pgx.Conn, error) {`
`287`	`287`	`host := net.JoinHostPort(n.PrivateIP, strconv.Itoa(n.PGPort))`
`288`		`- return openConnection(ctx, host, "postgres", n.OperatorCredentials)`
	`288`	`+ return openConnection(ctx, host, "postgres", n.SUCredentials)`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`func (n Node) NewRepLocalConnection(ctx context.Context) (pgx.Conn, error) {`