Merge pull request #19 from mineiros-io/zied/fix-subscriptions-condit…

…ional fix: use tomap function for subscriptions conditional expression
mineiros-io · May 16, 2023 · 1740722 · 1740722
2 parents 1622ae0 + 0a57b0f
commit 1740722
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.2]
+
+### Fixed
+
+- Fix handling of subscriptions with different config structures
+
 ## [0.1.1]
 
 ### Fixed
@@ -50,7 +56,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add support for [`mineiros-io/terraform-google-pubsub-topic-iam` Terraform Module](https://github.com/mineiros-io/terraform-google-pubsub-topic-iam)
 - Add support for [`mineiros-io/terraform-google-pubsub-subscription` Terraform Module](https://github.com/mineiros-io/terraform-google-pubsub-subscription)
 
-[unreleased]: https://github.com/mineiros-io/terraform-google-pubsub-topic/compare/v0.1.1...HEAD
+[unreleased]: https://github.com/mineiros-io/terraform-google-pubsub-topic/compare/v0.1.2...HEAD
+[0.1.2]: https://github.com/mineiros-io/terraform-google-pubsub-topic/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/mineiros-io/terraform-google-pubsub-topic/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/mineiros-io/terraform-google-pubsub-topic/compare/v0.0.4...v0.1.0
 [0.0.4]: https://github.com/mineiros-io/terraform-google-pubsub-topic/compare/v0.0.3...v0.0.4

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Most common usage of the module:
 
 ```hcl
 module "terraform-google-pubsub-topic" {
-  source = "github.com/mineiros-io/terraform-google-pubsub-topic?ref=v0.1.0"
+  source = "github.com/mineiros-io/terraform-google-pubsub-topic?ref=v0.1.2"
 
   name    = "pub-sub-topic-name"
   project = "id-of-project"

diff --git a/README.tfdoc.hcl b/README.tfdoc.hcl
@@ -71,7 +71,7 @@ section {
 
       ```hcl
       module "terraform-google-pubsub-topic" {
-        source = "github.com/mineiros-io/terraform-google-pubsub-topic?ref=v0.1.0"
+        source = "github.com/mineiros-io/terraform-google-pubsub-topic?ref=v0.1.2"
 
         name    = "pub-sub-topic-name"
         project = "id-of-project"

diff --git a/subscriptions.tf b/subscriptions.tf
@@ -5,7 +5,7 @@ locals {
 module "subscription" {
   source = "github.com/mineiros-io/terraform-google-pubsub-subscription?ref=v0.1.0"
 
-  for_each = var.module_enabled ? local.subscriptions_map : {}
+  for_each = var.module_enabled ? local.subscriptions_map : tomap({})
 
   project = google_pubsub_topic.topic[0].project
   topic   = google_pubsub_topic.topic[0].id