Skip to content

Use google_service_account.member when possible #216

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

Merged
jku merged 1 commit into from
May 18, 2026
Merged

Use google_service_account.member when possible #216

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
7 changes: 3 additions & 4 deletions gcp/modules/external_secrets/external_secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ resource "google_service_account" "external_secrets_sa" {
}

resource "google_project_iam_member" "external_secrets_binding" {
project = var.project_id
role = "roles/secretmanager.secretAccessor"
member = "serviceAccount:${google_service_account.external_secrets_sa.email}"
depends_on = [google_service_account.external_secrets_sa]
project = var.project_id
role = "roles/secretmanager.secretAccessor"
member = google_service_account.external_secrets_sa.member
Comment thread
jku marked this conversation as resolved.
}

resource "google_service_account_iam_member" "gke_sa_iam_member_external_secrets" {
Expand Down
9 changes: 3 additions & 6 deletions gcp/modules/fulcio/service_accounts.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,18 @@ resource "google_service_account_iam_member" "gke_sa_iam_member_fulcio" {
resource "google_kms_key_ring_iam_member" "fulcio_kms_signer_verifier_member" {
key_ring_id = google_kms_key_ring.fulcio-keyring.id
role = "roles/cloudkms.signerVerifier"
member = "serviceAccount:${google_service_account.fulcio-sa.email}"
depends_on = [google_service_account.fulcio-sa]
member = google_service_account.fulcio-sa.member
}

resource "google_kms_key_ring_iam_member" "fulcio_kms_viewer_member" {
key_ring_id = google_kms_key_ring.fulcio-keyring.id
role = "roles/cloudkms.viewer"
member = "serviceAccount:${google_service_account.fulcio-sa.email}"
depends_on = [google_service_account.fulcio-sa]
member = google_service_account.fulcio-sa.member
}

// Decrypt encrypted Tink keyset to get signing key
resource "google_kms_key_ring_iam_member" "fulcio_kms_decrypter_member" {
key_ring_id = google_kms_key_ring.fulcio-keyring.id
role = "roles/cloudkms.cryptoKeyDecrypter"
member = "serviceAccount:${google_service_account.fulcio-sa.email}"
depends_on = [google_service_account.fulcio-sa]
member = google_service_account.fulcio-sa.member
}
9 changes: 4 additions & 5 deletions gcp/modules/gke_cluster/service_accounts.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ resource "google_project_iam_member" "service-account" {
])
project = var.project_id
role = each.key
member = format("serviceAccount:%s", google_service_account.gke-sa.email)
member = google_service_account.gke-sa.member
}

// Create the Prometheus service account
Expand Down Expand Up @@ -72,8 +72,7 @@ resource "google_project_iam_member" "prometheus_member" {
"roles/monitoring.viewer",
"roles/stackdriver.resourceMetadata.writer",
])
project = var.project_id
role = each.key
member = "serviceAccount:${google_service_account.prometheus-sa.email}"
depends_on = [google_service_account.prometheus-sa]
project = var.project_id
role = each.key
member = google_service_account.prometheus-sa.member
}
21 changes: 9 additions & 12 deletions gcp/modules/mysql/mysql.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ resource "google_service_account" "dbuser_trillian" {

// Attach cloudsql access permissions to the Google SA.
resource "google_project_iam_member" "db_admin_member_trillian" {
project = var.project_id
role = "roles/cloudsql.client"
member = "serviceAccount:${google_service_account.dbuser_trillian.email}"
depends_on = [google_service_account.dbuser_trillian]
project = var.project_id
role = "roles/cloudsql.client"
member = google_service_account.dbuser_trillian.member
}

resource "google_service_account_iam_member" "gke_sa_iam_member_trillian_logserver" {
Expand All @@ -86,10 +85,9 @@ resource "google_project_iam_member" "logserver_iam" {
"roles/cloudsql.client",
"roles/cloudtrace.agent"
])
project = var.project_id
role = each.key
member = "serviceAccount:${google_service_account.dbuser_trillian.email}"
depends_on = [google_service_account.dbuser_trillian]
project = var.project_id
role = each.key
member = google_service_account.dbuser_trillian.member
}

resource "google_service_account_iam_member" "gke_sa_iam_member_trillian_logsigner" {
Expand Down Expand Up @@ -279,10 +277,9 @@ resource "google_sql_user" "iam_user" {
}

resource "google_project_iam_member" "db_iam_auth" {
project = var.project_id
role = "roles/cloudsql.instanceUser"
member = "serviceAccount:${google_service_account.dbuser_trillian.email}"
depends_on = [google_service_account.dbuser_trillian]
project = var.project_id
role = "roles/cloudsql.instanceUser"
member = google_service_account.dbuser_trillian.member
}

resource "google_sql_user" "breakglass_iam_group" {
Expand Down
3 changes: 1 addition & 2 deletions gcp/modules/rekor/kms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,5 @@ resource "google_kms_crypto_key" "rekor-key" {
resource "google_kms_key_ring_iam_member" "rekor_sa_kms_iam" {
key_ring_id = google_kms_key_ring.rekor-keyring.id
role = "roles/cloudkms.viewer"
member = format("serviceAccount:%s-rekor-sa@%s.iam.gserviceaccount.com", var.cluster_name, var.project_id)
depends_on = [google_kms_key_ring.rekor-keyring, google_service_account.rekor-sa]
member = google_service_account.rekor-sa.member
}
20 changes: 8 additions & 12 deletions gcp/modules/rekor/service_accounts.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,19 @@ resource "google_service_account_iam_member" "gke_sa_iam_member_rekor" {
resource "google_kms_key_ring_iam_member" "rekor_signer_verifier_member" {
key_ring_id = google_kms_key_ring.rekor-keyring.id
role = "roles/cloudkms.signerVerifier"
member = "serviceAccount:${google_service_account.rekor-sa.email}"
depends_on = [google_service_account.rekor-sa]
member = google_service_account.rekor-sa.member
}

resource "google_kms_key_ring_iam_member" "rekor_kms_member" {
key_ring_id = google_kms_key_ring.rekor-keyring.id
role = "roles/cloudkms.viewer"
member = "serviceAccount:${google_service_account.rekor-sa.email}"
depends_on = [google_service_account.rekor-sa]
member = google_service_account.rekor-sa.member
}

resource "google_project_iam_member" "rekor_profiler_agent" {
project = var.project_id
role = "roles/cloudprofiler.agent"
member = "serviceAccount:${google_service_account.rekor-sa.email}"
depends_on = [google_service_account.rekor-sa]
project = var.project_id
role = "roles/cloudprofiler.agent"
member = google_service_account.rekor-sa.member
}

resource "google_service_account_iam_member" "gke_sa_iam_member_rekor_server" {
Expand All @@ -64,8 +61,7 @@ resource "google_project_iam_member" "logserver_iam" {
"roles/stackdriver.resourceMetadata.writer",
"roles/cloudtrace.agent"
])
project = var.project_id
role = each.key
member = "serviceAccount:${google_service_account.rekor-sa.email}"
depends_on = [google_service_account.rekor-sa]
project = var.project_id
role = each.key
member = google_service_account.rekor-sa.member
}
14 changes: 6 additions & 8 deletions gcp/modules/rekor/sql.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,15 @@ resource "google_sql_user" "iam_user" {
}

resource "google_project_iam_member" "db_admin_member_rekor" {
project = var.project_id
role = "roles/cloudsql.client"
member = "serviceAccount:${google_service_account.rekor-sa.email}"
depends_on = [google_service_account.rekor-sa]
project = var.project_id
role = "roles/cloudsql.client"
member = google_service_account.rekor-sa.member
}

resource "google_project_iam_member" "db_iam_auth" {
project = var.project_id
role = "roles/cloudsql.instanceUser"
member = "serviceAccount:${google_service_account.rekor-sa.email}"
depends_on = [google_service_account.rekor-sa]
project = var.project_id
role = "roles/cloudsql.instanceUser"
member = google_service_account.rekor-sa.member
}

/*
Expand Down
9 changes: 4 additions & 5 deletions gcp/modules/rekor/storage.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ resource "google_storage_bucket" "attestation" {

// GCS Bucket
resource "google_storage_bucket_iam_member" "rekor_gcs_member" {
count = var.enable_attestations ? 1 : 0
bucket = google_storage_bucket.attestation[count.index].name
role = "roles/storage.objectAdmin"
member = "serviceAccount:${google_service_account.rekor-sa.email}"
depends_on = [google_storage_bucket.attestation, google_service_account.rekor-sa]
count = var.enable_attestations ? 1 : 0
bucket = google_storage_bucket.attestation[count.index].name
role = "roles/storage.objectAdmin"
member = google_service_account.rekor-sa.member
}
6 changes: 2 additions & 4 deletions gcp/modules/timestamp/service_accounts.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ resource "google_service_account_iam_member" "gke_sa_iam_member_timestamp" {
resource "google_kms_key_ring_iam_member" "timestamp_kms_decrypter_member" {
key_ring_id = google_kms_key_ring.timestamp-keyring.id
role = "roles/cloudkms.cryptoKeyDecrypter"
member = "serviceAccount:${google_service_account.timestamp-sa.email}"
depends_on = [google_service_account.timestamp-sa]
member = google_service_account.timestamp-sa.member
}

resource "google_kms_key_ring_iam_member" "timestamp_kms_viewer_member" {
key_ring_id = google_kms_key_ring.timestamp-keyring.id
role = "roles/cloudkms.viewer"
member = "serviceAccount:${google_service_account.timestamp-sa.email}"
depends_on = [google_service_account.timestamp-sa]
member = google_service_account.timestamp-sa.member
}
4 changes: 1 addition & 3 deletions gcp/modules/tuf/kms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ resource "google_kms_crypto_key_version" "tuf-key-version" {
resource "google_kms_key_ring_iam_member" "tuf-sa-key-iam" {
key_ring_id = google_kms_key_ring.tuf-keyring.id
role = "roles/cloudkms.signerVerifier"
member = format("serviceAccount:%s@%s.iam.gserviceaccount.com", var.tuf_service_account_name, var.project_id)
depends_on = [google_kms_key_ring.tuf-keyring, google_service_account.tuf-sa]
member = google_service_account.tuf-sa.member
}

resource "google_kms_key_ring_iam_member" "tuf-key-iam-viewers" {
Expand All @@ -52,5 +51,4 @@ resource "google_kms_key_ring_iam_member" "tuf-key-iam-viewers" {
key_ring_id = google_kms_key_ring.tuf-keyring.id
role = "roles/cloudkms.publicKeyViewer"
member = each.key
depends_on = [google_kms_key_ring.tuf-keyring]
}
4 changes: 1 addition & 3 deletions gcp/modules/tuf/tuf.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,5 @@ resource "google_storage_bucket_iam_member" "tuf_sa_editor" {

bucket = google_storage_bucket.tuf.name
role = each.key
member = format("serviceAccount:%s@%s.iam.gserviceaccount.com", var.tuf_service_account_name, var.project_id)

depends_on = [google_storage_bucket.tuf, google_service_account.tuf-sa]
member = google_service_account.tuf-sa.member
}