diff --git a/modules/cloudsql-instance/README.md b/modules/cloudsql-instance/README.md
index a902f54550..18ad4ae541 100644
--- a/modules/cloudsql-instance/README.md
+++ b/modules/cloudsql-instance/README.md
@@ -149,9 +149,9 @@ module "db" {
| [database_version](variables.tf#L49) | Database type and version to create. | string | ✓ | |
| [name](variables.tf#L102) | Name of primary instance. | string | ✓ | |
| [network](variables.tf#L107) | VPC self link where the instances will be deployed. Private Service Networking must be enabled and configured in this VPC. | string | ✓ | |
-| [project_id](variables.tf#L122) | The ID of the project where this instances will be created. | string | ✓ | |
-| [region](variables.tf#L127) | Region of the primary instance. | string | ✓ | |
-| [tier](variables.tf#L147) | The machine type to use for the instances. | string | ✓ | |
+| [project_id](variables.tf#L128) | The ID of the project where this instances will be created. | string | ✓ | |
+| [region](variables.tf#L133) | Region of the primary instance. | string | ✓ | |
+| [tier](variables.tf#L153) | The machine type to use for the instances. | string | ✓ | |
| [authorized_networks](variables.tf#L17) | Map of NAME=>CIDR_RANGE to allow to connect to the database(s). | map(string) | | null |
| [availability_type](variables.tf#L23) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | string | | "ZONAL" |
| [backup_configuration](variables.tf#L29) | Backup settings for primary instance. Will be automatically enabled if using MySQL with one or more replicas. | object({…}) | | {…} |
@@ -163,10 +163,11 @@ module "db" {
| [flags](variables.tf#L84) | Map FLAG_NAME=>VALUE for database-specific tuning. | map(string) | | null |
| [ipv4_enabled](variables.tf#L90) | Add a public IP address to database instance. | bool | | false |
| [labels](variables.tf#L96) | Labels to be attached to all instances. | map(string) | | null |
-| [prefix](variables.tf#L112) | Optional prefix used to generate instance names. | string | | null |
-| [replicas](variables.tf#L132) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | map(object({…})) | | {} |
-| [root_password](variables.tf#L141) | Root password of the Cloud SQL instance. Required for MS SQL Server. | string | | null |
-| [users](variables.tf#L152) | Map of users to create in the primary instance (and replicated to other replicas) in the format USER=>PASSWORD. For MySQL, anything afterr the first `@` (if persent) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. | map(string) | | null |
+| [postgres_client_certificates](variables.tf#L112) | Map of cert keys connect to the application(s) using public IP. | list(string) | | null |
+| [prefix](variables.tf#L118) | Optional prefix used to generate instance names. | string | | null |
+| [replicas](variables.tf#L138) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | map(object({…})) | | {} |
+| [root_password](variables.tf#L147) | Root password of the Cloud SQL instance. Required for MS SQL Server. | string | | null |
+| [users](variables.tf#L158) | Map of users to create in the primary instance (and replicated to other replicas) in the format USER=>PASSWORD. For MySQL, anything afterr the first `@` (if persent) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. | map(string) | | null |
## Outputs
@@ -181,8 +182,9 @@ module "db" {
| [ips](outputs.tf#L61) | IP addresses of all instances. | |
| [name](outputs.tf#L69) | Name of the primary instance. | |
| [names](outputs.tf#L74) | Names of all instances. | |
-| [self_link](outputs.tf#L82) | Self link of the primary instance. | |
-| [self_links](outputs.tf#L87) | Self links of all instances. | |
-| [user_passwords](outputs.tf#L95) | Map of containing the password of all users created through terraform. | ✓ |
+| [postgres_client_certificates](outputs.tf#L82) | The CA Certificate used to connect to the SQL Instance via SSL. | ✓ |
+| [self_link](outputs.tf#L88) | Self link of the primary instance. | |
+| [self_links](outputs.tf#L93) | Self links of all instances. | |
+| [user_passwords](outputs.tf#L101) | Map of containing the password of all users created through terraform. | ✓ |
diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf
index f15b386bb9..9020fb5075 100644
--- a/modules/cloudsql-instance/main.tf
+++ b/modules/cloudsql-instance/main.tf
@@ -175,3 +175,10 @@ resource "google_sql_user" "users" {
host = each.value.host
password = each.value.password
}
+
+resource "google_sql_ssl_cert" "postgres_client_certificates" {
+ for_each = var.postgres_client_certificates != null ? toset(var.postgres_client_certificates) : toset([])
+ provider = google-beta
+ instance = google_sql_database_instance.primary.name
+ common_name = each.key
+}
diff --git a/modules/cloudsql-instance/outputs.tf b/modules/cloudsql-instance/outputs.tf
index 38bfc951b6..8c814c06a1 100644
--- a/modules/cloudsql-instance/outputs.tf
+++ b/modules/cloudsql-instance/outputs.tf
@@ -79,6 +79,12 @@ output "names" {
}
}
+output "postgres_client_certificates" {
+ description = "The CA Certificate used to connect to the SQL Instance via SSL."
+ value = google_sql_ssl_cert.postgres_client_certificates
+ sensitive = true
+}
+
output "self_link" {
description = "Self link of the primary instance."
value = google_sql_database_instance.primary.self_link
diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf
index 04bff546b2..3ce3cbf4d8 100644
--- a/modules/cloudsql-instance/variables.tf
+++ b/modules/cloudsql-instance/variables.tf
@@ -109,6 +109,12 @@ variable "network" {
type = string
}
+variable "postgres_client_certificates" {
+ description = "Map of cert keys connect to the application(s) using public IP."
+ type = list(string)
+ default = null
+}
+
variable "prefix" {
description = "Optional prefix used to generate instance names."
type = string