Use default labels on pubsub subscription when no override is provided
This commit is contained in:
parent
64ac89d59c
commit
d831d32864
|
@ -60,6 +60,7 @@ module "pubsub" {
|
|||
source = "./fabric/modules/pubsub"
|
||||
project_id = var.project_id
|
||||
name = "my-topic"
|
||||
labels = { test = "default" }
|
||||
subscriptions = {
|
||||
test-pull = {}
|
||||
test-pull-override = {
|
||||
|
|
|
@ -54,7 +54,7 @@ resource "google_pubsub_subscription" "default" {
|
|||
project = var.project_id
|
||||
name = each.key
|
||||
topic = google_pubsub_topic.default.name
|
||||
labels = each.value.labels
|
||||
labels = coalesce(each.value.labels, var.labels)
|
||||
ack_deadline_seconds = each.value.ack_deadline_seconds
|
||||
message_retention_duration = each.value.message_retention_duration
|
||||
retain_acked_messages = each.value.retain_acked_messages
|
||||
|
|
|
@ -20,7 +20,8 @@ values:
|
|||
enable_exactly_once_delivery: false
|
||||
enable_message_ordering: false
|
||||
filter: null
|
||||
labels: null
|
||||
labels:
|
||||
test: default
|
||||
message_retention_duration: 604800s
|
||||
name: test-pull
|
||||
project: project-id
|
||||
|
@ -52,7 +53,8 @@ values:
|
|||
topic: my-topic
|
||||
module.pubsub.google_pubsub_topic.default:
|
||||
kms_key_name: null
|
||||
labels: null
|
||||
labels:
|
||||
test: default
|
||||
message_retention_duration: null
|
||||
name: my-topic
|
||||
project: project-id
|
||||
|
|
Loading…
Reference in New Issue