chore(terraform): update example Terraform to use direct VPC access (#67)

Author: angstwad

examples/terraform/network.tf

@@ -15,18 +15,6 @@
 #
 ###############################################################################
 
-# Serverless VPC access
-resource "google_vpc_access_connector" "eps_vpc_access" {
-  name           = "${var.app_name_short}-vpc-access"
-  region         = var.region
-  ip_cidr_range  = var.eps_vpc_access_cidr
-  network        = module.eps-network.network_id
-  min_throughput = var.eps_vpc_access_min_throughput
-  max_throughput = var.eps_vpc_access_max_throughput
-  # min_instances = 2
-  # max_instances = 10
-}
-
 #
 # Private services access
 #

examples/terraform/run.tf

@@ -43,8 +43,11 @@ resource "google_cloud_run_v2_service" "eps" {
     service_account = google_service_account.eps.account_id
 
     vpc_access {
-      connector = google_vpc_access_connector.eps_vpc_access.id
-      egress    = "PRIVATE_RANGES_ONLY" # Route only internal traffic through the connector
+      network_interfaces {
+        network    = module.eps-network.network_id
+        subnetwork = module.eps-network.subnets["${var.region}/${var.app_name_short}-${var.region}"].id
+      }
+      egress = "PRIVATE_RANGES_ONLY" # Route only internal traffic through the connector
     }
 
     containers {
@@ -167,7 +170,6 @@ resource "google_cloud_run_v2_service" "eps" {
   }
 
   depends_on = [
-    google_vpc_access_connector.eps_vpc_access,
     google_service_account_iam_policy.terraform,
     google_secret_manager_secret_iam_policy.eps-db-pass
   ]

examples/terraform/variables.tf

@@ -180,9 +180,9 @@ variable "superusers" {
 }
 
 variable "worker_pool_name" {
-   description = "Name of the private worker pool."
-   type        = string
-   default     = "eps-private-pool" # Or make it required by removing default
+  description = "Name of the private worker pool."
+  type        = string
+  default     = "eps-private-pool" # Or make it required by removing default
 }
 
 variable "db_password_key" {
@@ -229,9 +229,9 @@ variable "app_image_name" {
 # Note: _DB_HOST uses another substitution, so we pass the template string
 # It could be made more dynamic if needed, but this keeps the Cloud Build logic
 variable "db_host_template" {
-   description = "Template for DB host using Cloud Build substitution for instance connection name."
-   type        = string
-   default     = "/cloudsql/$${_INSTANCE_CONNECTION_NAME}" # Note the $$ to escape Terraform interpolation
+  description = "Template for DB host using Cloud Build substitution for instance connection name."
+  type        = string
+  default     = "/cloudsql/$${_INSTANCE_CONNECTION_NAME}" # Note the $$ to escape Terraform interpolation
 }
 
 
@@ -257,9 +257,9 @@ variable "git_user_name" {
 }
 
 variable "git_host" {
-   description = "Hostname of the Git provider (e.g., github.com)."
-   type        = string
-   default     = "github.com"
+  description = "Hostname of the Git provider (e.g., github.com)."
+  type        = string
+  default     = "github.com"
 }
 
 
@@ -270,13 +270,13 @@ variable "source_branch_name" {
 }
 
 variable "trigger_service_account_email" {
-   description = "Email of the service account for the trigger."
-   type        = string
+  description = "Email of the service account for the trigger."
+  type        = string
 }
 
 variable "github_app_id" {
   description = "Cloud build app id for your github organisation"
   type        = number # Using number type as it's an ID. String would also work.
   nullable    = false  # Make it mandatory to provide a value
-  default     = {your github cloudbuild app id}
+  default     = null  # {your github cloudbuild app id}"
 }