comments

f0ssel · f0ssel · commit fa799a6ab1c2 · 2024-08-13T17:08:10.000Z
diff --git a/coderd/database/awsiamrds/awsiamrds.go b/coderd/database/awsiamrds/awsiamrds.go
@@ -69,6 +69,7 @@ func (d *awsIamRdsDriver) Open(name string) (driver.Conn, error) {
 	return conn, nil
 }
 
+// Connector returns a driver.Connector that fetches a new authentication token for each connection.
 func (d *awsIamRdsDriver) Connector(name string) (driver.Connector, error) {
 	connector := &connector{
 		url: name,
@@ -122,7 +123,7 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
 	return nc.Connect(ctx)
 }
 
-func (c *connector) Driver() driver.Driver {
+func (*connector) Driver() driver.Driver {
 	return &pq.Driver{}
 }
 
diff --git a/coderd/database/connector.go b/coderd/database/connector.go
@@ -7,10 +7,12 @@ import (
 	"github.com/lib/pq"
 )
 
+// ConnectorCreator can create a driver.Connector.
 type ConnectorCreator interface {
 	Connector(name string) (driver.Connector, error)
 }
 
+// DialerConnector can create a driver.Connector and set a pq.Dialer.
 type DialerConnector interface {
 	Connect(context.Context) (driver.Conn, error)
 	Dialer(dialer pq.Dialer)
diff --git a/coderd/database/pubsub/pubsub.go b/coderd/database/pubsub/pubsub.go
@@ -441,15 +441,16 @@ func (p *PGPubsub) startListener(ctx context.Context, connectURL string) error {
 
 	// Create a custom connector if the database driver supports it.
 	connectorCreator, ok := p.db.Driver().(database.ConnectorCreator)
-	if !ok {
-		connector, err = pq.NewConnector(connectURL)
+	if ok {
+		connector, err = connectorCreator.Connector(connectURL)
 		if err != nil {
-			return xerrors.Errorf("create pq connector: %w", err)
+			return xerrors.Errorf("create custom connector: %w", err)
 		}
 	} else {
-		connector, err = connectorCreator.Connector(connectURL)
+		// use the default pq connector otherwise
+		connector, err = pq.NewConnector(connectURL)
 		if err != nil {
-			return xerrors.Errorf("create custom connector: %w", err)
+			return xerrors.Errorf("create pq connector: %w", err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ func (d *awsIamRdsDriver) Open(name string) (driver.Conn, error) {`
`69`	`69`	`return conn, nil`
`70`	`70`	`}`
`71`	`71`
	`72`	`+// Connector returns a driver.Connector that fetches a new authentication token for each connection.`
`72`	`73`	`func (d *awsIamRdsDriver) Connector(name string) (driver.Connector, error) {`
`73`	`74`	`connector := &connector{`
`74`	`75`	`url: name,`
`@@ -122,7 +123,7 @@ func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {`
`122`	`123`	`return nc.Connect(ctx)`
`123`	`124`	`}`
`124`	`125`
`125`		`-func (c *connector) Driver() driver.Driver {`
	`126`	`+func (*connector) Driver() driver.Driver {`
`126`	`127`	`return &pq.Driver{}`
`127`	`128`	`}`
`128`	`129`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,12 @@ import (`
`7`	`7`	`"github.com/lib/pq"`
`8`	`8`	`)`
`9`	`9`
	`10`	`+// ConnectorCreator can create a driver.Connector.`
`10`	`11`	`type ConnectorCreator interface {`
`11`	`12`	`Connector(name string) (driver.Connector, error)`
`12`	`13`	`}`
`13`	`14`
	`15`	`+// DialerConnector can create a driver.Connector and set a pq.Dialer.`
`14`	`16`	`type DialerConnector interface {`
`15`	`17`	`Connect(context.Context) (driver.Conn, error)`
`16`	`18`	`Dialer(dialer pq.Dialer)`