feat: Make MySQL CloudSQL zone optional (#572)

Co-authored-by: Awais Malik <awmalik@google.com>
terraform-google-modules · Feb 6, 2024 · 3c4b504 · 3c4b504
1 parent 611edfd
commit 3c4b504
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/modules/mysql/README.md b/modules/mysql/README.md
@@ -63,7 +63,7 @@ Note: CloudSQL provides [disk autoresize](https://cloud.google.com/sql/docs/mysq
 | user\_labels | The key/value labels for the master instances. | `map(string)` | `{}` | no |
 | user\_name | The name of the default user | `string` | `"default"` | no |
 | user\_password | The password for the default user. If not set, a random one will be generated and available in the generated\_user\_password output variable. | `string` | `""` | no |
-| zone | The zone for the master instance, it should be something like: `us-central1-a`, `us-east1-c`. | `string` | n/a | yes |
+| zone | The zone for the master instance, it should be something like: `us-central1-a`, `us-east1-c`. | `string` | `null` | no |
 
 ## Outputs
 

diff --git a/modules/mysql/variables.tf b/modules/mysql/variables.tf
@@ -79,6 +79,7 @@ variable "edition" {
 variable "zone" {
   description = "The zone for the master instance, it should be something like: `us-central1-a`, `us-east1-c`."
   type        = string
+  default     = null
 }
 
 variable "secondary_zone" {

diff --git a/modules/safer_mysql/README.md b/modules/safer_mysql/README.md
@@ -211,7 +211,7 @@ mysql -S $HOME/mysql_sockets/myproject:region:instance -u user -p
 | user\_name | The name of the default user | `string` | `"default"` | no |
 | user\_password | The password for the default user. If not set, a random one will be generated and available in the generated\_user\_password output variable. | `string` | `""` | no |
 | vpc\_network | Existing VPC network to which instances are connected. The networks needs to be configured with https://cloud.google.com/vpc/docs/configure-private-services-access. | `string` | n/a | yes |
-| zone | The zone for the master instance, it should be something like: `a`, `c`. | `string` | n/a | yes |
+| zone | The zone for the master instance, it should be something like: `a`, `c`. | `string` | `null` | no |
 
 ## Outputs
 

diff --git a/modules/safer_mysql/variables.tf b/modules/safer_mysql/variables.tf
@@ -70,6 +70,7 @@ variable "edition" {
 variable "zone" {
   description = "The zone for the master instance, it should be something like: `a`, `c`."
   type        = string
+  default     = null
 }
 
 variable "secondary_zone" {