.

terraform/modules/network/main.tf

@@ -3,8 +3,8 @@
 #   name                    = "mon-vpc"
 #   auto_create_subnetworks = false
 # }
-resource "google_compute_network" "vpc_terraform" {
-  name                    = "vpc-terraform"
+resource "google_compute_network" "vpc" {
+  name                    = "mon-vpc"
   auto_create_subnetworks = false
 }
 
@@ -15,23 +15,24 @@ resource "google_compute_network" "vpc_terraform" {
 #   ip_cidr_range = "10.0.1.0/24"
 #   region        = "europe-west1"
 # }
-resource "google_compute_subnetwork" "subnet_frontend" {
-  name          = "frontend"
-  network       = google_compute_network.vpc_terraform.id
+
+resource "google_compute_subnetwork" "frontend" {
+  name          = "mon-frontend"
+  network       = google_compute_network.vpc.id
   ip_cidr_range = var.frontend_cidr
   region        = var.region
 }
 
-resource "google_compute_subnetwork" "subnet_backend" {
-  name          = "backend"
-  network       = google_compute_network.vpc_terraform.id
+resource "google_compute_subnetwork" "backend" {
+  name          = "mon-backend"
+  network       = google_compute_network.vpc.id
   ip_cidr_range = var.backend_cidr
   region        = var.region
 }
 
-resource "google_compute_subnetwork" "subnet_database" {
-  name          = "database"
-  network       = google_compute_network.vpc_terraform.id
+resource "google_compute_subnetwork" "database" {
+  name          = "ma-database"
+  network       = google_compute_network.vpc.id
   ip_cidr_range = var.database_cidr
   region        = var.region
 }
@@ -49,9 +50,9 @@ resource "google_compute_subnetwork" "subnet_database" {
 #   target_tags   = ["web"]
 # }
 
-resource "google_compute_firewall" "allow_user_frontend" {
-  name    = "allow-user-frontend"
-  network = google_compute_network.vpc_terraform.id
+resource "google_compute_firewall" "frontend_firewall" {
+  name    = "frontend"
+  network = google_compute_network.vpc.id
 
   allow {
     protocol = "tcp"
@@ -62,9 +63,10 @@ resource "google_compute_firewall" "allow_user_frontend" {
   target_tags   = ["frontend"]
 }
 
-resource "google_compute_firewall" "allow_frontend_backend" {
-  name    = "allow-frontend-backend"
-  network = google_compute_network.vpc_terraform.id
+
+resource "google_compute_firewall" "backend_firewall" {
+  name    = "backend"
+  network = google_compute_network.vpc.id
 
   allow {
     protocol = "tcp"
@@ -75,22 +77,9 @@ resource "google_compute_firewall" "allow_frontend_backend" {
   target_tags   = ["backend"]
 }
 
-resource "google_compute_firewall" "allow_ssh_all" {
-  name    = "allow-ssh-all"
-  network = google_compute_network.vpc_terraform.id
-
-  allow {
-    protocol = "tcp"
-    ports    = ["22"]
-  }
-
-  source_ranges = ["0.0.0.0/0"]
-  target_tags   = ["ssh"]
-}
-
-resource "google_compute_firewall" "allow_backend_database" {
-  name    = "allow-backend-database"
-  network = google_compute_network.vpc_terraform.id
+resource "google_compute_firewall" "database_firewall" {
+  name    = "database"
+  network = google_compute_network.vpc.id
 
   allow {
     protocol = "tcp"
@@ -99,4 +88,17 @@ resource "google_compute_firewall" "allow_backend_database" {
 
   source_tags = ["backend"]
   target_tags   = ["database"]
+}
+
+resource "google_compute_firewall" "ssh_firewall" {
+  name    = "ssh"
+  network = google_compute_network.vpc.id
+
+  allow {
+    protocol = "tcp"
+    ports    = ["22"]
+  }
+
+  source_ranges = ["0.0.0.0/0"]
+  target_tags   = ["ssh"]
 }