Added the end of TP

terraform/modules/network/main.tf

@@ -1,5 +1,5 @@
-resource "google_compute_network" "my_vpc" {
-  name                    = "my-vpc"
+resource "google_compute_network" "my_new_vpc" {
+  name                    = "my-new-vpc"
   auto_create_subnetworks = false
 }
 
@@ -7,44 +7,48 @@ resource "google_compute_subnetwork" "frontend" {
   name          = "frontend"
   ip_cidr_range = var.frontend_cidr
   region        = var.region
-  network       = google_compute_network.my_vpc.id
+  network       = google_compute_network.my_new_vpc.id
 }
 
 resource "google_compute_subnetwork" "backend" {
   name          = "backend"
   ip_cidr_range = var.backend_cidr
   region        = var.region
-  network       = google_compute_network.my_vpc.id
+  network       = google_compute_network.my_new_vpc.id
 }
 
 resource "google_compute_subnetwork" "database" {
   name          = "database"
   ip_cidr_range = var.database_cidr
   region        = var.region
-  network       = google_compute_network.my_vpc.id
+  network       = google_compute_network.my_new_vpc.id
 }
 
-resource "google_compute_firewall" "web" {
-  name       = "web"
-  network    = google_compute_network.my_vpc.id
+resource "google_compute_firewall" "web_rule" {
+  name       = "web-rule"
+  network    = google_compute_network.my_new_vpc.id
   allow { 
     protocol = "tcp"
     ports = ["80", "443"]
   }
+  source_ranges = [var.web_source_ranges]
+  target_tags = ["frontend"]
 }
 
-resource "google_compute_firewall" "ssh" {
-  name       = "ssh"
-  network    = google_compute_network.my_vpc.id
+resource "google_compute_firewall" "ssh_rule" {
+  name       = "ssh-rule"
+  network    = google_compute_network.my_new_vpc.id
   allow {
     protocol = "tcp"
     ports = ["22"]
   }
+  source_ranges = [var.ssh_source_ranges]
+  target_tags = ["ssh"]
 }
 
 resource "google_compute_firewall" "frontend_to_backend" {
   name       = "frontend-to-backend"
-  network    = google_compute_network.my_vpc.id
+  network    = google_compute_network.my_new_vpc.id
   allow {
     protocol = "tcp"
     ports = ["8000"]
@@ -57,7 +61,7 @@ resource "google_compute_firewall" "frontend_to_backend" {
 
 resource "google_compute_firewall" "backend_to_database" {
   name       = "backend-to-database"
-  network    = google_compute_network.my_vpc.id
+  network    = google_compute_network.my_new_vpc.id
   allow {
     protocol = "tcp"
     ports = ["3306"]

terraform/modules/network/outputs.tf

@@ -1,5 +1,5 @@
 output "vpc_id" {
-  value = google_compute_network.my_vpc.id
+  value = google_compute_network.my_new_vpc.id
   description = "VPC ID"
 }
 

terraform/modules/network/variables.tf

@@ -27,3 +27,15 @@ variable "database_cidr" {
   type        = string
   default     = "10.0.3.0/24"
 }
+
+variable "web_source_ranges" {
+  description = "Web allowed ip ranges"
+  type        = string
+  default     = "0.0.0.0/0"
+}
+
+variable "ssh_source_ranges" {
+  description = "SSH allowed ip ranges"
+  type        = string
+  default     = "0.0.0.0/0"
+}