From 9fded5a305b5b9fce2454323d8975232ab708e18 Mon Sep 17 00:00:00 2001
From: gentil <william.gentil@etu.u-pec.fr>
Date: Thu, 4 Dec 2025 10:00:29 +0100
Subject: [PATCH] WIP: fix compute and network terraform plan

---
 tp-cloud/terraform/environments/dev/main.tf   | 21 ++++++++++++-------
 tp-cloud/terraform/modules/network/main.tf    | 11 ++++++++--
 .../terraform/modules/network/variables.tf    |  4 ++++
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/tp-cloud/terraform/environments/dev/main.tf b/tp-cloud/terraform/environments/dev/main.tf
index e430e51..67e7698 100644
--- a/tp-cloud/terraform/environments/dev/main.tf
+++ b/tp-cloud/terraform/environments/dev/main.tf
@@ -13,12 +13,17 @@ provider "google" {
 }
 
 module "network" {
-  source             = "../../modules/network"
+  source = "../../modules/network"
 
-  project_name       = var.project_name
-  region             = var.region
-  frontend_cidr      = var.frontend_cidr
-  backend_cidr       = var.backend_cidr
-  database_cidr      = var.database_cidr
-  ssh_source_ranges  = var.ssh_source_ranges
-}
\ No newline at end of file
+  project_name      = var.project_name
+  project_id        = var.project_id 
+  region            = var.region
+  frontend_cidr     = var.frontend_cidr
+  backend_cidr      = var.backend_cidr
+  database_cidr     = var.database_cidr
+  ssh_source_ranges = var.ssh_source_ranges
+
+  providers = {
+    google = google 
+  }
+}
diff --git a/tp-cloud/terraform/modules/network/main.tf b/tp-cloud/terraform/modules/network/main.tf
index f601a2d..0905db1 100644
--- a/tp-cloud/terraform/modules/network/main.tf
+++ b/tp-cloud/terraform/modules/network/main.tf
@@ -1,6 +1,7 @@
 resource "google_compute_network" "vpc" {
   name                    = "vpc"
   auto_create_subnetworks = false
+  project                 = var.project_id
 }
 
 resource "google_compute_subnetwork" "frontend" {
@@ -8,6 +9,7 @@ resource "google_compute_subnetwork" "frontend" {
   ip_cidr_range = var.frontend_cidr
   region        = var.region
   network       = google_compute_network.vpc.id
+  project       = var.project_id
 }
 
 resource "google_compute_subnetwork" "backend" {
@@ -15,6 +17,7 @@ resource "google_compute_subnetwork" "backend" {
   ip_cidr_range = var.backend_cidr
   region        = var.region
   network       = google_compute_network.vpc.id
+  project       = var.project_id
 }
 
 resource "google_compute_subnetwork" "database" {
@@ -22,12 +25,13 @@ resource "google_compute_subnetwork" "database" {
   ip_cidr_range = var.database_cidr
   region        = var.region
   network       = google_compute_network.vpc.id
+  project       = var.project_id
 }
 
-
 resource "google_compute_firewall" "allow_http_https" {
   name    = "allow-http-https"
   network = google_compute_network.vpc.id
+  project = var.project_id
 
   allow {
     protocol = "tcp"
@@ -41,19 +45,21 @@ resource "google_compute_firewall" "allow_http_https" {
 resource "google_compute_firewall" "allow_ssh" {
   name    = "allow-ssh"
   network = google_compute_network.vpc.id
+  project = var.project_id
 
   allow {
     protocol = "tcp"
     ports    = ["22"]
   }
 
-  source_ranges = ["0.0.0.0/0"]
+  source_ranges = [var.ssh_source_ranges]
   target_tags   = ["all-instances"]
 }
 
 resource "google_compute_firewall" "frontend_to_backend" {
   name    = "frontend-to-backend-8000"
   network = google_compute_network.vpc.id
+  project = var.project_id
 
   allow {
     protocol = "tcp"
@@ -67,6 +73,7 @@ resource "google_compute_firewall" "frontend_to_backend" {
 resource "google_compute_firewall" "backend_to_database" {
   name    = "backend-to-database-3306"
   network = google_compute_network.vpc.id
+  project = var.project_id
 
   allow {
     protocol = "tcp"
diff --git a/tp-cloud/terraform/modules/network/variables.tf b/tp-cloud/terraform/modules/network/variables.tf
index b0249c1..a3245ae 100644
--- a/tp-cloud/terraform/modules/network/variables.tf
+++ b/tp-cloud/terraform/modules/network/variables.tf
@@ -3,6 +3,10 @@ variable "project_name" {
   type        = string
 }
 
+variable "project_id" {
+  type = string
+}
+
 variable "region" {
   description = "Région GCP où seront créés les sous-réseaux"
   type        = string