From 7abbbaa573833cf7ae5c264388818bfd332e12a5 Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:00:45 +0200 Subject: [PATCH 1/8] Update main.tf added activation policy --- modules/cloudsql-instance/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf index 05f150dda6..df84b677b3 100644 --- a/modules/cloudsql-instance/main.tf +++ b/modules/cloudsql-instance/main.tf @@ -119,6 +119,7 @@ resource "google_sql_database_instance" "primary" { } } deletion_protection = var.deletion_protection + activation_policy = var.activation_policy } resource "google_sql_database_instance" "replicas" { From 82aecae26a37cf22404d5c3c53880ec2183b96c7 Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:06:58 +0200 Subject: [PATCH 2/8] Update variables.tf added activation_policy variable defaulted as ALWAYS for non regression --- modules/cloudsql-instance/variables.tf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf index 03e0d6df4f..946047d683 100644 --- a/modules/cloudsql-instance/variables.tf +++ b/modules/cloudsql-instance/variables.tf @@ -13,6 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +variable "activation_policy" { + description = "(Optional) This specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS" + default = "ALWAYS" + validation { + condition = var.activation_policy == "NEVER" || var.activation_policy == "ON_DEMAND" || var.activation_policy == "ALWAYS" + error_message = "activation_policy must be ALWAYS, NEVER or ON_DEMAND" + } + nullable = false +} variable "allocated_ip_ranges" { description = "(Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?." @@ -189,3 +198,4 @@ variable "users" { type = map(string) default = null } + From 0cfd47fea39a13a17a6b33125a229332af38b320 Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Fri, 25 Aug 2023 06:42:11 +0000 Subject: [PATCH 3/8] corrections requested by @juliocc --- modules/cloudsql-instance/variables.tf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf index 946047d683..22fd2a141b 100644 --- a/modules/cloudsql-instance/variables.tf +++ b/modules/cloudsql-instance/variables.tf @@ -14,11 +14,12 @@ * limitations under the License. */ variable "activation_policy" { - description = "(Optional) This specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS" + description = "This specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS" + type = string default = "ALWAYS" validation { condition = var.activation_policy == "NEVER" || var.activation_policy == "ON_DEMAND" || var.activation_policy == "ALWAYS" - error_message = "activation_policy must be ALWAYS, NEVER or ON_DEMAND" + error_message = "The variable activation_policy must be ALWAYS, NEVER or ON_DEMAND" } nullable = false } From fb58a74d636316db61de3e3849e79739e6db8cf1 Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Fri, 25 Aug 2023 06:54:50 +0000 Subject: [PATCH 4/8] Regeneration of README.md on cloudsql-instance mod --- modules/cloudsql-instance/README.md | 53 +++++++++++++------------- modules/cloudsql-instance/variables.tf | 2 +- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/modules/cloudsql-instance/README.md b/modules/cloudsql-instance/README.md index 172a805e3e..9d6750b1c4 100644 --- a/modules/cloudsql-instance/README.md +++ b/modules/cloudsql-instance/README.md @@ -183,36 +183,36 @@ module "db" { # tftest modules=1 resources=1 inventory=insights.yaml ``` - ## Variables | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [database_version](variables.tf#L61) | Database type and version to create. | string | ✓ | | -| [name](variables.tf#L125) | Name of primary instance. | string | ✓ | | -| [network](variables.tf#L130) | 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#L151) | The ID of the project where this instances will be created. | string | ✓ | | -| [region](variables.tf#L156) | Region of the primary instance. | string | ✓ | | -| [tier](variables.tf#L182) | The machine type to use for the instances. | string | ✓ | | -| [allocated_ip_ranges](variables.tf#L17) | (Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?. | object({…}) | | {} | -| [authorized_networks](variables.tf#L26) | Map of NAME=>CIDR_RANGE to allow to connect to the database(s). | map(string) | | null | -| [availability_type](variables.tf#L32) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | string | | "ZONAL" | -| [backup_configuration](variables.tf#L38) | Backup settings for primary instance. Will be automatically enabled if using MySQL with one or more replicas. | object({…}) | | {…} | -| [databases](variables.tf#L66) | Databases to create once the primary instance is created. | list(string) | | null | -| [deletion_protection](variables.tf#L72) | Allow terraform to delete instances. | bool | | false | -| [disk_size](variables.tf#L78) | Disk size in GB. Set to null to enable autoresize. | number | | null | -| [disk_type](variables.tf#L84) | The type of data disk: `PD_SSD` or `PD_HDD`. | string | | "PD_SSD" | -| [encryption_key_name](variables.tf#L90) | The full path to the encryption key used for the CMEK disk encryption of the primary instance. | string | | null | -| [flags](variables.tf#L96) | Map FLAG_NAME=>VALUE for database-specific tuning. | map(string) | | null | -| [insights_config](variables.tf#L102) | Query Insights configuration. Defaults to null which disables Query Insights. | object({…}) | | null | -| [ipv4_enabled](variables.tf#L113) | Add a public IP address to database instance. | bool | | false | -| [labels](variables.tf#L119) | Labels to be attached to all instances. | map(string) | | null | -| [postgres_client_certificates](variables.tf#L135) | Map of cert keys connect to the application(s) using public IP. | list(string) | | null | -| [prefix](variables.tf#L141) | Optional prefix used to generate instance names. | string | | null | -| [replicas](variables.tf#L161) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | map(object({…})) | | {} | -| [require_ssl](variables.tf#L170) | Enable SSL connections only. | bool | | null | -| [root_password](variables.tf#L176) | Root password of the Cloud SQL instance. Required for MS SQL Server. | string | | null | -| [users](variables.tf#L187) | 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 | +| [database_version](variables.tf#L71) | Database type and version to create. | string | ✓ | | +| [name](variables.tf#L135) | Name of primary instance. | string | ✓ | | +| [network](variables.tf#L140) | 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#L161) | The ID of the project where this instances will be created. | string | ✓ | | +| [region](variables.tf#L166) | Region of the primary instance. | string | ✓ | | +| [tier](variables.tf#L192) | The machine type to use for the instances. | string | ✓ | | +| [activation_policy](variables.tf#L16) | This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS | string | | "ALWAYS" | +| [allocated_ip_ranges](variables.tf#L27) | (Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?. | object({…}) | | {} | +| [authorized_networks](variables.tf#L36) | Map of NAME=>CIDR_RANGE to allow to connect to the database(s). | map(string) | | null | +| [availability_type](variables.tf#L42) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | string | | "ZONAL" | +| [backup_configuration](variables.tf#L48) | Backup settings for primary instance. Will be automatically enabled if using MySQL with one or more replicas. | object({…}) | | {…} | +| [databases](variables.tf#L76) | Databases to create once the primary instance is created. | list(string) | | null | +| [deletion_protection](variables.tf#L82) | Allow terraform to delete instances. | bool | | false | +| [disk_size](variables.tf#L88) | Disk size in GB. Set to null to enable autoresize. | number | | null | +| [disk_type](variables.tf#L94) | The type of data disk: `PD_SSD` or `PD_HDD`. | string | | "PD_SSD" | +| [encryption_key_name](variables.tf#L100) | The full path to the encryption key used for the CMEK disk encryption of the primary instance. | string | | null | +| [flags](variables.tf#L106) | Map FLAG_NAME=>VALUE for database-specific tuning. | map(string) | | null | +| [insights_config](variables.tf#L112) | Query Insights configuration. Defaults to null which disables Query Insights. | object({…}) | | null | +| [ipv4_enabled](variables.tf#L123) | Add a public IP address to database instance. | bool | | false | +| [labels](variables.tf#L129) | Labels to be attached to all instances. | map(string) | | null | +| [postgres_client_certificates](variables.tf#L145) | Map of cert keys connect to the application(s) using public IP. | list(string) | | null | +| [prefix](variables.tf#L151) | Optional prefix used to generate instance names. | string | | null | +| [replicas](variables.tf#L171) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | map(object({…})) | | {} | +| [require_ssl](variables.tf#L180) | Enable SSL connections only. | bool | | null | +| [root_password](variables.tf#L186) | Root password of the Cloud SQL instance. Required for MS SQL Server. | string | | null | +| [users](variables.tf#L197) | 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 @@ -231,5 +231,4 @@ module "db" { | [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/variables.tf b/modules/cloudsql-instance/variables.tf index 22fd2a141b..783bd0ddd0 100644 --- a/modules/cloudsql-instance/variables.tf +++ b/modules/cloudsql-instance/variables.tf @@ -14,7 +14,7 @@ * limitations under the License. */ variable "activation_policy" { - description = "This specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS" + description = "This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS" type = string default = "ALWAYS" validation { From 171245cdf19f5fd41e8662b4cfb42abc348197bb Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Fri, 25 Aug 2023 07:04:32 +0000 Subject: [PATCH 5/8] terraform fmt changes --- modules/cloudsql-instance/main.tf | 2 +- modules/cloudsql-instance/variables.tf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf index df84b677b3..dbd6769300 100644 --- a/modules/cloudsql-instance/main.tf +++ b/modules/cloudsql-instance/main.tf @@ -119,7 +119,7 @@ resource "google_sql_database_instance" "primary" { } } deletion_protection = var.deletion_protection - activation_policy = var.activation_policy + activation_policy = var.activation_policy } resource "google_sql_database_instance" "replicas" { diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf index 783bd0ddd0..88b6b477df 100644 --- a/modules/cloudsql-instance/variables.tf +++ b/modules/cloudsql-instance/variables.tf @@ -15,10 +15,10 @@ */ variable "activation_policy" { description = "This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS" - type = string - default = "ALWAYS" + type = string + default = "ALWAYS" validation { - condition = var.activation_policy == "NEVER" || var.activation_policy == "ON_DEMAND" || var.activation_policy == "ALWAYS" + condition = var.activation_policy == "NEVER" || var.activation_policy == "ON_DEMAND" || var.activation_policy == "ALWAYS" error_message = "The variable activation_policy must be ALWAYS, NEVER or ON_DEMAND" } nullable = false From 161c8e2aff6cbc36d38b545cef45f40ad8a009a0 Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Fri, 25 Aug 2023 07:53:26 +0000 Subject: [PATCH 6/8] bug correctionand activation_policy on replicas --- modules/cloudsql-instance/main.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf index dbd6769300..ee964345fd 100644 --- a/modules/cloudsql-instance/main.tf +++ b/modules/cloudsql-instance/main.tf @@ -59,6 +59,7 @@ resource "google_sql_database_instance" "primary" { disk_type = var.disk_type availability_type = var.availability_type user_labels = var.labels + activation_policy = var.activation_policy ip_configuration { ipv4_enabled = var.ipv4_enabled @@ -138,7 +139,8 @@ resource "google_sql_database_instance" "replicas" { disk_size = var.disk_size disk_type = var.disk_type # availability_type = var.availability_type - user_labels = var.labels + user_labels = var.labels + activation_policy = var.activation_policy ip_configuration { ipv4_enabled = var.ipv4_enabled From a54dab52660b726ba55b8e20c1c9b5a865a0dec7 Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Fri, 25 Aug 2023 08:05:50 +0000 Subject: [PATCH 7/8] activation_policy description change and README.md --- modules/cloudsql-instance/README.md | 2 +- modules/cloudsql-instance/variables.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/cloudsql-instance/README.md b/modules/cloudsql-instance/README.md index 9d6750b1c4..00cf5ded30 100644 --- a/modules/cloudsql-instance/README.md +++ b/modules/cloudsql-instance/README.md @@ -193,7 +193,7 @@ module "db" { | [project_id](variables.tf#L161) | The ID of the project where this instances will be created. | string | ✓ | | | [region](variables.tf#L166) | Region of the primary instance. | string | ✓ | | | [tier](variables.tf#L192) | The machine type to use for the instances. | string | ✓ | | -| [activation_policy](variables.tf#L16) | This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS | string | | "ALWAYS" | +| [activation_policy](variables.tf#L16) | This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS. | string | | "ALWAYS" | | [allocated_ip_ranges](variables.tf#L27) | (Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?. | object({…}) | | {} | | [authorized_networks](variables.tf#L36) | Map of NAME=>CIDR_RANGE to allow to connect to the database(s). | map(string) | | null | | [availability_type](variables.tf#L42) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | string | | "ZONAL" | diff --git a/modules/cloudsql-instance/variables.tf b/modules/cloudsql-instance/variables.tf index 88b6b477df..8b359a09b7 100644 --- a/modules/cloudsql-instance/variables.tf +++ b/modules/cloudsql-instance/variables.tf @@ -14,12 +14,12 @@ * limitations under the License. */ variable "activation_policy" { - description = "This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS" + description = "This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS." type = string default = "ALWAYS" validation { condition = var.activation_policy == "NEVER" || var.activation_policy == "ON_DEMAND" || var.activation_policy == "ALWAYS" - error_message = "The variable activation_policy must be ALWAYS, NEVER or ON_DEMAND" + error_message = "The variable activation_policy must be ALWAYS, NEVER or ON_DEMAND." } nullable = false } From 961a8de7b9b6ce1dd7df31111b663453322094cd Mon Sep 17 00:00:00 2001 From: Carlo Maria Valla <135697689+cmvalla@users.noreply.github.com> Date: Fri, 25 Aug 2023 08:41:55 +0000 Subject: [PATCH 8/8] Bug correction --- modules/cloudsql-instance/main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/cloudsql-instance/main.tf b/modules/cloudsql-instance/main.tf index ee964345fd..953e135ee2 100644 --- a/modules/cloudsql-instance/main.tf +++ b/modules/cloudsql-instance/main.tf @@ -120,7 +120,6 @@ resource "google_sql_database_instance" "primary" { } } deletion_protection = var.deletion_protection - activation_policy = var.activation_policy } resource "google_sql_database_instance" "replicas" {