Merge pull request #2 from konstantin-recurly/instance_name_random_id

Instance name random
terraform-google-modules · May 28, 2020 · d6da8e2 · d6da8e2
2 parents 1a297b0 + c42b1f2
commit d6da8e2
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 92 deletions.
diff --git a/examples/mssql-public/main.tf b/examples/mssql-public/main.tf
@@ -19,23 +19,11 @@ provider "google-beta" {
   region  = var.region
 }
 
-resource "random_id" "instance_name_suffix" {
-  byte_length = 5
-}
-
-locals {
-  /*
-    Random instance name needed because:
-    "You cannot reuse an instance name for up to a week after you have deleted an instance."
-    See https://cloud.google.com/sql/docs/mysql/delete-instance for details.
-  */
-  instance_name = "${var.name}-${random_id.instance_name_suffix.hex}"
-}
-
 module "mssql" {
-  source        = "../../modules/mssql"
-  name          = local.instance_name
-  project_id    = var.project_id
-  user_name     = "simpleuser"
-  user_password = "foobar"
+  source               = "../../modules/mssql"
+  name                 = var.name
+  random_instance_name = true
+  project_id           = var.project_id
+  user_name            = "simpleuser"
+  user_password        = "foobar"
 }
diff --git a/examples/mysql-ha/main.tf b/examples/mysql-ha/main.tf
@@ -26,25 +26,13 @@ provider "random" {
   version = "~> 2.2"
 }
 
-resource "random_id" "instance_name_suffix" {
-  byte_length = 5
-}
-
-locals {
-  /*
-    Random instance name needed because:
-    "You cannot reuse an instance name for up to a week after you have deleted an instance."
-    See https://cloud.google.com/sql/docs/mysql/delete-instance for details.
-  */
-  instance_name = "${var.mysql_ha_name}-${random_id.instance_name_suffix.hex}"
-}
-
 module "mysql" {
-  source           = "../../modules/mysql"
-  name             = local.instance_name
-  project_id       = var.project_id
-  database_version = "MYSQL_5_7"
-  region           = "us-central1"
+  source               = "../../modules/mysql"
+  name                 = var.mysql_ha_name
+  random_instance_name = true
+  project_id           = var.project_id
+  database_version     = "MYSQL_5_7"
+  region               = "us-central1"
 
   // Master configurations
   tier                            = "db-n1-standard-1"

diff --git a/examples/mysql-private/main.tf b/examples/mysql-private/main.tf
@@ -40,8 +40,7 @@ locals {
     "You cannot reuse an instance name for up to a week after you have deleted an instance."
     See https://cloud.google.com/sql/docs/mysql/delete-instance for details.
   */
-  instance_name = "${var.db_name}-${random_id.suffix.hex}"
-  network_name  = "${var.network_name}-safer-${random_id.suffix.hex}"
+  network_name = "${var.network_name}-safer-${random_id.suffix.hex}"
 }
 
 module "network-safer-mysql-simple" {
@@ -61,9 +60,10 @@ module "private-service-access" {
 }
 
 module "safer-mysql-db" {
-  source     = "../../modules/safer_mysql"
-  name       = local.instance_name
-  project_id = var.project_id
+  source               = "../../modules/safer_mysql"
+  name                 = var.db_name
+  random_instance_name = true
+  project_id           = var.project_id
 
   database_version = "MYSQL_5_6"
   region           = "us-central1"

diff --git a/examples/mysql-public/main.tf b/examples/mysql-public/main.tf
@@ -44,13 +44,14 @@ locals {
 }
 
 module "mysql-db" {
-  source           = "../../modules/mysql"
-  name             = local.instance_name
-  database_version = "MYSQL_5_6"
-  project_id       = var.project_id
-  zone             = "c"
-  region           = "us-central1"
-  tier             = "db-n1-standard-1"
+  source               = "../../modules/mysql"
+  name                 = var.db_name
+  random_instance_name = true
+  database_version     = "MYSQL_5_6"
+  project_id           = var.project_id
+  zone                 = "c"
+  region               = "us-central1"
+  tier                 = "db-n1-standard-1"
 
   ip_configuration = {
     ipv4_enabled        = true

diff --git a/examples/postgresql-ha/main.tf b/examples/postgresql-ha/main.tf
@@ -26,25 +26,14 @@ provider "random" {
   version = "~> 2.2"
 }
 
-resource "random_id" "instance_name_suffix" {
-  byte_length = 5
-}
-
-locals {
-  /*
-    Random instance name needed because:
-    "You cannot reuse an instance name for up to a week after you have deleted an instance."
-    See https://cloud.google.com/sql/docs/mysql/delete-instance for details.
-  */
-  instance_name = "${var.pg_ha_name}-${random_id.instance_name_suffix.hex}"
-}
 
 module "pg" {
-  source           = "../../modules/postgresql"
-  name             = local.instance_name
-  project_id       = var.project_id
-  database_version = "POSTGRES_9_6"
-  region           = "us-central1"
+  source               = "../../modules/postgresql"
+  name                 = var.pg_ha_name
+  random_instance_name = true
+  project_id           = var.project_id
+  database_version     = "POSTGRES_9_6"
+  region               = "us-central1"
 
   // Master configurations
   tier                            = "db-custom-2-13312"

diff --git a/examples/postgresql-public/main.tf b/examples/postgresql-public/main.tf
@@ -30,28 +30,15 @@ provider "random" {
   version = "~> 2.2"
 }
 
-resource "random_id" "name" {
-  byte_length = 2
-}
-
-
-locals {
-  /*
-    Random instance name needed because:
-    "You cannot reuse an instance name for up to a week after you have deleted an instance."
-    See https://cloud.google.com/sql/docs/mysql/delete-instance for details.
-  */
-  instance_name = "${var.db_name}-${random_id.name.hex}"
-}
-
 module "postgresql-db" {
-  source           = "../../modules/postgresql"
-  name             = local.instance_name
-  database_version = "POSTGRES_9_6"
-  project_id       = var.project_id
-  zone             = "c"
-  region           = "us-central1"
-  tier             = "db-f1-micro"
+  source               = "../../modules/postgresql"
+  name                 = var.db_name
+  random_instance_name = true
+  database_version     = "POSTGRES_9_6"
+  project_id           = var.project_id
+  zone                 = "c"
+  region               = "us-central1"
+  tier                 = "db-f1-micro"
 
   ip_configuration = {
     ipv4_enabled        = true

diff --git a/modules/mssql/README.md b/modules/mssql/README.md
@@ -32,6 +32,7 @@ The following dependency must be available for SQL Server module:
 | name | The name of the Cloud SQL resources | string | n/a | yes |
 | pricing\_plan | The pricing plan for the master instance. | string | `"PER_USE"` | no |
 | project\_id | The project ID to manage the Cloud SQL resources | string | n/a | yes |
+| random\_instance\_name | Sets random suffix at the end of the Cloud SQL resource name | bool | `"false"` | no |
 | region | The region of the Cloud SQL resources | string | `"us-central1"` | no |
 | root\_password | MSSERVER password for the root user. If not set, a random one will be generated and available in the root_password output variable. | string | `""` | no |
 | tier | The tier for the master instance. | string | `"db-custom-2-3840"` | no |

diff --git a/modules/mssql/main.tf b/modules/mssql/main.tf
@@ -26,6 +26,12 @@ locals {
   users     = { for u in var.additional_users : u.name => u }
 }
 
+resource "random_id" "suffix" {
+  count = var.random_instance_name ? 1 : 0
+
+  byte_length = 4
+}
+
 resource "random_password" "root-password" {
   length  = 8
   special = true
@@ -34,7 +40,7 @@ resource "random_password" "root-password" {
 resource "google_sql_database_instance" "default" {
   provider         = google-beta
   project          = var.project_id
-  name             = var.name
+  name             = var.random_instance_name ? "${var.name}-${random_id.suffix[0].hex}" : var.name
   database_version = var.database_version
   region           = var.region
   root_password    = coalesce(var.root_password, random_password.root-password.result)

diff --git a/modules/mssql/variables.tf b/modules/mssql/variables.tf
@@ -24,6 +24,12 @@ variable "name" {
   description = "The name of the Cloud SQL resources"
 }
 
+variable "random_instance_name" {
+  type        = bool
+  description = "Sets random suffix at the end of the Cloud SQL resource name"
+  default     = false
+}
+
 // required
 variable "database_version" {
   description = "The database version to use: SQLSERVER_2017_STANDARD, SQLSERVER_2017_ENTERPRISE, SQLSERVER_2017_EXPRESS, or SQLSERVER_2017_WEB"

diff --git a/modules/mysql/README.md b/modules/mysql/README.md
@@ -48,7 +48,7 @@
 | name | The name of the Cloud SQL resources | string | n/a | yes |
 | pricing\_plan | The pricing plan for the master instance. | string | `"PER_USE"` | no |
 | project\_id | The project ID to manage the Cloud SQL resources | string | n/a | yes |
-| random\_instance\_name | Sets random prefix at the end of the Cloud SQL resource name | bool | `"false"` | no |
+| random\_instance\_name | Sets random suffix at the end of the Cloud SQL resource name | bool | `"false"` | no |
 | read\_replica\_activation\_policy | The activation policy for the read replica instances. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | string | `"ALWAYS"` | no |
 | read\_replica\_configuration | The replica configuration for use in all read replica instances. | object | `<map>` | no |
 | read\_replica\_crash\_safe\_replication | The crash safe replication is to indicates when crash-safe replication flags are enabled. | bool | `"true"` | no |

diff --git a/modules/mysql/main.tf b/modules/mysql/main.tf
@@ -31,14 +31,16 @@ locals {
   backups_enabled    = var.availability_type == "REGIONAL" ? true : lookup(var.backup_configuration, "enabled", null)
 }
 
-resource "random_id" "prefix" {
+resource "random_id" "suffix" {
+  count = var.random_instance_name ? 1 : 0
+
   byte_length = 4
 }
 
 resource "google_sql_database_instance" "default" {
   provider            = google-beta
   project             = var.project_id
-  name                = var.random_instance_name ? "${var.name}-${random_id.prefix.hex}" : var.name
+  name                = var.random_instance_name ? "${var.name}-${random_id.suffix[0].hex}" : var.name
   database_version    = var.database_version
   region              = var.region
   encryption_key_name = var.encryption_key_name

diff --git a/modules/mysql/variables.tf b/modules/mysql/variables.tf
@@ -26,7 +26,7 @@ variable "name" {
 
 variable "random_instance_name" {
   type        = bool
-  description = "Sets random prefix at the end of the Cloud SQL resource name"
+  description = "Sets random suffix at the end of the Cloud SQL resource name"
   default     = false
 }
 

diff --git a/modules/postgresql/README.md b/modules/postgresql/README.md
@@ -30,6 +30,7 @@
 | name | The name of the Cloud SQL resources | string | n/a | yes |
 | pricing\_plan | The pricing plan for the master instance. | string | `"PER_USE"` | no |
 | project\_id | The project ID to manage the Cloud SQL resources | string | n/a | yes |
+| random\_instance\_name | Sets random suffix at the end of the Cloud SQL resource name | bool | `"false"` | no |
 | read\_replica\_activation\_policy | The activation policy for the read replica instances.Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | string | `"ALWAYS"` | no |
 | read\_replica\_availability\_type | The availability type for the read replica instances.This is only used to set up high availability for the PostgreSQL instances. Can be either `ZONAL` or `REGIONAL`. | string | `"ZONAL"` | no |
 | read\_replica\_configuration | The replica configuration for use in all read replica instances. | object | `<map>` | no |

diff --git a/modules/postgresql/main.tf b/modules/postgresql/main.tf
@@ -26,10 +26,16 @@ locals {
   users     = { for u in var.additional_users : u.name => u }
 }
 
+resource "random_id" "suffix" {
+  count = var.random_instance_name ? 1 : 0
+
+  byte_length = 4
+}
+
 resource "google_sql_database_instance" "default" {
   provider            = google-beta
   project             = var.project_id
-  name                = var.name
+  name                = var.random_instance_name ? "${var.name}-${random_id.suffix[0].hex}" : var.name
   database_version    = var.database_version
   region              = var.region
   encryption_key_name = var.encryption_key_name

diff --git a/modules/postgresql/variables.tf b/modules/postgresql/variables.tf
@@ -24,6 +24,12 @@ variable "name" {
   description = "The name of the Cloud SQL resources"
 }
 
+variable "random_instance_name" {
+  type        = bool
+  description = "Sets random suffix at the end of the Cloud SQL resource name"
+  default     = false
+}
+
 // required
 variable "database_version" {
   description = "The database version to use"

diff --git a/modules/safer_mysql/README.md b/modules/safer_mysql/README.md
@@ -205,6 +205,7 @@ mysql -S $HOME/mysql_sockets/myproject:region:instance -u user -p
 | name | The name of the Cloud SQL resources | string | n/a | yes |
 | pricing\_plan | The pricing plan for the master instance. | string | `"PER_USE"` | no |
 | project\_id | The project ID to manage the Cloud SQL resources | string | n/a | yes |
+| random\_instance\_name | Sets random suffix at the end of the Cloud SQL resource name | bool | `"false"` | no |
 | read\_replica\_activation\_policy | The activation policy for the read replica instances. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | string | `"ALWAYS"` | no |
 | read\_replica\_configuration | The replica configuration for use in all read replica instances. | object | `<map>` | no |
 | read\_replica\_crash\_safe\_replication | The crash safe replication is to indicates when crash-safe replication flags are enabled. | bool | `"true"` | no |

diff --git a/modules/safer_mysql/main.tf b/modules/safer_mysql/main.tf
@@ -18,6 +18,7 @@ module "safer_mysql" {
   source                          = "../mysql"
   project_id                      = var.project_id
   name                            = var.name
+  random_instance_name            = true
   database_version                = var.database_version
   region                          = var.region
   zone                            = var.zone

diff --git a/modules/safer_mysql/variables.tf b/modules/safer_mysql/variables.tf
@@ -24,6 +24,12 @@ variable "name" {
   type        = string
 }
 
+variable "random_instance_name" {
+  type        = bool
+  description = "Sets random suffix at the end of the Cloud SQL resource name"
+  default     = false
+}
+
 // required
 variable "database_version" {
   description = "The database version to use"