fix: resolve conflict

honestbank · Sep 8, 2023 · 900d8d1 · 900d8d1
1 parent 7a15bb1
commit 900d8d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/modules/google_sql_database_instance/main.tf b/modules/google_sql_database_instance/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.4"
+      version = "~> 4.48"
     }
   }
 }
@@ -104,7 +104,6 @@ resource "google_sql_database_instance" "instance" {
       query_plans_per_minute  = var.settings_insights_config_query_plans_per_minute
       record_application_tags = true
       record_client_address   = true
-
     }
 
     dynamic "database_flags" {

diff --git a/modules/google_sql_database_instance/variables.tf b/modules/google_sql_database_instance/variables.tf
@@ -178,27 +178,36 @@ variable "settings_insights_config_query_string_length" {
   description = "(Optional) Maximum query length stored in bytes."
   type        = number
   default     = 1024
+  validation {
+    condition     = var.settings_insights_config_query_string_length >= 256 && var.settings_insights_config_query_string_length <= 4500
+    error_message = " query string length must be >= 256 and <= 4500."
+  }
 }
 
 variable "settings_insights_config_query_plans_per_minute" {
   description = "(Optional) Maximum number of query plans generated by Insights per minute"
   type        = number
   default     = 10
+  validation {
+    condition     = var.settings_insights_config_query_plans_per_minute >= 0 && var.settings_insights_config_query_plans_per_minute <= 20
+    error_message = " query plans per minute must be >= 0 and <= 20."
+  }
 }
 
 variable "settings_maintenance_window_day" {
-  description = "(Optional) The day of week (1-7) for maintenance window to start."
+  description = "(Optional) The day of week (1-7) for maintenance window to start.Starting on Monday"
   type        = number
   default     = 1
   validation {
     condition     = var.settings_maintenance_window_day >= 1 && var.settings_maintenance_window_day <= 7
     error_message = " maintenance window day must be >= 1 and <= 7."
   }
 }
+
 variable "settings_maintenance_window_hour" {
-  description = "(Optional) The hour of day (0-23) maintenance window starts."
+  description = "(Optional) The hour of day (0-23) maintenance window starts.The maintenance window is specified in UTC time"
   type        = number
-  default     = 9
+  default     = 3
   validation {
     condition     = var.settings_maintenance_window_hour >= 0 && var.settings_maintenance_window_hour <= 23
     error_message = " maintenance window hour must be >= 0 and <= 23."