refactor to have multiple db connections on provider level

Author: Abdelkarim Boujida

docs/index.md

@@ -32,3 +32,24 @@ provider "cloudsqlpostgresql" {
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
+
+### Required
+
+- `connection_configs` (Attributes Map) A map of connections of Postgresql database instances (see [below for nested schema](#nestedatt--connection_configs))
+
+<a id="nestedatt--connection_configs"></a>
+### Nested Schema for `connection_configs`
+
+Required:
+
+- `connection_name` (String) The connection name of the Google Cloud SQL Postgresql instance. The `connection_name` format should be `<project>:<region>:<instance>`
+- `password` (String, Sensitive) The password to use to authenticate using the built-in database authentication
+- `username` (String) The username to use to authenticate with the Cloud SQL Postgresql instance
+
+Optional:
+
+- `database` (String) The database to connect to. Defaults to `postgres`.
+- `private_ip` (Boolean) Use the private IP address of the Cloud SQL Postgresql instance to connect to
+- `proxy` (String) Proxy socks url if used. Format needs to be `socks5://<ip>:<port>`
+- `psc` (Boolean) Use the Private Service Connect endpoint of the Cloud SQL Postgresql instance to connect to
+- `ssl_mode` (String) Determine the security of the connection to the Cloud SQL Postgresql instance

docs/resources/default_privileges.md

@@ -17,7 +17,7 @@ The `cloudsqlpostgresql_default_privileges` resource allows to set the privilege
 
 ### Required
 
-- `connection_config` (Attributes) The connection properties for the Cloud SQL instance. (see [below for nested schema](#nestedatt--connection_config))
+- `connection_config` (String) The key of the connection defined in the provider
 - `owner` (String) The target role
 - `privileges` (Attributes Set) A list of privileges (see [below for nested schema](#nestedatt--privileges))
 - `role` (String) The role
@@ -27,24 +27,6 @@ The `cloudsqlpostgresql_default_privileges` resource allows to set the privilege
 - `object_type` (String) The object type, can be `TABLES`, `SEQUENCES`, `FUNCTIONS`, `ROUTINES`, `TYPES` or `SCHEMAS`. Defaults to `TABLES`.
 - `schema` (String) The schema
 
-<a id="nestedatt--connection_config"></a>
-### Nested Schema for `connection_config`
-
-Required:
-
-- `connection_name` (String) The connection name of the Google Cloud SQL Postgresql instance. The `connection_name` format should be `<project>:<region>:<instance>`
-- `password` (String, Sensitive) The password to use to authenticate using the built-in database authentication
-- `username` (String) The username to use to authenticate with the Cloud SQL Postgresql instance
-
-Optional:
-
-- `database` (String) The database to connect to. Defaults to `postgres`.
-- `private_ip` (Boolean) Use the private IP address of the Cloud SQL Postgresql instance to connect to
-- `proxy` (String) Proxy socks url if used. Format needs to be `socks5://<ip>:<port>`
-- `psc` (Boolean) Use the Private Service Connect endpoint of the Cloud SQL Postgresql instance to connect to
-- `ssl_mode` (String) Determine the security of the connection to the Cloud SQL Postgresql instance
-
-
 <a id="nestedatt--privileges"></a>
 ### Nested Schema for `privileges`
 

docs/resources/grant_database.md

@@ -29,29 +29,11 @@ resource "cloudsqlpostgresql_grant_database" "default" {
 
 ### Required
 
-- `connection_config` (Attributes) The connection properties for the Cloud SQL instance. (see [below for nested schema](#nestedatt--connection_config))
+- `connection_config` (String) The key of the connection defined in the provider
 - `database` (String) The database on which the privileges will be granted for this role.
 - `privileges` (Attributes Set) A list of privileges to grant on the database for this role. (see [below for nested schema](#nestedatt--privileges))
 - `role` (String) The name of the role to grant privileges on the database. Can be username or role.
 
-<a id="nestedatt--connection_config"></a>
-### Nested Schema for `connection_config`
-
-Required:
-
-- `connection_name` (String) The connection name of the Google Cloud SQL Postgresql instance. The `connection_name` format should be `<project>:<region>:<instance>`
-- `password` (String, Sensitive) The password to use to authenticate using the built-in database authentication
-- `username` (String) The username to use to authenticate with the Cloud SQL Postgresql instance
-
-Optional:
-
-- `database` (String) The database to connect to. Defaults to `postgres`.
-- `private_ip` (Boolean) Use the private IP address of the Cloud SQL Postgresql instance to connect to
-- `proxy` (String) Proxy socks url if used. Format needs to be `socks5://<ip>:<port>`
-- `psc` (Boolean) Use the Private Service Connect endpoint of the Cloud SQL Postgresql instance to connect to
-- `ssl_mode` (String) Determine the security of the connection to the Cloud SQL Postgresql instance
-
-
 <a id="nestedatt--privileges"></a>
 ### Nested Schema for `privileges`
 

docs/resources/grant_role.md

@@ -17,27 +17,10 @@ The `cloudsqlpostgresql_grant_role` resource creates and manages role membership
 
 ### Required
 
-- `connection_config` (Attributes) The connection properties for the Cloud SQL instance. (see [below for nested schema](#nestedatt--connection_config))
+- `connection_config` (String) The key of the connection defined in the provider
 - `group_role` (String) The `group_role` that will get the `role` as member
 - `role` (String) The `role` that will be a member of the `group_role`
 
 ### Optional
 
 - `admin_option` (Boolean) Enable admin option
-
-<a id="nestedatt--connection_config"></a>
-### Nested Schema for `connection_config`
-
-Required:
-
-- `connection_name` (String) The connection name of the Google Cloud SQL Postgresql instance. The `connection_name` format should be `<project>:<region>:<instance>`
-- `password` (String, Sensitive) The password to use to authenticate using the built-in database authentication
-- `username` (String) The username to use to authenticate with the Cloud SQL Postgresql instance
-
-Optional:
-
-- `database` (String) The database to connect to. Defaults to `postgres`.
-- `private_ip` (Boolean) Use the private IP address of the Cloud SQL Postgresql instance to connect to
-- `proxy` (String) Proxy socks url if used. Format needs to be `socks5://<ip>:<port>`
-- `psc` (Boolean) Use the Private Service Connect endpoint of the Cloud SQL Postgresql instance to connect to
-- `ssl_mode` (String) Determine the security of the connection to the Cloud SQL Postgresql instance

docs/resources/grant_schema.md

@@ -30,29 +30,11 @@ resource "cloudsqlpostgresql_grant_database" "default" {
 
 ### Required
 
-- `connection_config` (Attributes) The connection properties for the Cloud SQL instance. (see [below for nested schema](#nestedatt--connection_config))
+- `connection_config` (String) The key of the connection defined in the provider
 - `privileges` (Attributes Set) A list of privileges to grant on the schema for this role. (see [below for nested schema](#nestedatt--privileges))
 - `role` (String) The name of the role to grant privileges on the schema. Can be username or role.
 - `schema` (String) The schema on which the privileges will be granted for this role.
 
-<a id="nestedatt--connection_config"></a>
-### Nested Schema for `connection_config`
-
-Required:
-
-- `connection_name` (String) The connection name of the Google Cloud SQL Postgresql instance. The `connection_name` format should be `<project>:<region>:<instance>`
-- `password` (String, Sensitive) The password to use to authenticate using the built-in database authentication
-- `username` (String) The username to use to authenticate with the Cloud SQL Postgresql instance
-
-Optional:
-
-- `database` (String) The database to connect to. Defaults to `postgres`.
-- `private_ip` (Boolean) Use the private IP address of the Cloud SQL Postgresql instance to connect to
-- `proxy` (String) Proxy socks url if used. Format needs to be `socks5://<ip>:<port>`
-- `psc` (Boolean) Use the Private Service Connect endpoint of the Cloud SQL Postgresql instance to connect to
-- `ssl_mode` (String) Determine the security of the connection to the Cloud SQL Postgresql instance
-
-
 <a id="nestedatt--privileges"></a>
 ### Nested Schema for `privileges`
 

docs/resources/grant_table.md

@@ -34,30 +34,12 @@ resource "cloudsqlpostgresql_grant_table" "default" {
 
 ### Required
 
-- `connection_config` (Attributes) The connection properties for the Cloud SQL instance. (see [below for nested schema](#nestedatt--connection_config))
+- `connection_config` (String) The key of the connection defined in the provider
 - `privileges` (Attributes Set) A list of privileges to grant on the table for this role. (see [below for nested schema](#nestedatt--privileges))
 - `role` (String) The name of the role to grant privileges on the table. Can be username or role.
 - `schema` (String) The schema where the table resides.
 - `table` (String) The table on which the privileges will be granted for this role.
 
-<a id="nestedatt--connection_config"></a>
-### Nested Schema for `connection_config`
-
-Required:
-
-- `connection_name` (String) The connection name of the Google Cloud SQL Postgresql instance. The `connection_name` format should be `<project>:<region>:<instance>`
-- `password` (String, Sensitive) The password to use to authenticate using the built-in database authentication
-- `username` (String) The username to use to authenticate with the Cloud SQL Postgresql instance
-
-Optional:
-
-- `database` (String) The database to connect to. Defaults to `postgres`.
-- `private_ip` (Boolean) Use the private IP address of the Cloud SQL Postgresql instance to connect to
-- `proxy` (String) Proxy socks url if used. Format needs to be `socks5://<ip>:<port>`
-- `psc` (Boolean) Use the Private Service Connect endpoint of the Cloud SQL Postgresql instance to connect to
-- `ssl_mode` (String) Determine the security of the connection to the Cloud SQL Postgresql instance
-
-
 <a id="nestedatt--privileges"></a>
 ### Nested Schema for `privileges`
 

docs/resources/role.md

@@ -17,7 +17,7 @@ The `cloudsqlpostgresql_role` resource creates and manages a role. The superuser
 
 ### Required
 
-- `connection_config` (Attributes) The connection properties for the Cloud SQL instance. (see [below for nested schema](#nestedatt--connection_config))
+- `connection_config` (String) The key of the connection defined in the provider
 - `name` (String) The name of the role
 
 ### Optional
@@ -31,20 +31,3 @@ The `cloudsqlpostgresql_role` resource creates and manages a role. The superuser
 - `is_user` (Boolean) Is this role a user that can login
 - `is_valid_until` (String) Sets a date and time after which the role's password is no longer valid
 - `password` (String, Sensitive) Sets the role's password
-
-<a id="nestedatt--connection_config"></a>
-### Nested Schema for `connection_config`
-
-Required:
-
-- `connection_name` (String) The connection name of the Google Cloud SQL Postgresql instance. The `connection_name` format should be `<project>:<region>:<instance>`
-- `password` (String, Sensitive) The password to use to authenticate using the built-in database authentication
-- `username` (String) The username to use to authenticate with the Cloud SQL Postgresql instance
-
-Optional:
-
-- `database` (String) The database to connect to. Defaults to `postgres`.
-- `private_ip` (Boolean) Use the private IP address of the Cloud SQL Postgresql instance to connect to
-- `proxy` (String) Proxy socks url if used. Format needs to be `socks5://<ip>:<port>`
-- `psc` (Boolean) Use the Private Service Connect endpoint of the Cloud SQL Postgresql instance to connect to
-- `ssl_mode` (String) Determine the security of the connection to the Cloud SQL Postgresql instance

internal/provider/config.go

@@ -17,42 +17,53 @@ import (
 type Config struct {
 	dbRegistry      map[string]*sql.DB
 	dbRegistryMutex sync.Mutex
+	dbDrivers       map[string]bool
+	dbDriversMutex  sync.Mutex
+	connections     map[string]*ConnectionConfig
 }
 
 func NewConfig() *Config {
 	return &Config{
-		dbRegistry: make(map[string]*sql.DB),
+		dbRegistry:  make(map[string]*sql.DB),
+		dbDrivers:   make(map[string]bool),
+		connections: make(map[string]*ConnectionConfig),
 	}
 }
 
 func (c *Config) connectToPostgresql(ctx context.Context, cc *ConnectionConfig) (*sql.DB, error) {
 	c.dbRegistryMutex.Lock()
 	defer c.dbRegistryMutex.Unlock()
 
-	id, err := cc.Id()
-	if err != nil {
-		return nil, err
-	}
+	key := cc.DsnKey()
 
-	if c.dbRegistry[id] != nil {
-		return c.dbRegistry[id], nil
+	if c.dbRegistry[key] != nil {
+		return c.dbRegistry[key], nil
 	}
 
-	err = createSqlDriver(ctx, cc)
+	err := c.registerDriver(ctx, cc)
 	if err != nil {
 		return nil, err
 	}
 
-	db, err := sql.Open(id, cc.Dsn())
+	db, err := sql.Open(cc.DriverKey(), cc.Dsn())
 	if err != nil {
 		return nil, err
 	}
 
-	c.dbRegistry[id] = db
-	return c.dbRegistry[id], nil
+	c.dbRegistry[key] = db
+	return c.dbRegistry[key], nil
 }
 
-func createSqlDriver(ctx context.Context, cc *ConnectionConfig) error {
+func (c *Config) registerDriver(ctx context.Context, cc *ConnectionConfig) error {
+	c.dbDriversMutex.Lock()
+	defer c.dbDriversMutex.Unlock()
+
+	key := cc.DriverKey()
+
+	if c.dbDrivers[key] {
+		return nil
+	}
+
 	var (
 		dialOptions []cloudsqlconn.DialOption
 		options     []cloudsqlconn.Option
@@ -72,14 +83,13 @@ func createSqlDriver(ctx context.Context, cc *ConnectionConfig) error {
 		options = append(options, cloudsqlconn.WithDialFunc(createDialer(cc.Proxy.ValueString(), ctx)))
 	}
 
-	id, err := cc.Id()
+	_, err := pgxv4.RegisterDriver(key, options...)
 	if err != nil {
 		return err
 	}
 
-	_, err = pgxv4.RegisterDriver(id, options...)
-
-	return err
+	c.dbDrivers[key] = true
+	return nil
 }
 
 func createDialer(proxyInput string, ctxProvider context.Context) func(ctx context.Context, network, addr string) (net.Conn, error) {