Skip to content

Remove IAM from GCP Cloud Run module #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 4 additions & 46 deletions deployment/modules/gcp/cloudrun/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,10 @@ resource "google_project_service" "cloudrun_api" {
disable_on_destroy = false
}

resource "google_service_account" "cloudrun_service_account" {
account_id = "cloudrun-${var.env}-sa"
display_name = "Service Account for Cloud Run (${var.env})"
}

resource "google_project_iam_member" "run_service_agent" {
project = var.project_id
role = "roles/run.serviceAgent"
member = "serviceAccount:${google_service_account.cloudrun_service_account.email}"
}

resource "google_project_iam_member" "monitoring_metric_writer" {
project = var.project_id
role = "roles/monitoring.metricWriter"
member = "serviceAccount:${google_service_account.cloudrun_service_account.email}"
}

resource "google_storage_bucket_iam_member" "member" {
bucket = var.bucket
role = "roles/storage.objectUser"
member = "serviceAccount:${google_service_account.cloudrun_service_account.email}"
}

resource "google_project_iam_member" "iam_secret_accessor" {
project = var.project_id
role = "roles/secretmanager.secretAccessor"
member = "serviceAccount:${google_service_account.cloudrun_service_account.email}"
}

resource "google_spanner_database_iam_member" "iam_log_spanner_database_user" {
instance = var.log_spanner_instance
database = var.log_spanner_db
role = "roles/spanner.databaseUser"
member = "serviceAccount:${google_service_account.cloudrun_service_account.email}"
}

resource "google_spanner_database_iam_member" "iam_dedup_spanner_database_user" {
instance = var.log_spanner_instance
database = var.dedup_spanner_db
role = "roles/spanner.databaseUser"
member = "serviceAccount:${google_service_account.cloudrun_service_account.email}"
}

locals {
spanner_log_db_path = "projects/${var.project_id}/instances/${var.log_spanner_instance}/databases/${var.log_spanner_db}"
spanner_dedup_db_path = "projects/${var.project_id}/instances/${var.log_spanner_instance}/databases/${var.dedup_spanner_db}"
cloudrun_service_account_id = "cloudrun-${var.env}-sa"
spanner_log_db_path = "projects/${var.project_id}/instances/${var.log_spanner_instance}/databases/${var.log_spanner_db}"
spanner_dedup_db_path = "projects/${var.project_id}/instances/${var.log_spanner_instance}/databases/${var.dedup_spanner_db}"
}

resource "google_cloud_run_v2_service" "default" {
Expand All @@ -68,7 +26,7 @@ resource "google_cloud_run_v2_service" "default" {
launch_stage = "GA"

template {
service_account = google_service_account.cloudrun_service_account.account_id
service_account = "projects/${var.project_id}/serviceAccounts/${local.cloudrun_service_account_id}@${var.project_id}.iam.gserviceaccount.com"
max_instance_request_concurrency = 700
timeout = "5s"

Expand Down
Loading