compute + environment

terraform/modules/compute/main.tf

@@ -1,6 +1,5 @@
-# 1. Frontend VM
-resource "google_compute_instance" "frontend" {
-  name         = "frontend-vm"
+resource "google_compute_instance" "vm_frontend" {
+  name         = "vm-frontend"
   machine_type = var.instance_type
   zone         = var.zone
 
@@ -12,8 +11,8 @@ resource "google_compute_instance" "frontend" {
   }
 
   network_interface {
-    subnetwork = var.frontend_subnet_id
     access_config {} # IP publique
+    subnetwork = var.frontend_subnet_id
   }
 
   tags = ["frontend", "ssh"]
@@ -23,10 +22,8 @@ resource "google_compute_instance" "frontend" {
   }
 }
 
-
-# 2. Backend VM
-resource "google_compute_instance" "backend" {
-  name         = "backend-vm"
+resource "google_compute_instance" "vm_backend" {
+  name         = "vm-backend"
   machine_type = var.instance_type
   zone         = var.zone
 
@@ -39,7 +36,6 @@ resource "google_compute_instance" "backend" {
 
   network_interface {
     subnetwork = var.backend_subnet_id
-    # Pas d'IP publique
   }
 
   tags = ["backend", "ssh"]
@@ -49,10 +45,8 @@ resource "google_compute_instance" "backend" {
   }
 }
 
-
-# 3. Database VM
-resource "google_compute_instance" "database" {
-  name         = "database-vm"
+resource "google_compute_instance" "vm_database" {
+  name         = "vm-database"
   machine_type = var.instance_type
   zone         = var.zone
 
@@ -65,7 +59,6 @@ resource "google_compute_instance" "database" {
 
   network_interface {
     subnetwork = var.database_subnet_id
-    # Pas d'IP publique
   }
 
   tags = ["database", "ssh"]
@@ -74,4 +67,3 @@ resource "google_compute_instance" "database" {
     enable-oslogin = "TRUE"
   }
 }
-

terraform/modules/compute/outputs.tf

@@ -1,31 +1,19 @@
-# IP interne de chaque instance
-output "frontend_internal_ip" {
-  value = google_compute_instance.frontend.network_interface[0].network_ip
+output "ip_internes" {
+  value = {
+    frontend = google_compute_instance.vm_frontend.network_interface[0].network_ip
+    backend  = google_compute_instance.vm_backend.network_interface[0].network_ip
+    database = google_compute_instance.vm_database.network_interface[0].network_ip
+  }
 }
 
-output "backend_internal_ip" {
-  value = google_compute_instance.backend.network_interface[0].network_ip
+output "ip_public_frontend" {
+  value = google_compute_instance.vm_frontend.network_interface[0].access_config[0].nat_ip
 }
 
-output "database_internal_ip" {
-  value = google_compute_instance.database.network_interface[0].network_ip
+output "nom_instances" {
+  value = {
+    frontend = google_compute_instance.vm_frontend.name
+    backend = google_compute_instance.vm_backend.name
+    database = google_compute_instance.vm_database.name
+  }
 }
-
-# IP publique du frontend
-output "frontend_public_ip" {
-  value = google_compute_instance.frontend.network_interface[0].access_config[0].nat_ip
-}
-
-# Noms des instances
-output "frontend_name" {
-  value = google_compute_instance.frontend.name
-}
-
-output "backend_name" {
-  value = google_compute_instance.backend.name
-}
-
-output "database_name" {
-  value = google_compute_instance.database.name
-}
-

terraform/modules/compute/variables.tf

@@ -1,30 +1,25 @@
 variable "instance_type" {
   description = "Type de machine pour les VM"
   type        = string
-  default     = "e2-medium"
 }
 
 variable "zone" {
   description = "Zone GCP où créer les VM"
   type        = string
-  default     = "europe-west1-b"
 }
 
 variable "frontend_subnet_id" {
   description = "ID du sous-réseau frontend"
   type        = string
-  default     = "10.0.1.0/24"
 }
 
 variable "backend_subnet_id" {
   description = "ID du sous-réseau backend"
   type        = string
-  default     = "10.0.2.0/24"
 }
 
 variable "database_subnet_id" {
   description = "ID du sous-réseau database"
   type        = string
-  default     = "10.0.3.0/24"
 }
 

terraform/modules/network/main.tf

@@ -1,7 +1,7 @@
 // 1. VPC personnalisé
 resource "google_compute_network" "vpc" {
   name                    = "${var.project_name}-vpc"
-  project                 = var.project_name
+  project                 = var.project_id
   auto_create_subnetworks = false
 }
 
@@ -9,7 +9,7 @@ resource "google_compute_network" "vpc" {
 
 resource "google_compute_subnetwork" "frontend" {
   name          = "${var.project_name}-frontend-subnet"
-  project       = var.project_name
+  project       = var.project_id
   region        = var.region
   network       = google_compute_network.vpc.id
   ip_cidr_range = var.frontend_cidr
@@ -17,7 +17,7 @@ resource "google_compute_subnetwork" "frontend" {
 
 resource "google_compute_subnetwork" "backend" {
   name          = "${var.project_name}-backend-subnet"
-  project       = var.project_name
+  project       = var.project_id
   region        = var.region
   network       = google_compute_network.vpc.id
   ip_cidr_range = var.backend_cidr
@@ -25,7 +25,7 @@ resource "google_compute_subnetwork" "backend" {
 
 resource "google_compute_subnetwork" "database" {
   name          = "${var.project_name}-database-subnet"
-  project       = var.project_name
+  project       = var.project_id
   region        = var.region
   network       = google_compute_network.vpc.id
   ip_cidr_range = var.database_cidr
@@ -36,7 +36,7 @@ resource "google_compute_subnetwork" "database" {
 // 3.1 HTTP/HTTPS vers frontend (depuis Internet)
 resource "google_compute_firewall" "frontend_http_https" {
   name    = "${var.project_name}-fw-frontend-http-https"
-  project = var.project_name
+  project = var.project_id
   network = google_compute_network.vpc.name
 
   description = "Autorise HTTP/HTTPS vers les instances frontend"
@@ -56,8 +56,8 @@ resource "google_compute_firewall" "frontend_http_https" {
 
 // 3.2 SSH vers toutes les instances (depuis la plage fournie)
 resource "google_compute_firewall" "ssh_all" {
-  name    = "${var.project_name}-fw-ssh-all"
-  project = var.project_name
+  name    = "${var.project_id}-fw-ssh-all"
+  project = var.project_id
   network = google_compute_network.vpc.name
 
   description = "Autorise SSH vers toutes les instances du VPC"
@@ -76,7 +76,7 @@ resource "google_compute_firewall" "ssh_all" {
 // 3.3 Port 8000 de frontend vers backend
 resource "google_compute_firewall" "frontend_to_backend_8000" {
   name    = "${var.project_name}-fw-frontend-backend-8000"
-  project = var.project_name
+  project = var.project_id
   network = google_compute_network.vpc.name
 
   description = "Autorise le trafic TCP 8000 des instances frontend vers backend"
@@ -98,7 +98,7 @@ resource "google_compute_firewall" "frontend_to_backend_8000" {
 // 3.4 Port 3306 de backend vers database
 resource "google_compute_firewall" "backend_to_database_3306" {
   name    = "${var.project_name}-fw-backend-database-3306"
-  project = var.project_name
+  project = var.project_id
   network = google_compute_network.vpc.name
 
   description = "Autorise le trafic TCP 3306 des instances backend vers database"

terraform/modules/network/variables.tf

@@ -1,35 +1,34 @@
 variable "project_name" {
   description = "Nom du projet"
   type        = string
-  default     = "iutsf-478713"
+}
+
+variable "project_id" {
+  description = "Id du projet"
+  type        = string
 }
 
 variable "region" {
   description = "Région cloud"
   type        = string
-  default     = "europe-west1"
 }
 
 variable "frontend_cidr" {
   description = "CIDR du sous-réseau frontend"
   type        = string
-  default     = "10.0.1.0/24"
 }
 
 variable "backend_cidr" {
   description = "CIDR du sous-réseau backend"
   type        = string
-  default     = "10.0.2.0/24"
 }
 
 variable "database_cidr" {
   description = "CIDR du sous-réseau base de données"
   type        = string
-  default     = "10.0.3.0/24"
 }
 
 variable "ssh_source_ranges" {
   description = "Plages IP autorisées à SSH"
   type        = list(string)
-  default     = ["34.78.156.163/32"]
 }