Skip to content

feat: simplify pubsub policies #37

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat: simplify pubsub policies #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81373a1
fix iam policies
toncek345 Jul 10, 2025
7d1ee9e
var name change
toncek345 Jul 10, 2025
7b99880
ugh...
toncek345 Jul 10, 2025
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
36 changes: 9 additions & 27 deletions terraform/modules/pubsub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,58 +110,40 @@ resource "google_pubsub_subscription" "amplifier_tasks_sub" {
labels = var.default_labels
}

data "google_iam_policy" "tasks_publish" {
data "google_iam_policy" "pubsub_publisher" {
binding {
role = "roles/pubsub.publisher"
members = [
"serviceAccount:${var.tasks_publisher_service_account_email}",
"serviceAccount:${var.publisher_service_account_email}",
]
}
}

data "google_iam_policy" "tasks_subscribe" {
data "google_iam_policy" "pubsub_subscriber" {
binding {
role = "roles/pubsub.publisher"
members = [
"serviceAccount:${var.tasks_subscriber_service_account_email}",
]
}
}

data "google_iam_policy" "events_publish" {
binding {
role = "roles/pubsub.publisher"
members = [
"serviceAccount:${var.events_publisher_service_account_email}",
]
}
}

data "google_iam_policy" "events_subscribe" {
binding {
role = "roles/pubsub.publisher"
role = "roles/pubsub.subscriber"
members = [
"serviceAccount:${var.events_subscriber_service_account_email}",
"serviceAccount:${var.subscriber_service_account_email}",
]
}
}

resource "google_pubsub_topic_iam_policy" "tasks_publish" {
topic = google_pubsub_topic.amplifier_tasks.name
policy_data = data.google_iam_policy.tasks_publish.policy_data
policy_data = data.google_iam_policy.pubsub_publisher.policy_data
}

resource "google_pubsub_topic_iam_policy" "tasks_subscribe" {
topic = google_pubsub_topic.amplifier_tasks.name
policy_data = data.google_iam_policy.tasks_subscribe.policy_data
policy_data = data.google_iam_policy.pubsub_subscriber.policy_data
}

resource "google_pubsub_topic_iam_policy" "events_publish" {
topic = google_pubsub_topic.amplifier_events.name
policy_data = data.google_iam_policy.events_publish.policy_data
policy_data = data.google_iam_policy.pubsub_subscriber.policy_data
}

resource "google_pubsub_topic_iam_policy" "events_subscribe" {
topic = google_pubsub_topic.amplifier_events.name
policy_data = data.google_iam_policy.events_subscribe.policy_data
policy_data = data.google_iam_policy.pubsub_publisher.policy_data
}
14 changes: 2 additions & 12 deletions terraform/modules/pubsub/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,16 @@ variable "allowed_persistence_regions" {
default = ["europe-north2"]
}

variable "tasks_publisher_service_account_email" {
variable "publisher_service_account_email" {
type = string
description = "The email address of the tasks publisher service account"
}

variable "tasks_subscriber_service_account_email" {
variable "subscriber_service_account_email" {
type = string
description = "The email address of the tasks subscriber service account"
}

variable "events_publisher_service_account_email" {
type = string
description = "The email address of the events publisher service account"
}

variable "events_subscriber_service_account_email" {
type = string
description = "The email address of the events subscriber service account"
}

variable "default_labels" {
description = "Default labels to apply to all resources"
type = map(string)
Expand Down