fix: Some TF best practices and naming

example/main.tf

@@ -1,13 +1,13 @@
 provider "google" {
   project = var.project_id
   region  = var.region
-  zone    = var.zone
+  # zone    = var.zone
 }
 
 provider "google-beta" {
   project = var.project_id
   region  = var.region
-  zone    = var.zone
+  # zone    = var.zone
 }
 
 module "ctrlplane" {

main.tf

@@ -1,6 +1,6 @@
 module "project_factory_project_services" {
   source                      = "terraform-google-modules/project-factory/google//modules/project_services"
-  version                     = "~> 14.0"
+  version                     = "~> 16.0"
   project_id                  = null
   disable_dependent_services  = false
   disable_services_on_destroy = false
@@ -26,6 +26,8 @@ module "database" {
   source             = "./modules/database"
   namespace          = var.namespace
   network_connection = local.network_connection
+  availability_type  = var.database_availability_type
+  pg_version         = var.database_version
 }
 
 module "service_accounts" {

modules/database/main.tf

@@ -6,7 +6,7 @@ resource "random_string" "master_password" {
 resource "random_pet" "postgres" {
   length = 2
   keepers = {
-    namespace = var.database_version
+    namespace = var.pg_version
   }
 }
 
@@ -19,10 +19,11 @@ locals {
 
 resource "google_sql_database_instance" "postgres" {
   name             = local.master_instance_name
-  database_version = var.database_version
+  database_version = var.pg_version
 
   settings {
-    tier = var.tier
+    tier              = var.tier
+    availability_type = var.availability_type
     ip_configuration {
       ipv4_enabled    = false
       private_network = var.network_connection.network

modules/database/variables.tf

@@ -3,7 +3,7 @@ variable "namespace" {
   type        = string
 }
 
-variable "database_version" {
+variable "pg_version" {
   description = "Version for Postgres"
   type        = string
   default     = "POSTGRES_16"
@@ -19,3 +19,9 @@ variable "tier" {
   type        = string
   default     = "db-f1-micro"
 }
+
+variable "availability_type" {
+  description = "The availability type for the Postgres instance"
+  type        = string
+  default     = "REGIONAL"
+}

modules/networking/main.tf

@@ -10,7 +10,7 @@ resource "google_compute_subnetwork" "default" {
   network       = google_compute_network.vpc.self_link
 }
 
-resource "google_compute_global_address" "private_ip_address" {
+resource "google_compute_global_address" "private" {
   name          = "${var.namespace}-private-ip-address"
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
@@ -21,5 +21,5 @@ resource "google_compute_global_address" "private_ip_address" {
 resource "google_service_networking_connection" "default" {
   network                 = google_compute_network.vpc.id
   service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.private_ip_address.name]
+  reserved_peering_ranges = [google_compute_global_address.private.name]
 }

variables.tf

@@ -2,3 +2,15 @@ variable "namespace" {
   type        = string
   description = "The name prefix for all resources created."
 }
+
+variable "database_availability_type" {
+  description = "The availability type for the Postgres instance"
+  type        = string
+  default     = "REGIONAL"
+}
+
+variable "database_version" {
+  description = "The version of the database to use."
+  type        = string
+  default     = "POSTGRES_16"
+}