diff --git a/modules/cloudsql-instance/README.md b/modules/cloudsql-instance/README.md
index d5c050c8..75a7af0b 100644
--- a/modules/cloudsql-instance/README.md
+++ b/modules/cloudsql-instance/README.md
@@ -56,8 +56,8 @@ module "db" {
tier = "db-g1-small"
replicas = {
- replica1 = "europe-west3"
- replica2 = "us-central1"
+ replica1 = { region = "europe-west3", encryption_key_name = null }
+ replica2 = { region = "us-central1", encryption_key_name = null }
}
}
# tftest modules=1 resources=3
@@ -103,16 +103,11 @@ module "project" {
parent = var.organization_id
name = "my-db-project"
services = [
- "servicenetworking.googleapis.com"
+ "servicenetworking.googleapis.com",
+ "sqladmin.googleapis.com",
]
}
-resource "google_project_service_identity" "jit_si" {
- provider = google-beta
- project = module.project.project_id
- service = "sqladmin.googleapis.com"
-}
-
module "kms" {
source = "./modules/kms"
project_id = module.project.project_id
@@ -126,7 +121,7 @@ module "kms" {
key_iam = {
key-sql = {
"roles/cloudkms.cryptoKeyEncrypterDecrypter" = [
- "serviceAccount:${google_project_service_identity.jit_si.email}"
+ "serviceAccount:${module.project.service_accounts.robots.sqladmin}"
]
}
}
@@ -143,9 +138,8 @@ module "db" {
tier = "db-g1-small"
}
-# tftest modules=3 resources=8
+# tftest modules=3 resources=10
```
-
## Variables
@@ -153,11 +147,11 @@ module "db" {
| name | description | type | required | default |
|---|---|:---:|:---:|:---:|
| [database_version](variables.tf#L50) | Database type and version to create. | string
| ✓ | |
-| [name](variables.tf#L91) | Name of primary replica. | string
| ✓ | |
-| [network](variables.tf#L96) | 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#L107) | The ID of the project where this instances will be created. | string
| ✓ | |
-| [region](variables.tf#L112) | Region of the primary replica. | string
| ✓ | |
-| [tier](variables.tf#L123) | The machine type to use for the instances. | string
| ✓ | |
+| [name](variables.tf#L97) | Name of primary instance. | string
| ✓ | |
+| [network](variables.tf#L102) | 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#L113) | The ID of the project where this instances will be created. | string
| ✓ | |
+| [region](variables.tf#L118) | Region of the primary instance. | string
| ✓ | |
+| [tier](variables.tf#L132) | 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({…})
| | {…}
|
@@ -165,11 +159,12 @@ module "db" {
| [deletion_protection](variables.tf#L61) | Allow terraform to delete instances. | bool
| | false
|
| [disk_size](variables.tf#L67) | Disk size in GB. Set to null to enable autoresize. | number
| | null
|
| [disk_type](variables.tf#L73) | The type of data disk: `PD_SSD` or `PD_HDD`. | string
| | "PD_SSD"
|
-| [flags](variables.tf#L79) | Map FLAG_NAME=>VALUE for database-specific tuning. | map(string)
| | null
|
-| [labels](variables.tf#L85) | Labels to be attached to all instances. | map(string)
| | null
|
-| [prefix](variables.tf#L101) | Prefix used to generate instance names. | string
| | null
|
-| [replicas](variables.tf#L117) | Map of NAME=>REGION for additional read replicas. Set to null to disable replica creation. | map(any)
| | null
|
-| [users](variables.tf#L128) | 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
|
+| [encryption_key_name](variables.tf#L79) | The full path to the encryption key used for the CMEK disk encryption of the primary instance. | string
| | null
|
+| [flags](variables.tf#L85) | Map FLAG_NAME=>VALUE for database-specific tuning. | map(string)
| | null
|
+| [labels](variables.tf#L91) | Labels to be attached to all instances. | map(string)
| | null
|
+| [prefix](variables.tf#L107) | Prefix used to generate instance names. | string
| | null
|
+| [replicas](variables.tf#L123) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | map(object({…}))
| | {}
|
+| [users](variables.tf#L137) | 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
@@ -182,8 +177,10 @@ module "db" {
| [instances](outputs.tf#L50) | Cloud SQL instance resources. | ✓ |
| [ip](outputs.tf#L56) | IP address of the primary instance. | |
| [ips](outputs.tf#L61) | IP addresses of all instances. | |
-| [self_link](outputs.tf#L69) | Self link of the primary instance. | |
-| [self_links](outputs.tf#L74) | Self links of all instances. | |
-| [user_passwords](outputs.tf#L82) | Map of containing the password of all users created through terraform. | ✓ |
+| [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. | ✓ |
diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf
index d9c86378..be46b59c 100644
--- a/modules/cloudsql-instance/main.tf
+++ b/modules/cloudsql-instance/main.tf
@@ -102,7 +102,7 @@ resource "google_sql_database_instance" "primary" {
resource "google_sql_database_instance" "replicas" {
provider = google-beta
- for_each = length(var.replicas) > 0 ? var.replicas : {}
+ for_each = local.has_replicas ? var.replicas : {}
project = var.project_id
name = "${local.prefix}${each.key}"
region = each.value.region
diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf
index 00130045..30acd915 100644
--- a/modules/cloudsql-instance/variables.tf
+++ b/modules/cloudsql-instance/variables.tf
@@ -77,7 +77,7 @@ variable "disk_type" {
}
variable "encryption_key_name" {
- description = "The full path to the encryption key used for the CMEK disk encryption."
+ description = "The full path to the encryption key used for the CMEK disk encryption of the primary instance."
type = string
default = null
}
@@ -95,7 +95,7 @@ variable "labels" {
}
variable "name" {
- description = "Name of primary replica."
+ description = "Name of primary instance."
type = string
}
@@ -116,7 +116,7 @@ variable "project_id" {
}
variable "region" {
- description = "Region of the primary replica."
+ description = "Region of the primary instance."
type = string
}
diff --git a/modules/project/service-accounts.tf b/modules/project/service-accounts.tf
index f5cffed4..5ba40fc4 100644
--- a/modules/project/service-accounts.tf
+++ b/modules/project/service-accounts.tf
@@ -44,6 +44,7 @@ locals {
secretmanager = "service-%s@gcp-sa-secretmanager"
sql = "service-%s@gcp-sa-cloud-sql"
storage = "service-%s@gs-project-accounts"
+ sqladmin = "service-%s@gcp-sa-cloud-sql"
}
service_accounts_default = {
compute = "${local.project.number}-compute@developer.gserviceaccount.com"
diff --git a/tests/modules/cloudsql_instance/fixture/variables.tf b/tests/modules/cloudsql_instance/fixture/variables.tf
index 62ff27a3..d6cc7d83 100644
--- a/tests/modules/cloudsql_instance/fixture/variables.tf
+++ b/tests/modules/cloudsql_instance/fixture/variables.tf
@@ -94,7 +94,7 @@ variable "region" {
}
variable "replicas" {
- type = map(any)
+ type = any
default = null
}
diff --git a/tests/modules/cloudsql_instance/test_plan.py b/tests/modules/cloudsql_instance/test_plan.py
index 3c45f5c6..c4e8ba0a 100644
--- a/tests/modules/cloudsql_instance/test_plan.py
+++ b/tests/modules/cloudsql_instance/test_plan.py
@@ -35,8 +35,8 @@ def test_prefix(plan_runner):
assert r['values']['name'] == 'prefix-db'
replicas = """{
- replica1 = "europe-west3"
- replica2 = "us-central1"
+ replica1 = { region = "europe-west3", encryption_key_name = null }
+ replica2 = { region = "us-central1", encryption_key_name = null }
}"""
_, resources = plan_runner(prefix="prefix")
@@ -49,8 +49,8 @@ def test_replicas(plan_runner):
"Test replicated instance."
replicas = """{
- replica1 = "europe-west3"
- replica2 = "us-central1"
+ replica1 = { region = "europe-west3", encryption_key_name = null }
+ replica2 = { region = "us-central1", encryption_key_name = null }
}"""
_, resources = plan_runner(replicas=replicas, prefix="prefix")
@@ -80,10 +80,9 @@ def test_mysql_replicas_enables_backup(plan_runner):
"Test MySQL backup setup with replicas."
replicas = """{
- replica1 = "europe-west3"
+ replica1 = { region = "europe-west3", encryption_key_name = null }
}"""
- _, resources = plan_runner(replicas=replicas,
- database_version="MYSQL_8_0")
+ _, resources = plan_runner(replicas=replicas, database_version="MYSQL_8_0")
assert len(resources) == 2
primary = [r for r in resources if r['name'] == 'primary'][0]
backup_config = primary['values']['settings'][0]['backup_configuration'][0]