Fix missing vars

Author: bobbyiliev

.terraform.lock.hcl

@@ -45,7 +45,7 @@ No resources.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_database_config"></a> [database\_config](#input\_database\_config) | Cloud SQL configuration | <pre>object({<br/>    tier     = string<br/>    version  = string<br/>    password = string<br/>  })</pre> | <pre>{<br/>  "password": null,<br/>  "tier": "db-custom-2-4096",<br/>  "version": "POSTGRES_15"<br/>}</pre> | no |
-| <a name="input_gke_config"></a> [gke\_config](#input\_gke\_config) | GKE cluster configuration | <pre>object({<br/>    node_count   = number<br/>    machine_type = string<br/>    disk_size_gb = number<br/>    min_nodes    = number<br/>    max_nodes    = number<br/>  })</pre> | <pre>{<br/>  "disk_size_gb": 100,<br/>  "machine_type": "e2-standard-4",<br/>  "max_nodes": 5,<br/>  "min_nodes": 1,<br/>  "node_count": 3<br/>}</pre> | no |
+| <a name="input_gke_config"></a> [gke\_config](#input\_gke\_config) | GKE cluster configuration | <pre>object({<br/>    node_count     = number<br/>    machine_type   = string<br/>    disk_size_gb   = number<br/>    min_nodes      = number<br/>    max_nodes      = number<br/>    node_locations = list(string)<br/>  })</pre> | <pre>{<br/>  "disk_size_gb": 100,<br/>  "machine_type": "e2-standard-4",<br/>  "max_nodes": 5,<br/>  "min_nodes": 1,<br/>  "node_count": 3,<br/>  "node_locations": []<br/>}</pre> | no |
 | <a name="input_labels"></a> [labels](#input\_labels) | Labels to apply to all resources | `map(string)` | `{}` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Kubernetes namespace for Materialize | `string` | `"materialize"` | no |
 | <a name="input_network_config"></a> [network\_config](#input\_network\_config) | Network configuration for the GKE cluster | <pre>object({<br/>    subnet_cidr   = string<br/>    pods_cidr     = string<br/>    services_cidr = string<br/>  })</pre> | <pre>{<br/>  "pods_cidr": "10.48.0.0/14",<br/>  "services_cidr": "10.52.0.0/20",<br/>  "subnet_cidr": "10.0.0.0/20"<br/>}</pre> | no |

README.md

@@ -8,7 +8,7 @@ module "materialize" {
 
   project_id = var.project_id
   region     = var.region
-  prefix     = "mz-prod"
+  prefix     = "mz-${var.environment}"
 
   network_config = {
     subnet_cidr   = "10.0.0.0/20"
@@ -17,11 +17,12 @@ module "materialize" {
   }
 
   gke_config = {
-    node_count   = 5
-    machine_type = "e2-standard-8"
-    disk_size_gb = 200
-    min_nodes    = 3
-    max_nodes    = 7
+    node_count     = 5
+    machine_type   = "e2-standard-8"
+    disk_size_gb   = 200
+    min_nodes      = 3
+    max_nodes      = 7
+    node_locations = var.node_locations
   }
 
   database_config = {
@@ -30,9 +31,11 @@ module "materialize" {
     password = var.database_password
   }
 
+  maintenance_window = var.maintenance_window
+
   labels = {
-    environment = "production"
+    environment = var.environment
+    team        = var.team
     managed_by  = "terraform"
-    team        = "data-platform"
   }
 }

examples/complete/main.tf

@@ -0,0 +1,10 @@
+terraform {
+  required_version = ">= 1.0"
+
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 6.0"
+    }
+  }
+}

examples/complete/providers.tf

@@ -0,0 +1,10 @@
+terraform {
+  required_version = ">= 1.0"
+
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 6.0"
+    }
+  }
+}

examples/simple/providers.tf

@@ -21,10 +21,12 @@ resource "google_sql_database_instance" "materialize" {
     }
 
     maintenance_window {
-      day          = 7 # Sunday
-      hour         = 3 # 3 AM
+      day          = 7
+      hour         = 3
       update_track = "stable"
     }
+
+    user_labels = var.labels
   }
 
   deletion_protection = true

modules/database/main.tf

@@ -0,0 +1,10 @@
+terraform {
+  required_version = ">= 1.0"
+
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 6.0"
+    }
+  }
+}

modules/database/providers.tf

@@ -37,7 +37,7 @@ resource "google_service_account" "workload_identity_sa" {
 }
 
 resource "google_container_cluster" "primary" {
-  provider = google-beta
+  provider = google
 
   name     = "${var.prefix}-gke"
   location = var.region
@@ -77,7 +77,7 @@ resource "google_container_cluster" "primary" {
 }
 
 resource "google_container_node_pool" "primary_nodes" {
-  provider = google-beta
+  provider = google
 
   name     = "${var.prefix}-node-pool"
   location = var.region

modules/gke/main.tf

@@ -0,0 +1,10 @@
+terraform {
+  required_version = ">= 1.0"
+
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 6.0"
+    }
+  }
+}

modules/gke/providers.tf

@@ -10,13 +10,19 @@ resource "google_storage_bucket" "materialize" {
     enabled = true
   }
 
-  lifecycle_rule {
-    condition {
-      age = 30
-    }
-    action {
-      type          = "SetStorageClass"
-      storage_class = "NEARLINE"
+  dynamic "lifecycle_rule" {
+    for_each = var.lifecycle_rules
+    content {
+      action {
+        type          = lifecycle_rule.value.action.type
+        storage_class = lifecycle_rule.value.action.storage_class
+      }
+      condition {
+        age                = lifecycle_rule.value.condition.age
+        created_before     = lifecycle_rule.value.condition.created_before
+        with_state         = lifecycle_rule.value.condition.with_state
+        num_newer_versions = lifecycle_rule.value.condition.num_newer_versions
+      }
     }
   }