From 32bd12c648bfb4d16b26ca56f92b219f958e3cbc Mon Sep 17 00:00:00 2001 From: zied-elouaer Date: Tue, 16 May 2023 18:40:39 +0200 Subject: [PATCH 1/2] fix: use tomap function for subscriptions conditional expression --- subscriptions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subscriptions.tf b/subscriptions.tf index 481ce6d..d8faffe 100644 --- 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 From 0a57b0f58731022f3c64db19ee49578101424ec6 Mon Sep 17 00:00:00 2001 From: zied-elouaer Date: Tue, 16 May 2023 18:40:53 +0200 Subject: [PATCH 2/2] chore: prepare release v0.1.2 --- CHANGELOG.md | 9 ++++++++- README.md | 2 +- README.tfdoc.hcl | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4a3c2..b3fc57b 100644 --- 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 index 4bd25f2..7db2510 100644 --- 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 index 14c8566..cda2a88 100644 --- 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"