Merge pull request #67 from MaterializeInc/fix/add-vpc-wait-before-db-creation

Add 60s wait for VPC readiness before Cloud SQL instance creation

Author: bobbyiliev

README.md

@@ -79,6 +79,7 @@ No resources.
 | <a name="input_cert_manager_install_timeout"></a> [cert\_manager\_install\_timeout](#input\_cert\_manager\_install\_timeout) | Timeout for installing the cert-manager helm chart, in seconds. | `number` | `300` | no |
 | <a name="input_cert_manager_namespace"></a> [cert\_manager\_namespace](#input\_cert\_manager\_namespace) | The name of the namespace in which cert-manager is or will be installed. | `string` | `"cert-manager"` | no |
 | <a name="input_database_config"></a> [database\_config](#input\_database\_config) | Cloud SQL configuration | <pre>object({<br/>    tier     = optional(string, "db-custom-2-4096")<br/>    version  = optional(string, "POSTGRES_15")<br/>    password = string<br/>    username = optional(string, "materialize")<br/>    db_name  = optional(string, "materialize")<br/>  })</pre> | n/a | yes |
+| <a name="input_database_vpc_wait_duration"></a> [database\_vpc\_wait\_duration](#input\_database\_vpc\_wait\_duration) | Duration to wait for VPC resources to be ready before creating the database (e.g., '60s', '2m') | `string` | `"60s"` | no |
 | <a name="input_helm_chart"></a> [helm\_chart](#input\_helm\_chart) | Chart name from repository or local path to chart. For local charts, set the path to the chart directory. | `string` | `"materialize-operator"` | no |
 | <a name="input_helm_values"></a> [helm\_values](#input\_helm\_values) | Values to pass to the Helm chart | `any` | `{}` | no |
 | <a name="input_install_cert_manager"></a> [install\_cert\_manager](#input\_install\_cert\_manager) | Whether to install cert-manager. | `bool` | `true` | no |

main.tf

@@ -81,6 +81,9 @@ module "database" {
   db_version = var.database_config.version
   password   = var.database_config.password
 
+  private_vpc_connection = module.networking.private_vpc_connection
+  vpc_wait_duration      = var.database_vpc_wait_duration
+
   labels = local.common_labels
 }
 

modules/database/main.tf

@@ -1,11 +1,19 @@
+resource "time_sleep" "wait_for_vpc" {
+  depends_on = [var.private_vpc_connection]
+
+  create_duration = var.vpc_wait_duration
+}
+
 resource "google_sql_database_instance" "materialize" {
+  depends_on = [time_sleep.wait_for_vpc]
+
   name             = "${var.prefix}-pg"
   database_version = var.db_version
   region           = var.region
   project          = var.project_id
 
   timeouts {
-    create = "60m"
+    create = "75m"
     update = "45m"
     delete = "45m"
   }

modules/database/providers.tf

@@ -6,5 +6,9 @@ terraform {
       source  = "hashicorp/google"
       version = ">= 6.0"
     }
+    time = {
+      source  = "hashicorp/time"
+      version = "~> 0.13"
+    }
   }
 }

modules/database/variables.tf

@@ -18,6 +18,12 @@ variable "network_id" {
   type        = string
 }
 
+variable "private_vpc_connection" {
+  description = "The private VPC connection dependency"
+  type        = any
+  default     = null
+}
+
 variable "tier" {
   description = "The machine tier for the database instance"
   type        = string
@@ -55,3 +61,9 @@ variable "labels" {
   type        = map(string)
   default     = {}
 }
+
+variable "vpc_wait_duration" {
+  description = "Duration to wait for VPC resources to be ready (e.g., '60s')"
+  type        = string
+  default     = "60s"
+}

variables.tf

@@ -100,6 +100,12 @@ variable "database_config" {
   }
 }
 
+variable "database_vpc_wait_duration" {
+  description = "Duration to wait for VPC resources to be ready before creating the database (e.g., '60s', '2m')"
+  type        = string
+  default     = "60s"
+}
+
 variable "namespace" {
   description = "Kubernetes namespace for Materialize"
   type        = string