feat: Add support for dead_letter_policy to subscription resources (#32)

terraform-google-modules · Jul 28, 2020 · 5005366 · 5005366
1 parent 875ff17
commit 5005366
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -20,19 +20,23 @@ module "pubsub" {
   project_id         = "my-pubsub-project"
   push_subscriptions = [
     {
-      name                 = "push"   // required
-      ack_deadline_seconds = 20 // optional
-      push_endpoint        = "https://example.com" // required
-      x-goog-version       = "v1beta1" // optional
-      oidc_service_account = "sa@example.com" // optional
-      audience             = "example" // optional
-      expiration_policy    = "1209600s" // optional
+      name                  = "push"   // required
+      ack_deadline_seconds  = 20 // optional
+      push_endpoint         = "https://example.com" // required
+      x-goog-version        = "v1beta1" // optional
+      oidc_service_account  = "sa@example.com" // optional
+      audience              = "example" // optional
+      expiration_policy     = "1209600s" // optional
+      dead_letter_topic     = "example-dl-topic" // optional
+      max_delivery_attempts = 5 // optional
     }
   ]
   pull_subscriptions = [
     {
-      name                 = "pull" // required
-      ack_deadline_seconds = 20 // optional
+      name                  = "pull" // required
+      ack_deadline_seconds  = 20 // optional
+      dead_letter_topic     = "example-dl-topic" // optional
+      max_delivery_attempts = 5 // optional
     }
   ]
 }

diff --git a/examples/cloudiot/main.tf b/examples/cloudiot/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.13"
+  version = "~> 3.16"
   region  = var.region
 }
 

diff --git a/examples/kms/main.tf b/examples/kms/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.13"
+  version = "~> 3.16"
   region  = "us-central1"
 }
 

diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.13"
+  version = "~> 3.16"
   region  = "us-central1"
 }
 

diff --git a/main.tf b/main.tf
@@ -56,6 +56,14 @@ resource "google_pubsub_subscription" "push_subscriptions" {
     }
   }
 
+  dynamic "dead_letter_policy" {
+    for_each = (lookup(var.push_subscriptions[count.index], "dead_letter_topic", "") != "") ? [var.push_subscriptions[count.index].dead_letter_topic] : []
+    content {
+      dead_letter_topic     = lookup(var.push_subscriptions[count.index], "dead_letter_topic", "")
+      max_delivery_attempts = lookup(var.push_subscriptions[count.index], "max_delivery_attempts", "5")
+    }
+  }
+
   push_config {
     push_endpoint = var.push_subscriptions[count.index]["push_endpoint"]
 
@@ -99,5 +107,13 @@ resource "google_pubsub_subscription" "pull_subscriptions" {
     }
   }
 
+  dynamic "dead_letter_policy" {
+    for_each = (lookup(var.pull_subscriptions[count.index], "dead_letter_topic", "") != "") ? [var.pull_subscriptions[count.index].dead_letter_topic] : []
+    content {
+      dead_letter_topic     = lookup(var.pull_subscriptions[count.index], "dead_letter_topic", "")
+      max_delivery_attempts = lookup(var.pull_subscriptions[count.index], "max_delivery_attempts", "5")
+    }
+  }
+
   depends_on = [google_pubsub_topic.topic]
 }