Update

terraform/modules/iam/main.tf

@@ -1,36 +1,19 @@
-# iam/main.tf
-
-# 1. Compte de service pour Terraform
 resource "google_service_account" "terraform_sa" {
-  account_id   = "terraform-sa"
-  display_name = "Terraform Service Account"
+  account_id   = var.sa_name
   project      = var.project_id
+  display_name = var.sa_display_name
 }
 
-# 2. Clé pour ce compte de service
 resource "google_service_account_key" "terraform_sa_key" {
-  service_account_id = google_service_account.terraform_sa.id
-  public_key_type    = "TYPE_X509_PEM_FILE"
-}
-
-# 3. Rôles IAM nécessaires
-resource "google_project_iam_member" "terraform_sa_roles" {
-  for_each = toset([
-    "roles/compute.admin",
-    "roles/iam.serviceAccountUser",
-    "roles/oslogin.admin",
-    "roles/viewer"
-  ])
-
-  project = var.project_id
-  role    = each.value
-  member  = "serviceAccount:${google_service_account.terraform_sa.email}"
-}
-
-# 4. Configuration OS Login avec clé SSH
-resource "google_os_login_ssh_public_key" "terraform_sa_ssh" {
-  username   = "terraform"
-  public_key = file("~/.ssh/id_rsa.pub")
-  project    = var.project_id
+  service_account_id = google_service_account.terraform_sa.name
+  keepers = {
+    display_name = google_service_account.terraform_sa.display_name
+  }
 }
 
+resource "google_project_iam_member" "sa_roles" {
+  for_each = toset(var.roles)
+  project  = var.project_id
+  role     = each.key
+  member   = "serviceAccount:${google_service_account.terraform_sa.email}"
+}

terraform/modules/iam/outputs.tf

@@ -1,15 +1,12 @@
-# iam/outputs.tf
-
-# 1. Email du compte de service
 output "service_account_email" {
-  description = "Email du compte de service Terraform"
-  value       = google_service_account.terraform_sa.email
+  value = google_service_account.terraform_sa.email
 }
 
-# 2. Clé du compte de service (sensitive)
 output "service_account_key" {
-  description = "Clé privée du compte de service Terraform"
-  value       = google_service_account_key.terraform_sa_key.private_key
-  sensitive   = true
+  value     = google_service_account_key.terraform_sa_key.private_key
+  sensitive = true
 }
 
+output "service_account_key_id" {
+  value = google_service_account_key.terraform_sa_key.name
+}

terraform/modules/iam/variables.tf

@@ -1,7 +1,26 @@
-# iam/variables.tf
-
 variable "project_id" {
-  description = "ID du projet GCP"
   type        = string
+  description = "GCP project id"
 }
 
+variable "sa_name" {
+  type        = string
+  description = "Service account name (id)"
+  default     = "terraform-sa"
+}
+
+variable "sa_display_name" {
+  type        = string
+  description = "Service account display name"
+  default     = "Terraform Service Account"
+}
+
+variable "roles" {
+  type    = list(string)
+  default = [
+    "roles/compute.instanceAdmin.v1",
+    "roles/iam.serviceAccountUser",
+    "roles/iam.serviceAccountKeyAdmin",
+  ]
+  description = "Liste des roles à attribuer au compte de service"
+}