Skip to content
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.

Sign up for GitHub

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

fix: prevent disabling apis on destroy #296

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −13
Open

fix: prevent disabling apis on destroy #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion terraform/infra/apis/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ resource "google_project_service" "apis" {
"pubsub.googleapis.com",
"run.googleapis.com",
])
service = each.key
service = each.key
disable_on_destroy = false
}

20 changes: 8 additions & 12 deletions terraform/infra/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ resource "google_service_account" "build_service_account" {
depends_on = [module.apis]
}

resource "google_project_iam_binding" "build_iam" {
resource "google_project_iam_member" "build_iam" {
for_each = toset(["roles/storage.objectViewer", "roles/logging.logWriter", "roles/artifactregistry.writer"])
project = data.google_project.project.project_id
role = each.value
members = ["serviceAccount:${google_service_account.build_service_account.email}"]
member = "serviceAccount:${google_service_account.build_service_account.email}"
}

resource "google_artifact_registry_repository" "repo" {
Expand All @@ -83,10 +83,10 @@ resource "google_artifact_registry_repository" "repo" {
data "google_storage_project_service_account" "gcs_account" {
depends_on = [module.apis]
}
resource "google_project_iam_binding" "gcs_sa_pubsub_publish" {
resource "google_project_iam_member" "gcs_sa_pubsub_publish" {
project = data.google_project.project.project_id
role = "roles/pubsub.publisher"
members = ["serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"]
member = "serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"
}

## Create configured scanner buckets if requested.
Expand All @@ -110,13 +110,11 @@ data "google_storage_bucket" "scanner-buckets" {
name = each.value
depends_on = [module.create_buckets]
}
resource "google_storage_bucket_iam_binding" "buckets_sa_binding" {
resource "google_storage_bucket_iam_member" "buckets_sa_iam" {
for_each = local.all_buckets
bucket = data.google_storage_bucket.scanner-buckets[each.key].name
role = "roles/storage.admin"
members = [
"serviceAccount:${google_service_account.malware_scanner_sa.email}",
]
member = "serviceAccount:${google_service_account.malware_scanner_sa.email}"
}

## Create the CVD Mirror bucket and allow service account admin access.
Expand All @@ -127,12 +125,10 @@ resource "google_storage_bucket" "cvd_mirror_bucket" {
uniform_bucket_level_access = var.uniform_bucket_level_access
depends_on = [module.apis]
}
resource "google_storage_bucket_iam_binding" "cvd_mirror_bucket_sa_binding" {
resource "google_storage_bucket_iam_member" "cvd_mirror_bucket_sa_iam" {
bucket = google_storage_bucket.cvd_mirror_bucket.name
role = "roles/storage.admin"
members = [
"serviceAccount:${google_service_account.malware_scanner_sa.email}",
]
member = "serviceAccount:${google_service_account.malware_scanner_sa.email}"
}

## Perform an update/initial load of mirror bucket.
Expand Down